soda 0.0.8 → 0.0.9

data/bin/SodaSuite

@@ -271,6 +271,8 @@ Optional Flags:
    --restarttest: This is a soda test that will be ran right after the browser
       is restarted.
 
+   --skipcsserrors: This tells soda to not report on css errors.
+
    --help:  Prints this message and exits.
 
 HLP
@@ -556,7 +558,8 @@ def Main
                [ '--sugarwait', '-w', GetoptLong::OPTIONAL_ARGUMENT ],
                [ '--restartcount', '-1', GetoptLong::OPTIONAL_ARGUMENT ],
                [ '--restarttest', '-2', GetoptLong::OPTIONAL_ARGUMENT],
-               [ '--reruntest', '-3', GetoptLong::OPTIONAL_ARGUMENT ]
+               [ '--reruntest', '-3', GetoptLong::OPTIONAL_ARGUMENT ],
+					[ '--skipcsserrors', '-4', GetoptLong::OPTIONAL_ARGUMENT]
             )
 
       opts.quiet = true
@@ -598,6 +601,8 @@ def Main
                rerun_failed_test = true
             when "--reruntest"
                rerun_test_script = arg
+				when "--skipcsserrors"
+					params['errorskip'].push("css")
          end
       end
    rescue Exception => e

data/lib/Soda.rb

@@ -469,7 +469,7 @@ class Soda
             @rep.ReportFailure(msg)
             raise(msg)
          rescue Exception => e
-            @rep.ReportException(e, false, false)
+            @rep.ReportException(e)
          ensure
 
          end
@@ -784,7 +784,7 @@ class Soda
                script = SodaXML.new.parse(file)
             end
          rescue Exception => e
-            @rep.ReportException(e, true, file)
+            @rep.ReportException(e, file)
          ensure
          end
       end
@@ -793,6 +793,7 @@ class Soda
       if (dir !~ /lib/)
          if(!is_restart && !@restart_test_running && file != @last_test)
             @non_lib_test_count += 1
+            @rep.IncTestCount()
             PrintDebug("Test since last restart: #{@non_lib_test_count +1}.\n")
          end
       end
@@ -869,12 +870,14 @@ class Soda
          fd = Dir.open(file)
          fd.each do |f|
             files.push("#{file}/#{f}") if (f =~ /\.xml$/i)
+#				@rep.IncTestTotalCount() if (f !~ /lib/i)
          end
          fd.close()
 
          if (files.empty?)
             @rep.log("No tests found in directory: '#{file}'!\n",
                SodaUtils::WARN)
+				@rep.IncTestWarningCount()
             return nil
          end   
 
@@ -894,6 +897,7 @@ class Soda
                   RestartBrowserTest()
                end
 
+               @rep.IncTestCount()
                @non_lib_test_count += 1
                @last_test = file
             end
@@ -902,12 +906,13 @@ class Soda
             if (script != nil)
                parent_test_file = @currentTestFile
                @currentTestFile = file
-               @rep.IncTestCount()
                results = handleEvents(script)
                PrintDebug("Test since last restart: #{@non_lib_test_count +1}.\n")
-
                if (results != 0)
                   @FAILEDTESTS.push(@currentTestFile)
+						@rep.IncFailedTest()
+					else
+						@rep.IncTestPassedCount() if (file !~ /lib/i)
                end
                @currentTestFile = parent_test_file
             else
