[robotframework] 3 new revisions pushed by pekka.klarck on 2011-06-22 10:01 GMT

robotframework Wed, 22 Jun 2011 03:01:45 -0700

3 new revisions:

Revision: 56cf8e1db352
Author:   Pekka Klärck
Date:     Wed Jun 22 02:56:19 2011
Log:      consistent indentation
http://code.google.com/p/robotframework/source/detail?r=56cf8e1db352


Revision: bdac19f95a69
Author:   Pekka Klärck
Date:     Wed Jun 22 02:57:56 2011

Log: store metadata in js model as list instead of object to keepordering

http://code.google.com/p/robotframework/source/detail?r=bdac19f95a69

Revision: 17443edc493e
Author:   Pekka Klärck
Date:     Wed Jun 22 03:01:12 2011
Log:      fixed utest that was broken after changing metadata json format
http://code.google.com/p/robotframework/source/detail?r=17443edc493e

==============================================================================
Revision: 56cf8e1db352
Author:   Pekka Klärck
Date:     Wed Jun 22 02:56:19 2011
Log:      consistent indentation
http://code.google.com/p/robotframework/source/detail?r=56cf8e1db352

Modified:
 /src/robot/webcontent/log.html

=======================================
--- /src/robot/webcontent/log.html      Tue Jun 21 05:00:44 2011
+++ /src/robot/webcontent/log.html      Wed Jun 22 02:56:19 2011
@@ -166,21 +166,41 @@
       <td class="suite_children">
         <div class="indent" id="${id}_children" style="display: none;">
           <table class="metadata" id="${id}_metadata">
-            <tr><th>Full Name:</th><td>${fullName}</td></tr>
+            <tr>
+              <th>Full Name:</th>
+              <td>${fullName}</td>
+            </tr>
             {{if doc}}
-            <tr><th>Documentation:</th><td>{{html doc}}</td></tr>
+            <tr>
+              <th>Documentation:</th>
+              <td>{{html doc}}</td>
+            </tr>
             {{/if}}
             {{each metadata}}
-            <tr><th>${$index}:</th><td>{{html $value}}</td></tr>
+            <tr>
+              <th>${$index}:</th>
+              <td>{{html $value}}</td>
+            </tr>
             {{/each}}
             <!-- TODO: Link (href) to source should be relative -->
             {{if source}}

- <tr><th>Source:</th><td><ahref="${source}">${source}</a></td></tr>

+            <tr>
+              <th>Source:</th>
+              <td><a href="${source}">${source}</a></td>
+            </tr>
              {{/if}}

- <tr><th>Start / End / Elapsed:</th><td>${times.startTime} /${times.endTime} / ${times.elapsedTime}</td></tr>-<tr><th>Status:</th><td>{{tmpl($data) 'suiteStatusMessageTemplate'}}</td></tr>

+            <tr>

+ <th>Start / End / Elapsed:</th><td>${times.startTime} /${times.endTime} / ${times.elapsedTime}</td>

+            </tr>
+            <tr>
+              <th>Status:</th>
+              <td>{{tmpl($data) 'suiteStatusMessageTemplate'}}</td>
+            </tr>
             {{if message}}
-            <tr><th>Message:</th><td>${message}</td></tr>
+            <tr>
+              <th>Message:</th>
+              <td>${message}</td>
+            </tr>
             {{/if}}
           </table>
         </div>
@@ -212,20 +232,41 @@
       <td>
         <div class="indent" id="${id}_children" style="display: none;">
           <table class="metadata" id="${id}_metadata">
-            <tr><th>Full Name:</th><td>${fullName}</td></tr>
+            <tr>
+              <th>Full Name:</th>
+              <td>${fullName}</td>
+            </tr>
             {{if doc}}
-            <tr><th>Documentation:</th><td>{{html doc}}</td></tr>
+            <tr>
+              <th>Documentation:</th>
+              <td>{{html doc}}</td>
+            </tr>
             {{/if}}
             {{if tags.length}}
-            <tr><th>Tags:</th><td>${tags.join(', ')}</td></tr>
+            <tr>
+              <th>Tags:</th>
+              <td>${tags.join(', ')}</td>
+            </tr>
             {{/if}}
             {{if timeout}}
-            <tr><th>Timeout:</th><td>${timeout}</td></tr>
+            <tr>
+              <th>Timeout:</th>
+              <td>${timeout}</td>
+            </tr>
             {{/if}}

- <tr><th>Start / End / Elapsed:</th><td>${times.startTime} /${times.endTime} / ${times.elapsedTime}</td></tr>- <tr><th>Status:</th><td><spanclass="${status.toLowerCase()}">${status}</span>{{if isCritical}}(critical){{/if}}</td></tr>

+            <tr>
+              <th>Start / End / Elapsed:</th>

+ <td>${times.startTime} / ${times.endTime} /${times.elapsedTime}</td>

+            </tr>
+            <tr>
+              <th>Status:</th>

+ <td><spanclass="${status.toLowerCase()}">${status}</span>{{if isCritical}}(critical){{/if}}</td>

