Thread: [Jameleon-cvscommits] SF.net SVN: jameleon: [1450] trunk/jameleon-core (Page 2)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1450
          http://svn.sourceforge.net/jameleon/?rev=1450&view=rev
Author:   selie
Date:     2007-02-25 21:25:39 -0800 (Sun, 25 Feb 2007)

Log Message:
-----------
Modified results for error message/stacktrace display.
  Added auto expand to error messages
  Added icons/stacktrace.gif to expand stacktrace
  Added link from failures summary to error message

Modified Paths:
--------------
    trunk/jameleon-core/res/TestCaseResultsDataDrivenChildTemplate.txt
    trunk/jameleon-core/res/TestCaseResultsLeafChildTemplate.txt
    trunk/jameleon-core/res/TestCaseResultsTemplate.txt
    trunk/jameleon-core/res/testCaseDocs.css
    trunk/jameleon-core/src/java/net/sf/jameleon/TestCaseTag.java

Added Paths:
-----------
    trunk/jameleon-core/res/icons/stacktrace.gif

Modified: trunk/jameleon-core/res/TestCaseResultsDataDrivenChildTemplate.txt
===================================================================

--- trunk/jameleon-core/res/TestCaseResultsDataDrivenChildTemplate.txt	2007-02-26 05:21:12 UTC (rev 1449)
+++ trunk/jameleon-core/res/TestCaseResultsDataDrivenChildTemplate.txt	2007-02-26 05:25:39 UTC (rev 1450)
@@ -1,9 +1,9 @@
 
 <div>
-    <img src="../../res/icons/${results.getOutcome()}.gif">&nbsp;
+    <img src="${results_res_dir}/icons/${results.getOutcome()}.gif">&nbsp;
     <a href="javascript:showInfo('$results.hashCode()_$results.getRowNum()_data')"><i>i</i></a>
     <img onclick="showBranch('$results.hashCode()_$results.getRowNum()');swapIcon('$results.hashCode()_$results.getRowNum()','$results.hashCode()_$results.getRowNum()_img')"
-         src="../../res/icons/plus.gif" border="0" id="$results.hashCode()_$results.getRowNum()_img">
+         src="${results_res_dir}/icons/plus.gif" border="0" id="$results.hashCode()_$results.getRowNum()_img">
     $shortDesc - row $results.getRowNum()    
 </div>
 
@@ -46,7 +46,12 @@
         </td></tr></table>
     </blockquote>
 </span>
-<span id="$results.hashCode()_$results.getRowNum()" class="branch">
+#if ($results.failed())
+    #set( $class = "branch_displayed")
+#else
+    #set( $class = "branch")
+#end
+<span id="$results.hashCode()_$results.getRowNum()" class="$class">
     #parse("TestCaseResultsChildTemplate.txt")
 </span>
 

Modified: trunk/jameleon-core/res/TestCaseResultsLeafChildTemplate.txt
===================================================================
--- trunk/jameleon-core/res/TestCaseResultsLeafChildTemplate.txt	2007-02-26 05:21:12 UTC (rev 1449)
+++ trunk/jameleon-core/res/TestCaseResultsLeafChildTemplate.txt	2007-02-26 05:25:39 UTC (rev 1450)
@@ -1,23 +1,26 @@
-<img src="../../res/icons/bullet.gif">
-<img src="../../res/icons/${results.getOutcome()}.gif">&nbsp;
+<img src="${results_res_dir}/icons/bullet.gif">
+<img src="${results_res_dir}/icons/${results.getOutcome()}.gif">&nbsp;
 <a href="javascript:showInfo('$results.hashCode()_data')"><i>i</i></a>&nbsp;
 <img onclick="showBranch('$results.hashCode()');swapIcon('$results.hashCode()','$results.hashCode()_img')"
-     src="../../res/icons/plus.gif" border="0" id="$results.hashCode()_img">
+     src="${results_res_dir}/icons/plus.gif" border="0" id="$results.hashCode()_img">
 #if ( $results.errorFile )
-<a href="$results.errorFile.name"><img src="../../res/icons/snapShot.gif"></a>
+<a href="$results.errorFile.name"><img src="${results_res_dir}/icons/snapShot.gif"></a>
 #end
-$shortDesc<br/>
-
+<a name="$results.hashCode()">$shortDesc</a><br/>
 #if ( $results.failed() )
-<br/>
-<pre>
-#if ($results.errorMsg)
-$results.errorMsg
-#end
+    <span id="$results.hashCode()_errMsg" class="errMsg">
+    <img onclick="showInfo('$results.hashCode()_stacktrace')" src="${results_res_dir}/icons/stacktrace.gif" border="0">
+    #if ($results.errorMsg)
+    $results.errorMsg
+    #else
+    See stacktrace for details
+    #end
+    </span>
+    <span id="$results.hashCode()_stacktrace" class="branch stacktrace">
     #foreach ( $st in $results.error.stackTrace )
-$st
+        $st<br/>
     #end
-</pre>
+    </span>
 #end
 
 <span id="$results.hashCode()_data" class="branch">
@@ -49,4 +52,4 @@
         #end
     </ol>
 </blockquote>
-</span>
\ No newline at end of file
+</span>

Modified: trunk/jameleon-core/res/TestCaseResultsTemplate.txt
===================================================================
--- trunk/jameleon-core/res/TestCaseResultsTemplate.txt	2007-02-26 05:21:12 UTC (rev 1449)
+++ trunk/jameleon-core/res/TestCaseResultsTemplate.txt	2007-02-26 05:25:39 UTC (rev 1450)
@@ -2,8 +2,8 @@
     <head>
         <title>$!tc.name Documentation</title>
         
-	    <style type="text/css" media="all">@import url("../../res/testCaseDocs.css");</style>
-	    <script language="JavaScript" src="../../res/testCaseDocs.js"></script>
+	    <style type="text/css" media="all">@import url("${results_res_dir}/testCaseDocs.css");</style>
+	    <script language="JavaScript" src="${results_res_dir}/testCaseDocs.js"></script>
     </head>
     <body>
         <table width="100%" cellspacing="0" class="fields">
@@ -61,18 +61,11 @@
 			<td>$results.getCountableResults().size()</td>
 			<td>$results.getFailedCountableResults().size()</td>
 			<td>To Be Calculated</td>
-			<td>
-            #foreach ( $failedResult in $results.getFailedCountableResults() )
-                #if ( $failedResult.isParent() )
-        			## This has to be recursive
-                    #foreach ( $failedResult2 in $failedResult.getChildrenResults() )
-                        $failedResult2.getErrorMsg() <br/>
-                    #end
-                #else
-                    $failedResult.getErrorMsg()
-                #end
+			<td class="failures">
+            #foreach ( $result in $results.getAllFailedLeafChildrenResults() )
+                <a href="#$result.hashCode()">$result.errorMsg</a> <br/>
             #end
-			</td>
+            </td>
 		    </tr>
 		  </table>
         <hr>

Added: trunk/jameleon-core/res/icons/stacktrace.gif
===================================================================
(Binary files differ)


Property changes on: trunk/jameleon-core/res/icons/stacktrace.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/jameleon-core/res/testCaseDocs.css
===================================================================
--- trunk/jameleon-core/res/testCaseDocs.css	2007-02-26 05:21:12 UTC (rev 1449)
+++ trunk/jameleon-core/res/testCaseDocs.css	2007-02-26 05:25:39 UTC (rev 1450)
@@ -44,6 +44,12 @@
   font-weight: bold;
   white-space: nowrap;
 }
+td.failures {
+  font-weight: bold;
+  white-space: nowrap;
+  font-weight: bold;
+  color: #ff0000; ;
+}
 body{
   font: 10pt Verdana,sans-serif;
   color: navy;
@@ -53,5 +59,21 @@
   margin-left: 16px;
 }
 .branch_displayed{
+  display: block;
   margin-left: 16px;
 }
+.errMsg{
+  font: 10pt Verdana,sans-serif;
+  font-weight: bold;
+  color: #ff0000; ;
+  margin-left: 16px;
+}
+.stacktrace{
+  font: 8pt Verdana,sans-serif;
+  color: #ff0000; ;
+  margin-left: 32px;
+}
+ol.steps_value{
+  font: 8pt Verdana,sans-serif;
+  font-style: italic;
+}
\ No newline at end of file

Modified: trunk/jameleon-core/src/java/net/sf/jameleon/TestCaseTag.java
===================================================================
--- trunk/jameleon-core/src/java/net/sf/jameleon/TestCaseTag.java	2007-02-26 05:21:12 UTC (rev 1449)
+++ trunk/jameleon-core/src/java/net/sf/jameleon/TestCaseTag.java	2007-02-26 05:25:39 UTC (rev 1450)
@@ -98,6 +98,7 @@
     protected boolean executeTestCase = true;
     protected String genTestCaseDocsTemplate = GEN_TEST_CASE_DOCS_TEMPLATE_DEFAULT;
     public static final String GEN_TEST_CASE_DOCS_TEMPLATE_DEFAULT = "TestCaseResultsTemplate.txt";
+    private static final String RESULTS_RES_DIR = "../../res";
     protected TestCaseEventHandler eventHandler = TestCaseEventHandler.getInstance();
     protected long startTime;
     protected File resultsFile;
@@ -117,7 +118,8 @@
     protected TestCaseResult results;
 
     //TODO: Remove this. This is a workaround to get correct failed and passed results
-    protected DataDrivableResult ddResult; 
+    protected DataDrivableResult ddResult;
+
     //TODO: Remove this also. Additional getter required to get row number in session tag if useCSV=true
     public DataDrivableResult getDdResult() {
         return ddResult;
@@ -911,6 +913,7 @@
         vars.put("tc", getTestCase());
         vars.put("results", getResults());
         vars.put("printFileName", Boolean.TRUE);
+        vars.put("results_res_dir", RESULTS_RES_DIR);
 
         xfrmr.transform(htmlFile, vars);
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Jameleon-cvscommits] SF.net SVN: jameleon: [1450] trunk/jameleon-core (Page 2)

jameleon-cvscommits