diff --git a/www/assert/index.html b/www/assert/index.html
index 5feebf5ae..68c995f68 100644
--- a/www/assert/index.html
+++ b/www/assert/index.html
@@ -4,6 +4,24 @@
+
+
+
+
diff --git a/www/assert/main.js b/www/assert/main.js
index f8c4f7ce1..0ffea44e6 100644
--- a/www/assert/main.js
+++ b/www/assert/main.js
@@ -10,13 +10,30 @@ define([
window.TextPatcher = TextPatcher;
var assertions = 0;
+ var failed = false;
+ var failedOn;
+ var failMessages = [];
+
+ var ASSERTS = [];
+ var runASSERTS = function () {
+ ASSERTS.forEach(function (f, index) {
+ f(index);
+ });
+ };
var assert = function (test, msg) {
- if (test()) {
- assertions++;
- } else {
- throw new Error(msg || '');
- }
+ ASSERTS.push(function (i) {
+ if (test()) {
+ assertions++;
+ } else {
+ failed = true;
+ failedOn = assertions;
+ failMessages.push({
+ test: i,
+ message: msg
+ });
+ }
+ });
};
var $body = $('body');
@@ -43,8 +60,93 @@ define([
}, "Round trip serialization introduced artifacts.");
};
- roundTrip($('#target')[0]);
- roundTrip($('#widget')[0]);
+ [ '#target',
+ '#widget',
+ ].forEach(function (sel) {
+ roundTrip($(sel)[0]);
+ });
+
+ var strungJSON = function (orig) {
+ var result;
+ assert(function () {
+ result = JSON.stringify(JSON.parse(orig));
+ return result === orig;
+ }, "expected result (" + result + ") to equal original (" + orig + ")");
+ };
+
+ [ '{"border":"1","style":{"width":"500px"}}',
+ '{"style":{"width":"500px"},"border":"1"}',
+ ].forEach(function (orig) {
+ strungJSON(orig);
+ });
+
+ //assert(function () { }, "this is expected to fail");
+
+ /* TODO Test how browsers handle weird elements
+ like "_moz-resizing":"true"
+
+ and anything else you can think of.
+
+ Start with Hyperjson, turn it into a DOM and come back
+ */
+
+ var swap = function (str, dict) {
+ return str.replace(/\{\{(.*?)\}\}/g, function (all, key) {
+ return typeof dict[key] !== 'undefined'? dict[key] : all;
+ });
+ };
+
+ var multiline = function (f) {
+ var str;
+ f.toString().replace(/\/\*([\s\S]*)\*\//g, function (all, out) {
+ str = out;
+ });
+ return str || '';
+ };
+
+ var formatFailures = function () {
+ var template = multiline(function () { /*
+
+Failed on test number {{test}} with error:
+> "{{message}}"
+
+
+
+*/});
+ return failMessages.map(function (obj) {
+ console.log(obj);
+ return swap(template, obj);
+ }).join("\n");
+ };
+
+ runASSERTS();
+
+ $("body").html(function (i, val) {
+ var dict = {
+ previous: val,
+ totalAssertions: ASSERTS.length,
+ passedAssertions: assertions,
+ plural: (assertions === 1? '' : 's'),
+ failMessages: formatFailures()
+ };
+
+ var SUCCESS = swap(multiline(function(){/*
+{{passedAssertions}} / {{totalAssertions}} test{{plural}} passed.
+
+{{failMessages}}
+
+
+
+
+{{previous}}
+ */}), dict);
+
+ var report = SUCCESS;
+
+ return report;
+ });
+
+ var $report = $('.report');
+ $report.addClass(failed?'failure':'success');
- console.log("%s test%s passed", assertions, assertions === 1? '':'s');
});
diff --git a/www/_socket/index.html b/www/p/index.html
similarity index 100%
rename from www/_socket/index.html
rename to www/p/index.html
diff --git a/www/_socket/inner.html b/www/p/inner.html
similarity index 100%
rename from www/_socket/inner.html
rename to www/p/inner.html
diff --git a/www/_socket/main.js b/www/p/main.js
similarity index 100%
rename from www/_socket/main.js
rename to www/p/main.js
diff --git a/www/_socket/toolbar.js b/www/p/toolbar.js
similarity index 100%
rename from www/_socket/toolbar.js
rename to www/p/toolbar.js