From 160c7303ca7cbc6519271e431287d13919356841 Mon Sep 17 00:00:00 2001
From: Brett Zamir <brettz9@gmail.com>
Date: Mon, 7 Apr 2014 05:33:44 +0000
Subject: [PATCH] Fix QUnit.log and references to it to reflect the currently
 included QUnit implementation; add missing files (test1.html is still failing
 even after the fixes, though it was not one of the tests included with
 all_tests.html)

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@2762 eee81c28-f429-11dd-99c0-75d572ba1ddd
---
 test/contextmenu_test.html      |  4 ++--
 test/coords_test.html           |  4 ++--
 test/draw_test.html             |  6 +++---
 test/history_test.html          |  4 ++--
 test/jquery-svg_test.html       |  4 ++--
 test/math_test.html             |  4 ++--
 test/path_test.html             |  4 ++--
 test/recalculate_test.html      |  4 ++--
 test/sanitize_test.html         |  4 ++--
 test/select_test.html           |  4 ++--
 test/svgtransformlist_test.html |  4 ++--
 test/svgutils_test.html         |  4 ++--
 test/test1.html                 | 11 +++++++----
 test/units_test.html            |  4 ++--
 14 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/test/contextmenu_test.html b/test/contextmenu_test.html
index c7469405..80cd87d0 100644
--- a/test/contextmenu_test.html
+++ b/test/contextmenu_test.html
@@ -14,9 +14,9 @@
   <script>
   $(function() {
     // log function
-    QUnit.log = function(result, message) {
+    QUnit.log = function(details) {
       if (window.console && window.console.log) {
-        window.console.log(result +' :: '+ message);
+        window.console.log(details.result +' :: '+ details.message);
       }
     };
 
diff --git a/test/coords_test.html b/test/coords_test.html
index cb6abc78..c19034fd 100644
--- a/test/coords_test.html
+++ b/test/coords_test.html
@@ -16,9 +16,9 @@
   <script>
   $(function() {
     // log function
-    QUnit.log = function(result, message) {
+    QUnit.log = function(details) {
       if (window.console && window.console.log) {
-        window.console.log(result +' :: '+ message);
+        window.console.log(details.result +' :: '+ details.message);
       }
     };
 
diff --git a/test/draw_test.html b/test/draw_test.html
index a9ffb376..b1555c86 100644
--- a/test/draw_test.html
+++ b/test/draw_test.html
@@ -13,9 +13,9 @@
   <script>
   $(function() {
     // log function
-    QUnit.log = function(result, message) {
+    QUnit.log = function(details) {
       if (window.console && window.console.log) {
-        window.console.log(result +' :: '+ message);
+        window.console.log(details.result +' :: '+ details.message);
       }
     };
     var NS = svgedit.NS;
@@ -457,7 +457,7 @@
       drawing.setLayerOpacity(LAYER3, -1.4);
 
       ok(drawing.getLayerOpacity(LAYER1) == 0.4);
-      QUnit.log('layer2 opacity', drawing.getLayerOpacity(LAYER2));
+      QUnit.log({result: 'layer2 opacity', message: drawing.getLayerOpacity(LAYER2)});
       ok(drawing.getLayerOpacity(LAYER2) == 1.0);
       ok(drawing.getLayerOpacity(LAYER3) == 1.0);
 
diff --git a/test/history_test.html b/test/history_test.html
index 078703e3..a876b106 100644
--- a/test/history_test.html
+++ b/test/history_test.html
@@ -21,9 +21,9 @@
     svgedit.utilities.getRotationAngle = function(elem) { return 0; };
 
     // log function
-    QUnit.log = function(result, message) {
+    QUnit.log = function(details) {
       if (window.console && window.console.log) {
-        window.console.log(result +' :: '+ message);
+        window.console.log(details.result +' :: '+ details.message);
       }
     };
 
diff --git a/test/jquery-svg_test.html b/test/jquery-svg_test.html
index b9ac5583..ecc7e644 100644
--- a/test/jquery-svg_test.html
+++ b/test/jquery-svg_test.html
@@ -9,9 +9,9 @@
   <script>
   $(function() {
     // log function
-    QUnit.log = function(result, message) {
+    QUnit.log = function(details) {
       if (window.console && window.console.log) {
-        window.console.log(result +' :: '+ message);
+        window.console.log(details.result +' :: '+ details.message);
       }
     };
 
diff --git a/test/math_test.html b/test/math_test.html
index 5aece3ce..fb5967dd 100644
--- a/test/math_test.html
+++ b/test/math_test.html
@@ -11,9 +11,9 @@
   <script>
   $(function() {
     // log function
-    QUnit.log = function(result, message) {
+    QUnit.log = function(details) {
       if (window.console && window.console.log) {
-        window.console.log(result +' :: '+ message);
+        window.console.log(details.result +' :: '+ details.message);
       }
     };
 
diff --git a/test/path_test.html b/test/path_test.html
index d1bf9381..20c40d06 100644
--- a/test/path_test.html
+++ b/test/path_test.html
@@ -11,9 +11,9 @@
   <script>
   $(function() {
     // log function
-    QUnit.log = function(result, message) {
+    QUnit.log = function(details) {
       if (window.console && window.console.log) {
-        window.console.log(result +' :: '+ message);
+        window.console.log(details.result +' :: '+ details.message);
       }
     };
   });
diff --git a/test/recalculate_test.html b/test/recalculate_test.html
index d3df4956..39931ee2 100644
--- a/test/recalculate_test.html
+++ b/test/recalculate_test.html
@@ -19,9 +19,9 @@
   <script>
   $(function() {
     // log function
-    QUnit.log = function(result, message) {
+    QUnit.log = function(details) {
       if (window.console && window.console.log) {
-        window.console.log(result +' :: '+ message);
+        window.console.log(details.result +' :: '+ details.message);
       }
     };
 
diff --git a/test/sanitize_test.html b/test/sanitize_test.html
index 61918ef8..540fa906 100644
--- a/test/sanitize_test.html
+++ b/test/sanitize_test.html
@@ -13,9 +13,9 @@
   <script>
   $(function() {
     // log function
-    QUnit.log = function(result, message) {
+    QUnit.log = function(details) {
       if (window.console && window.console.log) {
-        window.console.log(result +' :: '+ message);
+        window.console.log(details.result +' :: '+ details.message);
       }
     };
 
diff --git a/test/select_test.html b/test/select_test.html
index 88ade63f..d3a97d04 100644
--- a/test/select_test.html
+++ b/test/select_test.html
@@ -14,9 +14,9 @@
   <script>
   $(function() {
     // log function
-    QUnit.log = function(result, message) {
+    QUnit.log = function(details) {
       if (window.console && window.console.log) {
-        window.console.log(result +' :: '+ message);
+        window.console.log(details.result +' :: '+ details.message);
       }
     };
 
diff --git a/test/svgtransformlist_test.html b/test/svgtransformlist_test.html
index a1f221a4..5c666e6c 100644
--- a/test/svgtransformlist_test.html
+++ b/test/svgtransformlist_test.html
@@ -16,9 +16,9 @@
   <script>
   $(function() {
     // log function
-    QUnit.log = function(result, message) {
+    QUnit.log = function(details) {
       if (window.console && window.console.log) {
-        window.console.log(result +' :: '+ message);
+        window.console.log(details.result +' :: '+ details.message);
       }
     };
     var NS = svgedit.NS;
diff --git a/test/svgutils_test.html b/test/svgutils_test.html
index 0063ba03..3890f5f2 100644
--- a/test/svgutils_test.html
+++ b/test/svgutils_test.html
@@ -14,9 +14,9 @@
   <script>
   $(function() {
     // log function
-     QUnit.log = function(result, message) {
+     QUnit.log = function(details) {
       if (window.console && window.console.log) {
-        window.console.log(result +' :: '+ message);
+        window.console.log(details.result +' :: '+ details.message);
       }
     };
 
diff --git a/test/test1.html b/test/test1.html
index d81a596b..5a83720a 100644
--- a/test/test1.html
+++ b/test/test1.html
@@ -7,6 +7,7 @@
   <script src="../editor/jquery.js"></script>
   <script src="../editor/jquerybbq/jquery.bbq.min.js"></script>
   <script src="../editor/jquery-ui/jquery-ui-1.8.custom.min.js"></script>
+  <script src="../editor/svgedit.js"></script>
   <script src="../editor/svgicons/jquery.svgicons.js"></script>
   <script src="../editor/browser.js"></script>
   <script src="../editor/svgtransformlist.js"></script>
@@ -15,6 +16,8 @@
   <script src="../editor/svgutils.js"></script>
   <script src="../editor/sanitize.js"></script>
   <script src="../editor/history.js"></script>
+  <script src='../editor/coords.js'></script>
+  <script src="../editor/recalculate.js"></script>
   <script src="../editor/select.js"></script>
   <script src="../editor/draw.js"></script>
   <script src="../editor/path.js"></script>
@@ -25,9 +28,9 @@
   <script>
   $(function() {
     // log function
-    QUnit.log = function(result, message) {
+    QUnit.log = function(details) {
     if (window.console && window.console.log) {
-      window.console.log(result +' :: '+ message);
+      window.console.log(details.result +' :: '+ details.message);
     }
   };
 
@@ -111,9 +114,9 @@
     
     // TODO: see why this isn't working in SVG-edit
     d = convert(p2, true);
-    QUnit.log(d);
+    QUnit.log({result: d});
     d = convert(p2, false);
-    QUnit.log(d);
+    QUnit.log({result: d});
   });
   
   module("Import Module");
diff --git a/test/units_test.html b/test/units_test.html
index 48f40d0a..8f7722e9 100644
--- a/test/units_test.html
+++ b/test/units_test.html
@@ -11,9 +11,9 @@
   <script>
   $(function() {
     // log function
-    QUnit.log = function(result, message) {
+    QUnit.log = function(details) {
       if (window.console && window.console.log) {
-        window.console.log(result +' :: '+ message);
+        window.console.log(details.result +' :: '+ details.message);
       }
     };