more correct tests

www/assert/main.js

@@ -1,13 +1,21 @@
+require.config({
+    paths: {
+        'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify'
+    }
+});
+
 define([
     '/bower_components/jquery/dist/jquery.min.js',
     '/common/hyperjson.js', // serializing classes as an attribute
     '/common/hyperscript.js', // using setAttribute
-    '/common/TextPatcher.js'
+    '/common/TextPatcher.js',
-], function (jQuery, Hyperjson, Hyperscript, TextPatcher) {
+    'json.sortify',
+], function (jQuery, Hyperjson, Hyperscript, TextPatcher, Sortify) {
     var $ = window.jQuery;
     window.Hyperjson = Hyperjson;
     window.Hyperscript = Hyperscript;
     window.TextPatcher = TextPatcher;
+    window.Sortify = Sortify;
 
     var assertions = 0;
     var failed = false;
@@ -23,14 +31,16 @@ define([
 
     var assert = function (test, msg) {
         ASSERTS.push(function (i) {
-            if (test()) {
+            var returned = test();
+            if (returned === true) {
                 assertions++;
             } else {
                 failed = true;
                 failedOn = assertions;
                 failMessages.push({
                     test: i,
-                    message: msg
+                    message: msg,
+                    output: returned,
                 });
             }
         });
@@ -38,7 +48,69 @@ define([
 
     var $body = $('body');
 
-    var roundTrip = function (target) {
+    var HJSON_list = [
+        '["DIV#target",{},[["P#bang",{"class":" alice bob charlie has.dot"},["pewpewpew"]]]]',
+
+        '["DIV#quot",{},[["P",{},["\\"pewpewpew\\""]]]]',
+
+        '["DIV#widget",{},[["DIV",{"class":"cke_widget_wrapper cke_widget_block","contenteditable":"false","data-cke-display-name":"macro:velocity","data-cke-filter":"off","data-cke-widget-id":"0","data-cke-widget-wrapper":"1","tabindex":"-1"},[["DIV",{"class":"macro cke_widget_element","data-cke-widget-data":"%7B%22classes%22%3A%7B%22macro%22%3A1%7D%7D","data-cke-widget-keep-attr":"0","data-cke-widget-upcasted":"1","data-macro":"startmacro:velocity|-||-|Here is a macro","data-widget":"xwiki-macro"},[["P",{},["Here is a macro"]]]],["SPAN",{"class":"cke_reset cke_widget_drag_handler_container","style":"background: rgba(220, 220, 220, 0.5) url(\\"/customize/cryptofist_small.png\\") repeat scroll 0% 0%; top: -15px; left: 0px; display: block;"},[["IMG",{"class":"cke_reset cke_widget_drag_handler","data-cke-widget-drag-handler":"1","height":"15","src":"data:image/gif;base64,R0lGODlhAQABAPABAP///wAAACH5BAEKAAAALAAAAAABAAEAAAICRAEAOw==","title":"Click and drag to move","width":"15"},[]]]]]]]]',
+
+    ];
+
+    var elementFilter = function () {
+        // pass everything
+        return true;
+    };
+
+    var attributeFilter = function (h) {
+        // don't filter anything
+        return h;
+    };
+
+    var HJSON_equal = function (shjson) {
+        assert(function () {
+            // parse your stringified Hyperjson
+            var hjson;
+
+            try {
+                hjson = JSON.parse(shjson);
+            } catch (e) {
+                console.log(e);
+                return false;
+            }
+
+            // turn it into a DOM
+            var DOM = Hyperjson.callOn(hjson, Hyperscript);
+
+            // turn it back into stringified Hyperjson, but apply filters
+            var shjson2 = Sortify(Hyperjson.fromDOM(DOM, elementFilter, attributeFilter));
+
+            var success = shjson === shjson2;
+
+            var op = TextPatcher.diff(shjson, shjson2);
+            //console.log(TextPatcher.format(shjson, op));
+
+            var diff = TextPatcher.format(shjson, op);
+
+            if (success) {
+                return true;
+            } else {
+                return  '<br><br>insert: ' + diff.insert + '<br><br>' +
+                        'remove: ' + diff.remove + '<br><br>';
+            }
+        },  "expected hyperjson equality");
+    };
+
+    HJSON_list.map(HJSON_equal);
+
+    /*  FIXME
+        This test is not correct. It passes in Firefox, but fails in Chrome,
+        even though for our purposes the produced code is valid. Passing
+        `<p class="bob" id="alice"></p>` through the function yields
+        `<p id="alice" class="bob"></p>`. This is the same element, but string
+        equality is not a correct metric.  */
+    var roundTrip = function (sel) {
+        var target = $(sel)[0];
         assert(function () {
             var hjson = Hyperjson.fromDOM(target);
             var cloned = Hyperjson.callOn(hjson, Hyperscript);
@@ -53,20 +125,22 @@ define([
                     B: cloned.outerHTML,
                     diff: op
                 };
-                console.log(JSON.stringify(window.DEBUG, null, 2));
+                //console.log(JSON.stringify(window.DEBUG, null, 2));
-                TextPatcher.log(op);
+                console.log("DIFF:");
+                TextPatcher.log(target.outerHTML, op);
             }
 
             return success;
         }, "Round trip serialization introduced artifacts.");
     };
 
-    [   '#target',
+    var HTML_list = [
-        '#widget',
+        '#target',
+        '#widget', // fails in Firefox 19?
         '#quot',
-    ].forEach(function (sel) {
+    ];
-        roundTrip($(sel)[0]);
+
-    });
+    HTML_list.forEach(roundTrip);
 
     var strungJSON = function (orig) {
         var result;
@@ -77,7 +151,7 @@ define([
     };
 
     [   '{"border":"1","style":{"width":"500px"}}',
-        '{"style":{"width":"500px"},"border":"1"}',
+        '{"style":"width: 500px;","border":"1"}',
     ].forEach(function (orig) {
         strungJSON(orig);
     });
@@ -108,10 +182,16 @@ define([
 
     var formatFailures = function () {
         var template = multiline(function () { /*
-<pre class="error">
+<p class="error">
-Failed on test number {{test}} with error:
+Failed on test number {{test}} with error message:
-> "{{message}}"
+"{{message}}" 
-</pre>
+
+</p>
+<p>
+The test returned:
+{{output}}
+</p>
+
 <br>
 
 */});