diff --git a/web/app/test/suite.js b/web/app/test/suite.js index c4a3b982..5948f367 100644 --- a/web/app/test/suite.js +++ b/web/app/test/suite.js @@ -11,10 +11,18 @@ TCAD.test.runSuite = function() { function _log(text) { $('#testOutput').append("
"+text+"
"); -}; +} _loadFixture = function(name) { - THE_APP.loadSketch(TCAD.test.fixtures[name]); + APP.loadSketch(TCAD.test.fixtures[name]); +}; + +_loadFixturesToLocalStorage = function() { + for (var p in TCAD.test.fixtures) { + var key = "test:" + p; + console.log("Storing: " + key); + localStorage.setItem("TCAD.projects." + key, JSON.stringify(TCAD.test.fixtures[p])); + } }; _assertEq = function(expected, actual, msg) { @@ -23,3 +31,10 @@ _assertEq = function(expected, actual, msg) { if (!!msg) _log(msg); } }; + +_assertEqD = function(expected, actual, precision, msg) { + if (Math.abs(expected - actual) > precision) { + _log("* Assertion Error. Expected [" + expected + "] with precision " + precision + " but was [" + actual + "]"); + if (!!msg) _log(msg); + } +}; diff --git a/web/app/test/testCases.js b/web/app/test/testCases.js index 4c75104a..78805a62 100644 --- a/web/app/test/testCases.js +++ b/web/app/test/testCases.js @@ -1,10 +1,15 @@ TCAD.test.cases.roundRect = function() { _loadFixture("RoundRect"); - _assertEq(31, THE_APP.viewer.parametricManager.system.length); -// var solver = THE_APP.viewer.parametricManager.prepare([]); -// var status = solver.solve(1); -// _assertEq(1, status.returnCode); -// _assertEq(1, status.evalCount); -// _assertEq(1, status.error); + _assertEq(31, APP.viewer.parametricManager.system.length); + + var ep = APP.viewer.findById(28); + var pm = APP.viewer.parametricManager; + _assertEqD(0.00002047865, pm.prepare([]).system.error(), 0.00000000001); + ep.x += 30; + var solver = pm.prepare([]); + _assertEqD(60, solver.system.error(), 0.01); + solver.solve(); + _assertEqD(0.000005, solver.system.error(), 1e-6); }; + diff --git a/web/test.html b/web/test.html index 87eff207..c8d29c88 100644 --- a/web/test.html +++ b/web/test.html @@ -51,7 +51,7 @@