+            </tr>
             {{if message}}
-            <tr><th>Message:</th><td>${message}</td></tr>
+            <tr>
+              <th>Message:</th>
+              <td>${message}</td>
+            </tr>
             {{/if}}
           </table>
         </div>
@@ -256,9 +297,15 @@
         <div class="indent" id="${id}_children" style="display: none;">
           <table class="metadata" id="${id}_metadata">
             {{if doc}}
-            <tr><th>Documentation:</th><td>{{html doc}}</td></tr>
+            <tr>
+              <th>Documentation:</th>
+              <td>{{html doc}}</td>
+            </tr>
             {{/if}}

- <tr><th>Start / End / Elapsed:</th><td>${times.startTime} /${times.endTime} / ${times.elapsedTime}</td></tr>

+            <tr>
+              <th>Start / End / Elapsed:</th>

+ <td>${times.startTime} / ${times.endTime} /${times.elapsedTime}</td>

+            </tr>
           </table>
         </div>
       </td>

==============================================================================
Revision: bdac19f95a69
Author:   Pekka Klärck
Date:     Wed Jun 22 02:57:56 2011

Log: store metadata in js model as list instead of object to keepordering

http://code.google.com/p/robotframework/source/detail?r=bdac19f95a69

Modified:
 /src/robot/webcontent/log.html
 /src/robot/webcontent/report.html
 /src/robot/webcontent/testdata.js

=======================================
--- /src/robot/webcontent/log.html      Wed Jun 22 02:56:19 2011
+++ /src/robot/webcontent/log.html      Wed Jun 22 02:57:56 2011
@@ -178,8 +178,8 @@
             {{/if}}
             {{each metadata}}
             <tr>
-              <th>${$index}:</th>
-              <td>{{html $value}}</td>
+              <th>${$value[0]}:</th>
+              <td>{{html $value[1]}}</td>
             </tr>
             {{/each}}
             <!-- TODO: Link (href) to source should be relative -->
=======================================
--- /src/robot/webcontent/report.html   Tue Jun 21 05:00:44 2011
+++ /src/robot/webcontent/report.html   Wed Jun 22 02:57:56 2011
@@ -269,8 +269,8 @@
     {{/if}}
     {{each metadata}}
     <tr>
-      <th>${$index}:</th>
-      <td>{{html $value}}</td>
+      <th>${$value[0]}:</th>
+      <td>{{html $value[1]}}</td>
     </tr>
     {{/each}}
     {{if times.startTime != 'N/A'}}
@@ -438,7 +438,10 @@
   </tr>
   {{/if}}
   {{each metadata}}
-  <tr><th>${$index}:</th><td>{{html $value}}</td></tr>
+  <tr>
+    <th>${$value[0]}:</th>
+    <td>{{html $value[1]}}</td>
+  </tr>
   {{/each}}
   <tr>
     <th>Status:</th>
=======================================
--- /src/robot/webcontent/testdata.js   Wed Jun 22 02:46:04 2011
+++ /src/robot/webcontent/testdata.js   Wed Jun 22 02:57:56 2011
@@ -141,9 +141,9 @@
     }

     function parseMetadata(data) {
-        var metadata = {};
+        var metadata = [];
         for (var i=0; i<data.length; i+=2) {
-            metadata[get(data[i])] = get(data[i+1]);
+            metadata.push([get(data[i]), get(data[i+1])]);
         }
         return metadata;
     }

==============================================================================
Revision: 17443edc493e
Author:   Pekka Klärck
Date:     Wed Jun 22 03:01:12 2011
Log:      fixed utest that was broken after changing metadata json format
http://code.google.com/p/robotframework/source/detail?r=17443edc493e

Modified:
 /utest/result/test_js_serializer.py

=======================================
--- /utest/result/test_js_serializer.py Tue Jun 21 21:57:23 2011
+++ /utest/result/test_js_serializer.py Wed Jun 22 03:01:12 2011
@@ -262,9 +262,8 @@

doc = '*<b>html</b> <esc> <ahref="http://x.y";>http://x.y</a> <img src="http://x.y/z.jpg";title="http://x.y/z.jpg"; style="border: 1px solid gray" />'

         self.assert_model(data_model, basemillis=1306918911353,

plain_suite=['*suite', '*/tmp/verysimple.txt', '*Verysimple', doc,

-                                       {'*esc': '*&lt;',
-                                        '*key': '*val',

- '*html': '*<imgsrc="http://x.y.x.jpg"; title="http://x.y.x.jpg"; style="border: 1px solidgray" />'},

+                                       ['*key', '*val', '*esc', '*&lt;',

+ '*html', '*<imgsrc="http://x.y.x.jpg"; title="http://x.y.x.jpg"; style="border: 1px solidgray" />'],

                               ['*test', '*Test', '*', '*Y', doc,

['*kw', '*Keyword.Example', '*1 second',doc,'*a1, a2', [0, '*W', '*simple'], ['*P',23, -23]],

[robotframework] 3 new revisions pushed by pekka.klarck on 2011-06-22 10:01 GMT

Reply via email to