soda 0.0.12 → 0.0.13

data/bin/SodaSuite

@@ -30,11 +30,13 @@
 ###############################################################################
 # Needed Ruby libs:
 ###############################################################################
+require 'rubygems'
 require 'Soda'
 require 'getoptlong'
 require 'libxml'
 require 'watir'
 require 'SodaReportSummery'
+require 'SodaSuiteSummary'
 require 'pp'
 
 ###############################################################################
@@ -119,46 +121,15 @@ class SodaSuite
 #     None.
 #
 ###############################################################################
-   def ExecuteTestSuite(suite, rerun = false, reruntest = nil)
+   def ExecuteTestSuites(suites)
       soda = nil
-      master_result = 0
       result = nil
-      
-      soda = Soda::Soda.new(@SodaParams)
-
-      if (reruntest != nil)
-         SodaUtils.PrintSoda("Running rerun test setup script: "+
-            "'#{reruntest}'.\n")
-         soda.run(reruntest)
-      end
-
-      suite.each do |test|
-         result = soda.run(test, rerun)
-         if (result == -1)
-            SodaUtils.PrintSoda("Failed executing test file: #{test}!\n",
-               SodaUtils::ERROR)
-            master_result = -1
-         
-            begin
-               soda.browser.close()
-            rescue Exception => e
-               print "Exception: #{e.message}\n"
-            ensure
-            end
-            soda = Soda::Soda.new(@SodaParams)
-         end
-      end
-
-      begin
-         soda.browser.close()
-      rescue Exception => e
-         print "Exception: #{e.message}\n"
-      ensure
-      end
 
-      soda = nil
-      return master_result
-   end
+      soda = Soda::Soda.new(@SodaParams)
+		result = soda.RunAllSuites(suites)
+	
+		return result
+end
 
 ###############################################################################
 # Execute -- Medhod
@@ -621,6 +592,11 @@ def Main
       PrintHelp()
    end
 
+	if (params['suites'].length > 0 && params['resultsdir'] == nil)
+		SodaUtils.PrintSoda("Missing argument --resultsdir!\n")
+		PrintHelp()
+	end
+
    if (params['debug'])
       SodaUtils.PrintSoda("SodaSuite Params:\n")
       params.each do |k, v|
@@ -649,12 +625,7 @@ def Main
 
    if (params['suites'].length > 0)
       sweet = SodaSuite.new(params)
-      params['suites'].each do |swt|
-         result = sweet.ExecuteTestSuite(swt)
-         if (result != 0) 
-            master_result = -1
-         end
-      end
+      result = sweet.ExecuteTestSuites(params['suites'])
    end
 
    if (params['test_files'].length > 0)
@@ -672,20 +643,19 @@ def Main
       end
    end
 
-   # see if we should rerun failed tests #
-   if (rerun_failed_test && failed_tests.length > 0)
-      SodaUtils.PrintSoda("Rerunning failed tests.\n")
-      sweet.ExecuteTestSuite(failed_tests, true, rerun_test_script)
-      SodaUtils.PrintSoda("Finished rerunning failed tests.\n")
-   end
-
    if (params['resultsdir'] != nil)
       begin
-         summery = SodaReportSummery.new(params['resultsdir'], 
-            params['summaryfile'], true)
+         if (params['suites'].length > 0)
+            summary = SodaSuiteSummary.new(params['resultsdir'], 
+               params['summaryfile'], true)
+         else
+            summery = SodaReportSummery.new(params['resultsdir'], 
+               params['summaryfile'], true)
+         end
       rescue Exception => e
-         print "Error: calling: SodaReportSummery!\n"
-         print "StackTrace: #{e.backtrace}\n\n"
+         print "Error: calling: SodaReportSummery: #{e.message}\n"
+         print e.backtrace.join("\n")
+         print "\n\n"
          exit(-1)
       ensure
       end

data/bin/SodaSummaryCreator

@@ -28,6 +28,7 @@
 
 require 'rubygems'
 require 'SodaReportSummery'
+require 'SodaSuiteSummary'
 require 'getoptlong'
 
 ###############################################################################
@@ -51,6 +52,10 @@ Required Flags:
    --reportdir: This flag tells #{$0} where to find the Soda log files.
 
 Optional Flags:
+  --usesuites: This flag say that the summary to be generated is for reports
+    that were created by SodaSuite using the --suite flag and not the --test
+    flag.
+
    --help: Prints this message and exits.
 
 HLP
@@ -77,10 +82,12 @@ def Main()
 	reportdir = nil
 	summary_file = nil
 	summary_obj = nil
+   use_suites = false
 
 	opts = GetoptLong.new(
 		['--reportdir', '-r', GetoptLong::REQUIRED_ARGUMENT],
-		['--help', '-h', GetoptLong::OPTIONAL_ARGUMENT]
+		['--help', '-h', GetoptLong::OPTIONAL_ARGUMENT],
+      ['--usesuites', '-s', GetoptLong::OPTIONAL_ARGUMENT]
 	)
 	
 	opts.quiet = true
@@ -88,6 +95,8 @@ def Main()
 		case (opt)
 			when "--reportdir"
 				reportdir = arg
+         when "--usesuites"
+            use_suites = true
 			when "--help"
 				PrintHelp()
 				exit(0)
@@ -103,11 +112,17 @@ def Main()
 	summary_file = "#{reportdir}/summary.html"
 	begin
 		print "(*)Creating summary report...\n"
-		summary_obj = SodaReportSummery.new(reportdir, summary_file, true)
+      if (use_suites)
+		   summary_obj = SodaSuiteSummary.new(reportdir, summary_file, true)
+      else
+		   summary_obj = SodaReportSummery.new(reportdir, summary_file, true)
+      end
 		print "(*)Finished creating report.\n"
 		print "(*)Summary File: #{summary_file}\n"
 	rescue Exception => e
-		print "(!)Error: #{e.message}!\n\n"
+		print "(!)Error: #{e.message}!\n"
+      print e.backtrace.join("\n")
+      print "\n\n"
 		exit(2)
 	ensure
 	end

data/lib/Soda.rb

@@ -57,6 +57,7 @@ require "fields/FileField"
 require "fields/LiField"
 require 'thread'
 require 'date'
+require 'pp'
 
 ###############################################################################
 # Soda -- Class
@@ -2676,7 +2677,7 @@ JSCode
 #     returns a SodaReport object.
 #
 ############################################################################### 
-   def run(file, rerun = false)
+   def run(file, rerun = false, genhtml = true)
       result = 0
       master_result = 0
       thread_soda = nil
@@ -2743,11 +2744,157 @@ JSCode
 
       @rep.SodaPrintCurrentReport()
       @rep.EndTestReport()
-      @rep.ReportHTML()
+      @rep.ReportHTML() if (genhtml)
 
       return master_result
    end
 
+############################################################################### 
+# RunAllSuites -- Method
+#		This function run a list of suite files as suites, not as tests.
+#
+# Input:
+#		suites: An array of Soda suite files to be ran.
+#
+# Output:
+#		returns a hash with the results from the ran suites.
+#
+###############################################################################
+	def RunAllSuites(suites)
+		results = {}
+		err = 0
+		indent = " " * 2
+		indent2 = "#{indent}" * 2
+		indent3 = "#{indent}" * 4
+		hostname = `hostname`
+		hostname = hostname.chomp()
+
+		suites.each do |s|
+			base_suite_name = File.basename(s)
+			RestartGlobalTime()
+			results[base_suite_name] = RunSuite(s)
+			RestartGlobalTime()
+		end
+
+		time = Time.now()
+		time = "#{time.to_i}-#{time.usec}"
+		suite_report = "#{@resultsDir}/#{hostname}-#{time}-suite.xml"
+		fd = File.new(suite_report, "w+")
+		fd.write("<data>\n")
+
+		RestartGlobalTime()
+
+		results.each do |k,v|
+			fd.write("\t<suite>\n")
+			fd.write("\t#{indent}<suitefile>#{k}</suitefile>\n")
+			v.each do |testname, testhash|
+				fd.write("\t#{indent2}<test>\n")
+				fd.write("\t#{indent3}<testfile>#{testname}</testfile>\n")
+				testhash.each do |tname, tvalue|
+					if (tname == "result")
+						err = -1 if (tvalue.to_i != 0)
+					end
+					new_name = "#{tname}"
+					new_name = new_name.gsub(" ", "_")
+					fd.write("\t#{indent3}<#{new_name}>#{tvalue}</#{new_name}>\n")
+				end
+				fd.write("\t#{indent2}</test>\n")
+			end
+			fd.write("\t</suite>\n")
+		end
+		fd.write("</data>\n")
+		fd.close()
+
+		RestartGlobalTime()
+
+		return err
+	end
+
+############################################################################### 
+#
+############################################################################### 
+	def RunSuite(suitefile)
+		parser = nil
+		doc = nil
+		result = {}
+		tests = []
+		setup_test = nil
+		cleanup_test = nil
+		setup_results = 0
+
+		begin
+         parser = LibXML::XML::Parser.file(suitefile)
+         doc = parser.parse()
+			doc = doc.root()
+
+			doc.each do |node|
+				next if (node.name !~ /script/)
+				attrs = node.attributes()
+				attrs = attrs.to_h()
+
+				if (attrs.key?('file'))
+					base_name = File.basename(attrs['file'])
+					if (base_name =~ /^setup/)
+						setup_test = attrs['file']
+					elsif (base_name =~ /^cleanup/)
+						cleanup_test = attrs['file']
+					else
+						tests.push(attrs['file'])
+					end
+				elsif (attrs.key?('fileset'))
+					files = File.join(attrs['fileset'], "*.xml")
+					files = Dir.glob(files)
+					files.each do |f|
+						tests.push(f)
+					end
+				end
+			end
+		rescue Exception => e
+			print "ERROR: #{e.message}!\n"
+			print e.backtrace.join("\n")
+			result = nil
+		ensure
+		end	
+
+
+		if (setup_test != nil)
+			setup_result = run(setup_test, false, false)
+			if (setup_result != 0)
+				SodaUtils.PrintSoda("Failed calling setup test: "+
+					"'#{setup_test}'!\n", SodaUtils::ERROR)
+				result[setup_test] = {'result' => -1}
+				setup_result = false
+			else
+				setup_result = true
+				result[setup_test] = {'result' => 0}
+			end
+		else
+			setup_result = true
+		end
+
+		if (setup_result)
+			tests.each do |test|
+				result[test] = {}
+				result[test]['result'] = run(test, false)
+				result[test].merge!(@rep.GetRawResults)
+				@rep.ZeroTestResults()
+			end
+		end
+
+		if (cleanup_test != nil)
+			cleanup_result = run(cleanup_test, false, false)
+			if (cleanup_result != 0)
+				SodaUtils.PrintSoda("Failed calling cleanup test: "+
+					"'#{cleanup_test}'!\n", SodaUtils::ERROR)
+				result[cleanup_test] = {'result' => -1}
+			else
+				result[cleanup_test] = {'result' => 0}
+			end
+		end
+
+		return result
+	end
+
 ############################################################################### 
 # GetCurrentBrowser -- Method
 #     This method get the current Watir browser object.

data/lib/SodaReporter.rb

@@ -45,12 +45,17 @@ require 'SodaLogReporter'
 # simple reporter class that tracks asserts, exceptions, and log messages
 ###############################################################################
 class SodaReporter
+   attr_accessor :asserts_count, :js_error_count, :css_error_count,
+      :assertFails_count, :exception_count, :test_skip_count, 
+      :test_blocked_count, :test_watchdog_count
 
 	def initialize(testfile, savehtml = false, resultsdir = nil, debug = 0,
          callback = nil, rerun = false)
 		@sodatest_file = testfile
       @saveHtmlFiles = savehtml
       @debug = debug
+      @start_time = nil
+      @end_time = nil
       @js_error_count = 0
       @css_error_count = 0
 		@asserts_count = 0
@@ -116,8 +121,76 @@ class SodaReporter
       log("[New Test]\n")
       log("Starting soda test: #{@sodatest_file}\n")
       log("Saving HTML files => #{@saveHtmlFiles.to_s()}.\n")
+      @start_time = Time.now().strftime("%m/%d/%Y-%H:%M:%S")
 	end
 
+###############################################################################
+# GetRawResults -- Method
+#     This method gets test results data.
+#
+# Input:
+#     None.
+#
+# Output:
+#     returns a hash of test report data.
+#
+###############################################################################
+   def GetRawResults()
+
+      @end_time = Time.now().strftime("%m/%d/%Y-%H:%M:%S") if (@end_time == nil)
+      start = DateTime.strptime("#{@start_time}",
+         "%m/%d/%Y-%H:%M:%S")
+      stop = DateTime.strptime("#{@end_time}",
+         "%m/%d/%Y-%H:%M:%S")
+      total_time = (stop - start)
+
+      results = {
+         'Test Assert Count' => @asserts_count,
+         'Test JavaScript Error Count' => @js_error_count,
+         'Test CSS Error Count' => @css_error_count,
+         'Test Assert Failures' => @assertFails_count,
+         'Test Exceptions' => @exception_count,
+         'Test Skip Count' => @test_skip_count,
+         'Test Blocked Count' => @test_blocked_count,
+         'Test WatchDog Count' => @test_watchdog_count,
+         'Test Warning Count' => @test_warning_count,
+         'Test Event Count' => @total,
+         'Test Start Time' => @start_time,
+         'Test Stop Time' => @end_time
+      }
+
+      return results
+   end
+
+###############################################################################
+# ZeroTestResults -- Method
+#     This method zero's out needed reported values for a test when running
+#     a suite.  Really this is only needed until SugarCRM internally starts
+#     using real suites and I can go back to undo the hack's put in place to
+#     do suite reporting when using the --test option to run suites.
+#
+# Input:
+#     None.
+#
+# Output:
+#     None.
+#
+###############################################################################
+   def ZeroTestResults()
+         @asserts_count = 0
+         @js_error_count = 0
+         @css_error_count = 0
+         @assertFails_count = 0
+         @exception_count = 0
+         @test_skip_count = 0
+         @test_blocked_count = 0
+         @test_watchdog_count = 0
+         @test_warning_count = 0
+         @total = 0
+         @start_time = nil
+         @end_time = nil
+   end
+
 ###############################################################################
 # GetResultDir -- Method
 #		This method returns the current result dir.
@@ -398,6 +471,7 @@ class SodaReporter
 		NFSRenameHack(@log_filename, tmp_logfile)
 
       @log_filename = tmp_logfile
+      @end_time = Time.now().strftime("%m/%d/%Y-%H:%M:%S")
    end
 
 ###############################################################################