@@ -938,6 +943,7 @@ class Soda
          tmp_file = File.basename(test_file)
          if (tmp_file =~ /#{bhash['testfile']}/)
             @rep.log("Blocklist: blocking file: \"#{test_file}\".\n")
+				@rep.IncBlockedTest()
             result = true
             break
          end
@@ -1116,7 +1122,7 @@ class Soda
       begin
          text = @browser.text
       rescue Exception => e
-         @rep.ReportException(e, true)
+         @rep.ReportException(e)
          text = ""
       ensure
 
@@ -1410,6 +1416,7 @@ class Soda
                else
                   PrintDebug("For some reason I got a nill @browser object!",
                      SodaUtils::WARN)
+						@rep.IncTestWarningCount()
                   result['browser_closed'] = true
                end
             when "refresh"
@@ -1524,8 +1531,7 @@ class Soda
             new_browser = @browser.attach(:url, url)
          end
       rescue Exception=>e
-         @rep.ReportException(e, true, false, 
-            "Failed trying to attach to browser window!");
+         @rep.ReportException(e, @currentTestFile);
 
          e_dump = SodaUtils.DumpEvent(event)
          @rep.log("Event Dump From Exception: #{e_dump}!\n", 
@@ -1569,6 +1575,7 @@ class Soda
          else
             @rep.log("Found requires event without any children!\n", 
                SodaUtils::WARN)
+				@rep.IncTestWarningCount()
          end 
       end
    end
@@ -1770,6 +1777,7 @@ class Soda
 #
 ############################################################################### 
    def eventScript(event)
+		results = 0
 
       if (event.key?('file'))
          # specified a new csv to file
@@ -1784,7 +1792,12 @@ class Soda
          if (script != nil)
             parent_script = @currentTestFile
             @currentTestFile = event['file']
-            handleEvents(script)
+            results = handleEvents(script)
+				if (@currentTestFile !~ /lib/i && results != 0)
+					@rep.IncFailedTest()
+				else
+					@rep.IncTestPassedCount() if (@currentTestFile !~ /lib/i)
+				end
             @currentTestFile = parent_script
          else
             msg = "Failed opening script file: \"#{event['file']}\"!\n"
@@ -2168,8 +2181,10 @@ JSCode
                   else
                      @rep.log("Found unsupported value for <textfield clear" +
                         "=\"true/false\" />!\n", SodaUtils::WARN)
+							@rep.IncTestWarningCount()
                      @rep.log("Unsupported clear value =>" +
                         " \"#{event['clear']}\".\n", SodaUtils::WARN)
+							@rep.IncTestWarningCount()
                end
             end
          when "focus"
@@ -2237,6 +2252,7 @@ JSCode
          else
             msg = "Failed to find supported field action.\n"
             @rep.log(msg, SodaUtils::WARN)
+				@rep.IncTestWarningCount()
             e_dump = SodaUtils.DumpEvent(event)
             @rep.log("Event Dump: #{e_dump}\n", SodaUtils::EVENT)
       end
@@ -2590,16 +2606,18 @@ JSCode
                @exceptionExit = true
                @rep.log("Exception in test: \"#{@currentTestFile}\", Line: " +
                   "#{event['line_number']}!\n", SodaUtils::ERROR)
-               @rep.ReportException(e, true, @fileStack[@fileStack.length - 1]);
+               @rep.ReportException(e, @fileStack[@fileStack.length - 1]);
                e_dump = SodaUtils.DumpEvent(event)
                @rep.log("Event Dump From Exception: #{e_dump}!\n", 
                   SodaUtils::EVENT)
 
                if (exception_event != nil)
                   @rep.log("Running Exception Handler.\n", SodaUtils::WARN)
+						@rep.IncTestWarningCount()
                   @exceptionExit = false
                   handleEvents(exception_event['children'])
                   @rep.log("Finished Exception Handler.\n", SodaUtils::WARN)
+						@rep.IncTestWarningCount()
                   @exceptionExit = true
                end
 
@@ -2689,14 +2707,14 @@ JSCode
                   @rep.ReportFailure(msg)
                   PrintDebug("Global Time was: #{$global_time}\n")
                   PrintDebug("Timeout Time was: #{time_check}\n")
-
+						@rep.IncTestWatchDogCount()
 						begin
 							result_dir = @rep.GetResultDir()
 							shooter = SodaScreenShot.new(result_dir)
 							image_file = shooter.GetOutputFile()
 							@rep.log("ScreenShot taken: #{image_file}\n")
 						rescue Excaption => e
-							@rep.ReportException(e, false, false)
+							@rep.ReportException(e)
 						ensure
 						end
 
@@ -2714,9 +2732,12 @@ JSCode
 
          if (result != 0)
             master_result = -1
+			else
+				@rep.IncTestPassedCount()
          end
       else
          msg = "Failed trying to run soda test: \"#{@currentTestFile}\"!\n"
+			@rep.IncFailedTest()
          @rep.ReportFailure(msg)
       end
 

data/lib/SodaReportSummery.rb

@@ -221,7 +221,11 @@ def GenHtmlReport(data, reportfile, create_links = false)
    report_file = ""
    now = nil
 
+	totals['Test Warning Count'] = 0
+	totals['Test Other Failures'] = 0
+	totals['Test WatchDog Count'] = 0
    totals['Test Failure Count'] = 0 
+	totals['Test Passed Count'] = 0
    totals['Test CSS Error Count'] = 0 
    totals['Test JavaScript Error Count'] = 0 
    totals['Test Assert Failures'] = 0 
@@ -231,6 +235,8 @@ def GenHtmlReport(data, reportfile, create_links = false)
    totals['Test Major Exceptions'] = 0
    totals['Test Count'] = 0
    totals['Test Skip Count'] = 0
+	totals['Test Blocked Count'] = 0
+	totals['Total Failure Count'] = 0
    totals['running_time'] = nil
 
    begin
@@ -251,102 +257,560 @@ def GenHtmlReport(data, reportfile, create_links = false)
    html_header = <<HTML
 <html>
 <style type="text/css">
-body 
-{ 
-   margin: 0px;
-   font-family: Arial, Verdana, Helvetica, sans-serif;
+
+.highlight {
+	background-color: #8888FF;
 }
 
-a:hover
-{
-   color: #24f938;
+.unhighlight {
+	background: #FFFFFF;
 }
 
-fieldset, table, pre 
-{
-    margin-bottom:0;
+.td_header_master {
+	whitw-space: nowrap;
+	background: #99CCFF;
+	text-align: center;
+	font-family: Arial;
+	font-weight: bold;
+	font-size: 12px;
+	border-left: 0px solid black;
+	border-right: 2px solid black;
+	border-bottom: 2px solid black;
 }
 
-p 
-{
-   margin-top: 0px;
-   margin-bottom: 0px;
-   font-family: Arial, Verdana, Helvetica, sans-serif;
-   font-size: 11px;
+.td_header_sub {
+	whitw-space: nowrap;
+	background: #99CCFF;
+	text-align: center;
+	font-family: Arial;
+	font-weight: bold;
+	font-size: 12px;
+	border-left: 1px solid black;
+	border-right: 0px solid black;
+	border-bottom: 2px solid black;
 }
 
-li 
-{
-   margin-top: 0px;
-   margin-bottom: 0px;
-   font-family: Arial, Verdana, Helvetica, sans-serif;
-   font-size: 11px;
+.td_header_skipped {
+	whitw-space: nowrap;
+	background: #99CCFF;
+	text-align: center;
+	font-family: Arial;
+	font-weight: bold;
+	font-size: 12px;
+	border-left: 1px solid black;
+	border-right: 2px solid black;
+	border-bottom: 2px solid black;
 }
 
-td
-{
-   text-align: center;
-   vertical-align: middle;
+.td_header_watchdog {
+	whitw-space: nowrap;
+	background: #99CCFF;
+	text-align: center;
+	font-family: Arial;
+	font-weight: bold;
+	font-size: 12px;
+	border-left: 0px solid black;
+	border-right: 0px solid black;
+	border-bottom: 2px solid black;
 }
 
-.td_file
-{
-   text-align: left;
-   vertical-align: middle;
-   white-space: nowrap;
+table {
+	width: 100%;
+	border: 2px solid black;
+	border-collapse: collapse;
+	padding: 0px;
+	background: #FFFFFF;
 }
 
-.tr_normal
-{
-   background: #e5eef3; 
+.td_file_data {
+	whitw-space: nowrap;
+	text-align: left;
+	font-family: Arial;
+	font-weight: bold;
+	font-size: 12px;
+	border-left: 0px solid black;
+	border-right: 2px solid black;
+	border-bottom: 2px solid black;
 }
 
-.highlight {
-   background-color: #8888FF;
+.td_run_data {
+	whitw-space: nowrap;
+	text-align: center;
+	font-family: Arial;
+	font-weight: bold;
+	font-size: 12px;
+	border-left: 0px solid black;
+	border-right: 0px solid black;
+	border-bottom: 0px solid black;
+}
+
+.td_run_data_error {
+	whitw-space: nowrap;
+	text-align: center;
+	font-family: Arial;
+	font-weight: bold;
+	color: #FF0000;
+	font-size: 12px;
+	border-left: 0px solid black;
+	border-right: 0px solid black;
+	border-bottom: 0px solid black;
+}
+
+.td_passed_data {
+	whitw-space: nowrap;
+	text-align: center;
+	font-family: Arial;
+	font-weight: bold;
+	color: #00FF00;
+	font-size: 12px;
+	border-left: 0px solid black;
+	border-right: 0px solid black;
+	border-bottom: 0px solid black;
+}
+
+.td_failed_data {
+	whitw-space: nowrap;
+	text-align: center;
+	font-family: Arial;
+	font-weight: bold;
+	color: #FF0000;
+	font-size: 12px;
+	border-left: 0px solid black;
+	border-right: 0px solid black;
+	border-bottom: 0px solid black;
+}
+
+.td_blocked_data {
+	whitw-space: nowrap;
+	text-align: center;
+	font-family: Arial;
+	font-weight: bold;
+	color: #FFCF10;
+	font-size: 12px;
+	border-left: 0px solid black;
+	border-right: 0px solid black;
+	border-bottom: 0px solid black;
+}
+
+.td_skipped_data {
+	whitw-space: nowrap;
+	text-align: center;
+	font-family: Arial;
+	font-weight: bold;
+	color: #D9D9D9;
+	font-size: 12px;
+	border-left: 0px solid black;
+	border-right: 2px solid black;
+	border-bottom: 0px solid black;
+}
+
+.td_watchdog_data {
+	whitw-space: nowrap;
+	text-align: center;
+	font-family: Arial;
+	font-weight: normal;
+	font-size: 12px;
+	border-left: 0px solid black;
+	border-right: 0px solid black;
+	border-bottom: 0px solid black;
+}
+
+.td_watchdog_error_data {
+	whitw-space: nowrap;
+	color: #FF0000;
+	text-align: center;
+	font-family: Arial;
+	font-weight: bold;
+	font-size: 12px;
+	border-left: 0px solid black;
+	border-right: 0px solid black;
+	border-bottom: 0px solid black;
+}
+
+.td_exceptions_data {
+	whitw-space: nowrap;
+	text-align: center;
+	font-family: Arial;
+	font-weight: normal;
+	font-size: 12px;
+	border-left: 0px solid black;
+	border-right: 0px solid black;
+	border-bottom: 0px solid black;
+}
+
+.td_exceptions_error_data {
+	whitw-space: nowrap;
+	text-align: center;
+	font-family: Arial;
+	font-weight: bold;
+	color: #FF0000;
+	font-size: 12px;
+	border-left: 0px solid black;
+	border-right: 0px solid black;
+	border-bottom: 0px solid black;
+}
+
+.td_javascript_data {
+	whitw-space: nowrap;
+	text-align: center;
+	font-family: Arial;
+	font-weight: normal;
+	font-size: 12px;
+	border-left: 0px solid black;
+	border-right: 0px solid black;
+	border-bottom: 0px solid black;
+}
+
+.td_javascript_error_data {
+	whitw-space: nowrap;
+	text-align: center;
+	font-family: Arial;
+	font-weight: bold;
+	color: #FF0000;
+	font-size: 12px;
+	border-left: 0px solid black;
+	border-right: 0px solid black;
+	border-bottom: 0px solid black;
+}
+
+.td_assert_data {
+	whitw-space: nowrap;
+	text-align: center;
+	font-family: Arial;
+	font-weight: normal;
+	font-size: 12px;
+	border-left: 0px solid black;
+	border-right: 0px solid black;
+	border-bottom: 0px solid black;
+}
+
+.td_assert_error_data {
+	whitw-space: nowrap;
+	text-align: center;
+	font-family: Arial;
+	font-weight: bold;
+	color: #FF0000;
+	font-size: 12px;
+	border-left: 0px solid black;
+	border-right: 0px solid black;
+	border-bottom: 0px solid black;
+}
+
+.td_other_data {
+	whitw-space: nowrap;
+	text-align: center;
+	font-family: Arial;
+	font-weight: normal;
+	font-size: 12px;
+	border-left: 0px solid black;
+	border-right: 0px solid black;
+	border-bottom: 0px solid black;
+}
+
+.td_other_error_data {
+	whitw-space: nowrap;
+	text-align: center;
+	font-family: Arial;
+	font-weight: bold;
+	color: #FF0000;
+	font-size: 12px;
+	border-left: 0px solid black;
+	border-right: 0px solid black;
+	border-bottom: 0px solid black;
+}
+
+.td_total_data {
+	whitw-space: nowrap;
+	text-align: center;
+	font-family: Arial;
+	font-weight: normal;
+	font-size: 12px;
+	border-left: 0px solid black;
+	border-right: 2px solid black;
+	border-bottom: 0px solid black;
+}
+
+.td_total_error_data {
+	whitw-space: nowrap;
+	text-align: center;
+	font-family: Arial;
+	font-weight: bold;
+	color: #FF0000;
+	font-size: 12px;
+	border-left: 0px solid black;
+	border-right: 2px solid black;
+	border-bottom: 0px solid black;
+}
+
+.td_css_data {
+	whitw-space: nowrap;
+	text-align: center;
+	font-family: Arial;
+	font-weight: normal;
+	font-size: 12px;
+	border-left: 0px solid black;
+	border-right: 0px solid black;
+	border-bottom: 0px solid black;
+}
+
+.td_sodawarnings_data {
+	whitw-space: nowrap;
+	text-align: center;
+	font-family: Arial;
+	font-weight: normal;
+	font-size: 12px;
+	border-left: 0px solid black;
+	border-right: 2px solid black;
+	border-bottom: 0px solid black;
+}
+
+.td_time_data {
+	whitw-space: nowrap;
+	text-align: center;
+	font-family: Arial;
+	font-weight: normal;
+	font-size: 12px;
+	border-left: 0px solid black;
+	border-right: 1px solid black;
+	border-bottom: 0px solid black;
+}
+
+.td_footer_run {
+	whitw-space: nowrap;
+	background: #99CCFF;
+	text-align: center;
+	font-family: Arial;
+	font-weight: bold;
+	font-size: 12px;
+	color: #000000;
+	border-top: 2px solid black;
+	border-left: 0px solid black;
+	border-right: 2px solid black;
+	border-bottom: 2px solid black;
+}
+
+.td_footer_passed {
+	whitw-space: nowrap;
+	background: #99CCFF;
+	text-align: center;
+	font-family: Arial;
+	font-weight: bold;
+	font-size: 12px;
+	color: #00FF00;
+	border-top: 2px solid black;
+	border-left: 0px solid black;
+	border-right: 0px solid black;
+	border-bottom: 2px solid black;
+}
+
+.td_footer_failed {
+	whitw-space: nowrap;
+	background: #99CCFF;
+	text-align: center;
+	font-family: Arial;
+	font-weight: bold;
+	font-size: 12px;
+	color: #FF0000;
+	border-top: 2px solid black;
+	border-left: 0px solid black;
+	border-right: 2px solid black;
+	border-bottom: 2px solid black;
+}
+
+.td_footer_blocked {
+	whitw-space: nowrap;
+	background: #99CCFF;
+	text-align: center;
+	font-family: Arial;
+	font-weight: bold;
+	font-size: 12px;
+	color: #FFCF10;
+	border-top: 2px solid black;
+	border-left: 0px solid black;
+	border-right: 0px solid black;
+	border-bottom: 2px solid black;
+}
+
+.td_footer_skipped {
+	whitw-space: nowrap;
+	background: #99CCFF;
+	text-align: center;
+	font-family: Arial;
+	font-weight: bold;
+	font-size: 12px;
+	color: #D9D9D9;
+	border-top: 2px solid black;
+	border-left: 0px solid black;
+	border-right: 2px solid black;
+	border-bottom: 2px solid black;
+}
+
+.td_footer_watchdog {
+	whitw-space: nowrap;
+	background: #99CCFF;
+	text-align: center;
+	font-family: Arial;
+	font-weight: bold;
+	font-size: 12px;
+	color: #FF0000;
+	border-top: 2px solid black;
+	border-left: 0px solid black;
+	border-right: 0px solid black;
+	border-bottom: 2px solid black;
+}
+
+.td_footer_exceptions {
+	whitw-space: nowrap;
+	background: #99CCFF;
+	text-align: center;
+	font-family: Arial;
+	font-weight: bold;
+	font-size: 12px;
+	color: #FF0000;
+	border-top: 2px solid black;
+	border-left: 0px solid black;
+	border-right: 0px solid black;
+	border-bottom: 2px solid black;
 }
 
-.tr_header
-{
-   white-space: nowrap;
-   background: #a4a4a4;
-   font-weight: bold;
+.td_footer_javascript {
+	whitw-space: nowrap;
+	background: #99CCFF;
+	text-align: center;
+	font-family: Arial;
+	font-weight: bold;
+	font-size: 12px;
+	color: #FF0000;
+	border-top: 2px solid black;
+	border-left: 0px solid black;
+	border-right: 0px solid black;
+	border-bottom: 2px solid black;
 }
 
-table 
-{
-   background: #ffff;
-   border: 1px solid black;
-   border-bottom: 1px solid #0000;
-   border-right: 1px solid #0000;
-   color: #0000;
-   padding: 4px;
-   font-size: 11px;
+.td_footer_assert {
+	whitw-space: nowrap;
+	background: #99CCFF;
+	text-align: center;
+	font-family: Arial;
+	font-weight: bold;
+	font-size: 12px;
+	color: #FF0000;
+	border-top: 2px solid black;
+	border-left: 0px solid black;
+	border-right: 0px solid black;
+	border-bottom: 2px solid black;
+}
+
+.td_footer_other {
+	whitw-space: nowrap;
+	background: #99CCFF;
+	text-align: center;
+	font-family: Arial;
+	font-weight: bold;
+	font-size: 12px;
+	color: #FF0000;
+	border-top: 2px solid black;
+	border-left: 0px solid black;
+	border-right: 0px solid black;
+	border-bottom: 2px solid black;
+}
+
+.td_footer_total {
+	whitw-space: nowrap;
+	background: #99CCFF;
+	text-align: center;
+	font-family: Arial;
+	font-weight: bold;
+	font-size: 12px;
+	color: #FF0000;
+	border-top: 2px solid black;
+	border-left: 2px solid black;
+	border-right: 2px solid black;
+	border-bottom: 2px solid black;
+}
+
+.td_footer_css {
+	whitw-space: nowrap;
+	background: #99CCFF;
+	text-align: center;
+	font-family: Arial;
+	font-weight: bold;
+	font-size: 12px;
+	color: #000000;
+	border-top: 2px solid black;
+	border-left: 0px solid black;
+	border-right: 0px solid black;
+	border-bottom: 2px solid black;
+}
+
+.td_footer_sodawarnings {
+	whitw-space: nowrap;
+	background: #99CCFF;
+	text-align: center;
+	font-family: Arial;
+	font-weight: bold;
+	font-size: 12px;
+	color: #000000;
+	border-top: 2px solid black;
+	border-left: 0px solid black;
+	border-right: 0px solid black;
+	border-bottom: 2px solid black;
+}
+
+.td_footer_times {
+	whitw-space: nowrap;
+	background: #99CCFF;
+	text-align: center;
+	font-family: Arial;
+	font-weight: bold;
+	font-size: 12px;
+	color: #000000;
+	border-top: 2px solid black;
+	border-left: 2px solid black;
+	border-right: 0px solid black;
+	border-bottom: 2px solid black;
 }
 </style>
-<title>Soda Global Report Summery: #{now}</title>
 <body>
-<li>#{now}</li>
 <table>
-<tr class="tr_header">
-\t<td>Test File:<br>
-\tClick link for full report</td>
-\t<td>Test Count:</td>
-\t<td>Test Skip Count:</td>
-\t<td>Failure Count:</td>
-\t<td>CSS Error Count:</td>
-\t<td>JavaScript Error Count:</td>
-\t<td>Assert Failures:</td>
-\t<td>Event Count:</td>
-\t<td>Assert Count:</td>
-\t<td>Exceptions:</td>
-\t<td>Major Exceptions:</td>
-\t<td>Running Time:<br>(hh:mm:ss):</td>
+<tr>
+	<td class="td_header_master" rowspan="2">Suite</br>
+	(click link for full report)</td>
+	<td class="td_header_master" colspan="5">Tests</td>
+	<td class="td_header_master" colspan="6">Failures</td>
+	<td class="td_header_master" colspan="2">Warnings</td>
+	<td class="td_header_master" rowspan="2">Run Time</br>(hh:mm:ss)</td>
+</tr>
+<tr>
+	<td class="td_header_sub">Run</td>
+	<td class="td_header_sub">Passed</td>
+	<td class="td_header_sub">Failed</td>
+	<td class="td_header_sub">Blocked</td>
+	<td class="td_header_skipped">Skipped</td>
+	<td class="td_header_watchdog">Watchdogs</td>
+	<td class="td_header_sub">Exceptions</td>
+	<td class="td_header_sub">JavaScript</br>Errors</td>
+	<td class="td_header_sub">Assert</br>Failures</td>
+	<td class="td_header_sub">Other</br>Failures</td>
+	<td class="td_header_skipped">Total</br>Failures</td>
+	<td class="td_header_watchdog">CSS Errors</td>
+	<td class="td_header_skipped">Soda</br>Warnings</td>	
 </tr>
 HTML
 
    fd.write(html_header)
 
    data.each do |rpt|
+		totals['Test Warning Count'] +=
+			rpt['report_hash']['Test Warning Count'].to_i()
+		totals['Test Other Failures'] +=
+			rpt['report_hash']['Test Other Failures'].to_i()
+		totals['Test WatchDog Count'] +=
+			rpt['report_hash']['Test WatchDog Count'].to_i()
+		totals['Test Blocked Count'] +=
+			rpt['report_hash']['Test Blocked Count'].to_i()
+		totals['Test Passed Count'] += 
+			rpt['report_hash']['Test Passed Count'].to_i()
       totals['Test Failure Count'] += 
          rpt['report_hash']['Test Failure Count'].to_i()
       totals['Test CSS Error Count'] += 
@@ -361,8 +825,6 @@ HTML
          rpt['report_hash']['Test Assert Count'].to_i()
       totals['Test Exceptions'] += 
          rpt['report_hash']['Test Exceptions'].to_i()
-      totals['Test Major Exceptions'] +=
-         rpt['report_hash']['Test Major Exceptions'].to_i()
       totals['Test Count'] += rpt['report_hash']['Test Count'].to_i()
       totals['Test Skip Count'] += rpt['report_hash']['Test Skip Count'].to_i()
 
@@ -378,17 +840,6 @@ HTML
       end
       hours,minutes,seconds,frac = Date.day_fraction_to_time(time_diff)
 
-      rpt['report_hash'].each do |k,v|
-         if ( (v.to_i > 0) && (k !~ /test\s+assert\s+count/i) &&
-               (k !~ /test\s+event\s+count/i) && 
-               (k !~ /css\s+error\s+count/i) &&
-               (k !~ /test\s+count/i))
-            tmp = '<font color="#FF0000"><b>'
-            tmp += "#{v}</b></font>"
-            rpt['report_hash'][k] = tmp
-         end
-      end
-
       report_file = File.basename(rpt['log_file'], ".log")
       report_file = "Report-#{report_file}.html"
 
@@ -403,59 +854,126 @@ HTML
          log_file_td = "#{rpt['test_file']}"
       end
 
-      str = "<tr class=\"tr_normal\" "+
+		rpt['report_hash'].each do |k,v|
+			rpt['report_hash'][k] = v.to_i()	
+		end
+
+		test_run_class = "td_run_data"
+		if (rpt['report_hash']['Test Failure Count'] > 0)
+			test_run_class = "td_run_data_error"
+		end
+
+		rpt['report_hash']['Test Other Failures'] = 0
+		total_failures = 0
+		total_failures += rpt['report_hash']['Test Failure Count']
+		total_failures += rpt['report_hash']['Test WatchDog Count']
+		total_failures += rpt['report_hash']['Test Assert Failures']
+		total_failures += rpt['report_hash']['Test Other Failures']
+		total_failures += rpt['report_hash']['Test JavaScript Error Count']
+		totals['Total Failure Count'] += total_failures
+
+		tcount = 0
+		tcount += rpt['report_hash']['Test Count']
+		tcount += rpt['report_hash']['Test Blocked Count']
+		tcount += rpt['report_hash']['Test Skip Count']
+
+		exceptions_td = "td_exceptions_data"
+		if (rpt['report_hash']['Test Exceptions'] > 0)
+			exceptions_td = "td_exceptions_error_data"
+		end
+
+		asserts_td = "td_assert_data"
+		if (rpt['report_hash']['Test Assert Failures'] > 0)
+			asserts_td = "td_assert_error_data"
+		end
+
+		watchdog_td = "td_watchdog_data"
+		if (rpt['report_hash']['Test WatchDog Count'] > 0)
+			watchdog_td = "td_watchdog_error_data"
+		end
+
+		jscript_td = "td_javascript_data"
+		if (rpt['report_hash']['Test JavaScript Error Count'] > 0)
+			jscript_td = "td_javascript_error_data"
+		end
+
+		t_passedcount = rpt['report_hash']['Test Count']
+		t_passedcount -= rpt['report_hash']['Test Failure Count']
+
+      str = "<tr class=\"unhighlight\" "+
          "onMouseOver=\"this.className='highlight'\" "+
-         "onMouseOut=\"this.className='tr_normal'\">\n" +
-         "\t<td class=\"td_file\">#{log_file_td}</td>\n" +
-         "\t<td>#{rpt['report_hash']['Test Count']}</td>\n"+
-         "\t<td>#{rpt['report_hash']['Test Skip Count']}</td>\n"+
-         "\t<td>#{rpt['report_hash']['Test Failure Count']}</td>\n"+
-         "\t<td>#{rpt['report_hash']['Test CSS Error Count']}</td>\n" +
-         "\t<td>#{rpt['report_hash']['Test JavaScript Error Count']}</td>\n" +
-         "\t<td>#{rpt['report_hash']['Test Assert Failures']}</td>\n" +
-         "\t<td>#{rpt['report_hash']['Test Event Count']}</td>\n" +
-         "\t<td>#{rpt['report_hash']['Test Assert Count']}</td>\n" +
-         "\t<td>#{rpt['report_hash']['Test Exceptions']}</td>\n" +
-         "\t<td>#{rpt['report_hash']['Test Major Exceptions']}</td>\n" +
-         "\t<td>#{hours}:#{minutes}:#{seconds}</td>\n</tr>\n"
+         "onMouseOut=\"this.className='unhighlight'\">\n"+
+         "\t<td class=\"td_file_data\">#{log_file_td}</td>\n"+
+         "\t<td class=\"#{test_run_class}\">"+
+				"#{t_passedcount}/#{tcount}</td>\n"+
+			"\t<td class=\"td_passed_data\">"+
+				"#{rpt['report_hash']['Test Passed Count']}</td>\n"+
+         "\t<td class=\"td_failed_data\">"+
+				"#{rpt['report_hash']['Test Failure Count']}</td>\n"+
+         "\t<td class=\"td_blocked_data\">"+
+				"#{rpt['report_hash']['Test Blocked Count']}</td>\n"+
+         "\t<td class=\"td_skipped_data\">"+
+				"#{rpt['report_hash']['Test Skip Count']}</td>\n"+
+			"\t<td class=\"#{watchdog_td}\">"+
+				"#{rpt['report_hash']['Test WatchDog Count']}</td>\n"+
+			"\t<td class=\"#{exceptions_td}\">"+
+				"#{rpt['report_hash']['Test Exceptions']}</td>\n"+
+         "\t<td class=\"#{jscript_td}\">"+
+				"#{rpt['report_hash']['Test JavaScript Error Count']}</td>\n"+
+         "\t<td class=\"#{asserts_td}\">"+
+				"#{rpt['report_hash']['Test Assert Failures']}</td>\n"+
+			"\t<td class=\"td_other_data\">"+
+				"#{rpt['report_hash']['Test Other Failures']}</td>\n"+
+			"\t<td class=\"td_total_data\">#{total_failures}</td>\n"+
+         "\t<td class=\"td_css_data\">"+
+				"#{rpt['report_hash']['Test CSS Error Count']}</td>\n"+
+			"\t<td class=\"td_sodawarnings_data\">"+
+				"#{rpt['report_hash']['Test Warning Count']}</td>\n"+
+         "\t<td class=\"td_time_data\">"+
+				"#{hours}:#{minutes}:#{seconds}</td>\n</tr>\n"
          fd.write(str)
    end
  
    hours,minutes,seconds,frac = 
       Date.day_fraction_to_time(totals['running_time'])
 
-   totals.each do |k,v|
-      if ( (v.to_i > 0) && (k !~ /test\s+assert\s+count/i) &&
-            (k !~ /test\s+event\s+count/i) && 
-            (k !~ /css\s+error\s+count/i) &&
-            (k !~ /test\s+count/i) )
-
-         tmp = '<font color="#FF0000"><b>'
-         tmp += "#{v}</b></font>"
-         totals[k] = tmp
-      end
-   end
-
    totals['Test Skip Count'] = totals['Test Skip Count'].to_i()
-   test_totals = totals['Test Count'] + totals['Test Skip Count']
-   sub_totals = "<tr class=\"tr_header\">\n"+
-      "\t<td>Totals:</td>\n"+
-      "\t<td>#{totals['Test Count']}</td>\n"+
-      "\t<td>#{totals['Test Skip Count']}</td>\n"+
-      "\t<td>#{totals['Test Failure Count']}</td>\n"+
-      "\t<td>#{totals['Test CSS Error Count']}</td>\n"+
-      "\t<td>#{totals['Test JavaScript Error Count']}</td>\n"+
-      "\t<td>#{totals['Test Assert Failures']}</td>\n"+
-      "\t<td>#{totals['Test Event Count']}</td>\n"+
-      "\t<td>#{totals['Test Assert Count']}</td>\n"+
-      "\t<td>#{totals['Test Exceptions']}</td>\n"+
-      "\t<td>#{totals['Test Major Exceptions']}</td>\n"+
-      "\t<td>#{hours}:#{minutes}:#{seconds}</td>\n"+
-      "</tr>\n" +
-      "<tr class=\"tr_header\">\n"+
-      "\t<td>Total Test Count:</td>\n"+
-      "\t<td colspan=\"2\">#{test_totals}</td>\n</tr>\n"
-
+   test_totals = totals['Test Count'] 
+	test_totals += totals['Test Skip Count']
+	test_totals += totals['Test Blocked Count']
+
+
+   sub_totals = "<tr>\n"+
+      "\t<td class=\"td_header_master\">Totals:</td>\n"+
+      "\t<td class=\"td_footer_run\">#{totals['Test Count']}"+
+			"/#{test_totals}</td>\n"+
+		"\t<td class=\"td_footer_passed\">#{totals['Test Passed Count']}"+
+			"</td>\n"+
+	   "\t<td class=\"td_footer_failed\">"+
+			"#{totals['Test Failure Count']}</td>\n"+	
+	   "\t<td class=\"td_footer_blocked\">"+
+			"#{totals['Test Blocked Count']}</td>\n"+	
+	   "\t<td class=\"td_footer_skipped\">"+
+			"#{totals['Test Skip Count']}</td>\n"+	
+	   "\t<td class=\"td_footer_watchdog\">"+
+			"#{totals['Test WatchDog Count']}</td>\n"+	
+		"\t<td class=\"td_footer_exceptions\">"+
+			"#{totals['Test Exceptions']}</td>\n"+
+      "\t<td class=\"td_footer_javascript\">"+
+			"#{totals['Test JavaScript Error Count']}</td>\n"+
+      "\t<td class=\"td_footer_assert\">"+
+			"#{totals['Test Assert Failures']}</td>\n"+
+      "\t<td class=\"td_footer_other\">"+
+			"#{totals['Test Other Failures']}\n"+
+      "\t<td class=\"td_footer_total\">"+
+			"#{totals['Total Failure Count']}</td>\n"+
+      "\t<td class=\"td_footer_css\">"+
+			"#{totals['Test CSS Error Count']}</td>\n"+
+		"\t<td class=\"td_footer_sodawarnings\">"+
+			"#{totals['Test Warning Count']}</td>\n"+
+		"\t<td class=\"td_footer_times\">"+
+			"#{hours}:#{minutes}:#{seconds}</td>\n"+
+      "</tr>\n"
    fd.write(sub_totals)
    fd.write("</table>\n</body>\n</html>\n")
    fd.close()

data/lib/SodaReporter.rb

@@ -54,11 +54,16 @@ class SodaReporter
       @js_error_count = 0
       @css_error_count = 0
 		@asserts_count = 0
-		@exception_major_count = 0
 		@assertFails_count = 0
 		@exception_count = 0	
       @test_count = 0
       @test_skip_count = 0
+		@test_blocked_count = 0
+		@test_failed_count = 0
+		@test_passed_count = 0
+		@test_watchdog_count = 0
+		@test_warning_count = 0
+		@test_total_count = 0
 		@fatals = 0
 		@total = 0
       @failureCount = 0
@@ -144,6 +149,54 @@ class SodaReporter
    end
    public :IncSkippedTest
 
+###############################################################################
+# IncTestTotalCount -- Method
+#     This method incerments the count by 1 for tests that were skipped.
+#
+# Input:
+#     n: the number to inc by, 1 is the default.
+#
+# Output:
+#     None.
+#
+###############################################################################
+   def IncTestTotalCount(n = 1)
+      @test_total_count += 1
+   end
+   public :IncTestTotalCount
+
+###############################################################################
+# IncBlockedTest -- Method
+#     This method incerments the count by 1 for tests that were blocked.
+#
+# Input:
+#     None.
+#
+# Output:
+#     None.
+#
+###############################################################################
+   def IncBlockedTest()
+      @test_blocked_count += 1
+   end
+   public :IncBlockedTest
+
+###############################################################################
+# IncFailedTest -- Method
+#     This method incerments the count by 1 for tests that failed.
+#
+# Input:
+#     None.
+#
+# Output:
+#     None.
+#
+###############################################################################
+   def IncFailedTest()
+      @test_failed_count += 1
+   end
+   public :IncFailedTest
+
 ###############################################################################
 # IncTestCount -- Method
 #     This method incerments the count by 1 for tests that were ran
@@ -160,6 +213,54 @@ class SodaReporter
    end
    public :IncTestCount
 
+###############################################################################
+# IncTestWarningCount -- Method
+#     This method incerments the count by 1 for tests that were ran
+#
+# Input:
+#     None.
+#
+# Output:
+#     None.
+#
+###############################################################################
+   def IncTestWarningCount()
+      @test_warning_count += 1
+   end
+   public :IncTestWarningCount
+
+###############################################################################
+# IncTestPassedCount -- Method
+#     This method incerments the count by 1 for tests that passed.
+#
+# Input:
+#     None.
+#
+# Output:
+#     None.
+#
+###############################################################################
+   def IncTestPassedCount()
+      @test_passed_count += 1
+   end
+   public :IncTestPassedCount
+
+###############################################################################
+# IncTestWatchDogCount -- Method
+#     This method incerments the count by 1 for tests that watchdog'd.
+#
+# Input:
+#     None.
+#
+# Output:
+#     None.
+#
+###############################################################################
+   def IncTestWatchDogCount()
+      @test_watchdog_count += 1
+   end
+   public :IncTestWatchDogCount
+
 ###############################################################################
 # ReportHTML -- Method
 #     This function will generate an html report from the raw soda log file.
@@ -323,9 +424,6 @@ class SodaReporter
 #
 # Params:
 #     sodaException: This is the exception that is passed from Soda.
-#     
-#     mojor: Tells use if this was a mojor exception or now.
-#
 #     file: The soda test file that the exception was raised by durring the
 #        test.
 #
@@ -338,7 +436,7 @@ class SodaReporter
 #     So I will be killer this param soon...
 #
 ###############################################################################
-   def ReportException(sodaException, major = false, file = false)
+   def ReportException(sodaException, file = false)
       msg = nil
       @exception_count += 1
 	
@@ -354,14 +452,11 @@ class SodaReporter
          log("Exception raised: #{msg}\n", SodaUtils::ERROR)
       end
 
-		if (major)
-			@exception_major_count += 1
-         bt = "--Exception Backtrace: " + sodaException.backtrace.join("--") +
-            "\n"
-         btm = "--Exception Message: #{msg}\n"
-         log("Major exception raised for file: #{file}" + btm + bt, 
-            SodaUtils::ERROR)
-		end
+		bt = "--Exception Backtrace: " + sodaException.backtrace.join("--") +
+			"\n"
+		btm = "--Exception Message: #{msg}\n"
+		log("Exception raised for file: #{file}" + btm + bt, 
+			SodaUtils::ERROR)
 	end
 
 ###############################################################################
@@ -456,9 +551,13 @@ class SodaReporter
          "--Test Event Count:#{@total}" +
          "--Test Assert Count:#{@asserts_count}" +
          "--Test Exceptions:#{@exception_count}" +
-         "--Test Major Exceptions: #{@exception_major_count}" +
          "--Test Count:#{@test_count}" +
-         "--Test Skip Count:#{@test_skip_count}\n"
+         "--Test Skip Count:#{@test_skip_count}" +
+			"--Test Blocked Count:#{@test_blocked_count}" +
+			"--Test Failed Count:#{@test_failed_count}" +
+			"--Test Passed Count:#{@test_passed_count}" +
+			"--Test WatchDog Count:#{@test_watchdog_count}"+
+			"--Test Warning Count:#{@test_warning_count}\n"
          log(msg)
 	end
 

data/lib/SodaUtils.rb

@@ -487,7 +487,8 @@ def SodaUtils.ConvertOldBrowserClose(event, reportobj, testfile)
          "=\"true\" /> Test file: \"#{testfile}\", Line: "+
          "#{event['line_number']}!\n", 
          SodaUtils::WARN)
-      reportobj.log("Use <browser action=\"close\" />.\n", SodaUtils::WARN)
+		reportobj.IncTestWarningCount()
+      reportobj.log("Use <browser action=\"close\" />.\n")
    end
 
    return event
@@ -523,9 +524,10 @@ def SodaUtils.ConvertOldAssert(event, reportobj, testfile)
          "< assert=\"something\" exist=\"false\" />" +
          " Test file: \"#{testfile}\", Line: #{event['line_number']}\n."
       reportobj.log(msg, SodaUtils::WARN)
+		reportobj.IncTestWarningCount()
       
       msg = "Use: < assertnot=\"something\" />\n"
-      reportobj.log(msg, SodaUtils::WARN)
+      reportobj.log(msg)
 
       event.delete('exist')
       event.delete('assert')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: soda
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Trampus Richmond
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 -08:00
+date: 2010-12-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency