sproutcore 1.6.0.beta.3 → 1.6.0.rc.1

data/lib/frameworks/sproutcore/frameworks/statechart/tests/event_handling/basic/with_concurrent_states.js

@@ -113,10 +113,17 @@ test("send event eventB", function() {
   equals(statechart.stateIsCurrentState('f'), true, 'current state should be f');
   
   equals(monitor.get('length'), 4, 'state sequence should be of length 4');
-  equals(monitor.matchSequence()
-                .begin()
-                .exited('c').entered('d')
-                .exited('e').entered('f')
+  equals(monitor.matchSequence().begin()
+                  .beginConcurrent()
+                    .beginSequence()
+                      .exited('c')
+                      .entered('d')
+                    .endSequence()
+                    .beginSequence()
+                      .exited('e')
+                      .entered('f')
+                    .endSequence()
+                  .endConcurrent()
                 .end(), 
           true, 'sequence should be exited[c], entered[d], exited[e], entered[f]');
 });
@@ -137,10 +144,15 @@ test("send event eventB then eventC", function() {
   equals(statechart.stateIsCurrentState('e'), true, 'current state should be e');
 
   equals(monitor.get('length'), 4, 'state sequence should be of length 4');
-  equals(monitor.matchSequence()
-                .begin()
-                .exited('d').entered('c')
-                .exited('f').entered('e')
+  equals(monitor.matchSequence().begin()
+                  .beginConcurrent()
+                    .beginSequence()
+                      .exited('d').entered('c')
+                    .endSequence()
+                    .beginSequence()
+                      .exited('f').entered('e')
+                    .endSequence()
+                  .endConcurrent()
                 .end(), 
           true, 'sequence should be exited[d], entered[c], exited[f], entered[e]');
 });
@@ -156,9 +168,17 @@ test("send event eventD", function() {
   statechart.sendEvent('eventD');
   
   equals(monitor.get('length'), 6, 'state sequence should be of length 6');
-  equals(monitor.matchSequence()
-                .begin()
-                .exited('c', 'a', 'e', 'b', 'x').entered('y')
+  equals(monitor.matchSequence().begin()
+                  .beginConcurrent()
+                    .beginSequence()
+                      .exited('c', 'a')
+                    .endSequence()
+                    .beginSequence()
+                      .exited('e', 'b')
+                    .endSequence()
+                  .endConcurrent()
+                  .exited('x')
+                  .entered('y')
                 .end(), 
           true, 'sequence should be exited[c, a, e, b, x], entered[y]');
           

data/lib/frameworks/sproutcore/frameworks/statechart/tests/state_transitioning/async/with_concurrent_states.js

@@ -79,10 +79,12 @@ test("go to state b", function() {
   equals(statechart.get('gotoStateActive'), NO, "statechart should not have active gotoState");
   equals(statechart.get('gotoStateSuspended'), NO, "statechart should not have active gotoState suspended");
   
-  equals(monitor.matchSequence()
-                .begin()
-                .exited('a')
-                .entered('b', 'c', 'd')
+  equals(monitor.matchSequence().begin()
+                  .exited('a')
+                  .entered('b')
+                  .beginConcurrent()
+                    .entered('c', 'd')
+                  .endConcurrent()
                 .end(), 
           true, 'sequence should be exited[a], entered[b, c, d]');
   equals(statechart.get('currentStateCount'), 2, 'current state count should be 2');

data/lib/frameworks/sproutcore/frameworks/statechart/tests/state_transitioning/standard/with_concurrent_states/advanced.js

@@ -112,8 +112,27 @@ module("SC.Statechart: With Concurrent States - Goto State Advanced Tests", {
 
 test("check statechart initialization", function() {
   equals(monitor.get('length'), 10, 'initial state sequence should be of length 10');
-  equals(monitor.matchSequence().begin().entered(root, 'a', 'b', 'd', 'c', 'f', 'h', 'l', 'i', 'n').end(), true, 
-         'initial sequence should be entered[ROOT, a, b, d, c, f, h, l, i, n]');
+  equals(monitor.matchSequence().begin()
+                                  .entered(root, 'a')
+                                  .beginConcurrent()
+                                    .beginSequence()
+                                      .entered('b', 'd')
+                                    .endSequence()
+                                    .beginSequence()
+                                      .entered('c', 'f')
+                                      .beginConcurrent()
+                                        .beginSequence()
+                                          .entered('h', 'l')
+                                        .endSequence()
+                                        .beginSequence()
+                                          .entered('i', 'n')
+                                        .endSequence()
+                                      .endConcurrent()
+                                    .endSequence()
+                                  .endConcurrent()
+                                  .entered()
+                                .end(), 
+    true, 'initial sequence should be entered[ROOT, a, b, d, c, f, h, l, i, n]');
   
   equals(statechart.get('currentStateCount'), 3, 'current state count should be 3');
   equals(statechart.stateIsCurrentState('d'), true, 'current state should be d');
@@ -150,10 +169,25 @@ test("from state l, go to state g", function() {
   stateL.gotoState('g');
   
   equals(monitor.get('length'), 10, 'initial state sequence should be of length 10');
-  equals(monitor.matchSequence()
-                .begin()
-                .exited('l', 'h', 'n', 'i', 'f')
-                .entered('g', 'j', 'p', 'k', 'r')
+  equals(monitor.matchSequence().begin()
+                  .beginConcurrent()
+                    .beginSequence()
+                      .exited('l', 'h')
+                    .endSequence()
+                    .beginSequence()
+                      .exited('n', 'i')
+                    .endSequence()
+                  .endConcurrent()
+                  .exited('f')
+                  .entered('g')
+                  .beginConcurrent()
+                    .beginSequence()
+                      .entered('j', 'p')
+                    .endSequence()
+                    .beginSequence()
+                      .entered('k', 'r')
+                    .endSequence()
+                  .endConcurrent()
                 .end(), 
          true, 'initial sequence should be exited[l, h, n, i, f], entered[g, j, p, k, r]');
   

data/lib/frameworks/sproutcore/frameworks/statechart/tests/state_transitioning/standard/with_concurrent_states/basic.js

@@ -52,8 +52,28 @@ module("SC.Statechart: With Concurrent States - Goto State Basic Tests", {
 
 test("check statechart initialization", function() {
   equals(monitor.get('length'), 5, 'initial state sequence should be of length 5');
-  equals(monitor.matchSequence().begin().entered(root, 'a', 'c', 'b', 'e').end(), true, 'initial sequence should be entered[ROOT, a, c, b, e]');
-  equals(monitor.matchSequence().begin().entered(root, 'a', 'b', 'c', 'e').end(), false, 'initial sequence should not be entered[ROOT, a, b, c, e]');
+  equals(monitor.matchSequence().begin()
+                                  .entered(root)
+                                  .beginConcurrent()
+                                    .beginSequence()
+                                      .entered('a', 'c')
+                                    .endSequence()
+                                    .beginSequence()
+                                      .entered('b', 'e')
+                                    .endSequence()
+                                  .endConcurrent()
+                                .end(), 
+    true, 'initial sequence should be entered[ROOT, a, c, b, e]');
+  equals(monitor.matchSequence().begin()
+                                  .entered(root)
+                                  .beginConcurrent()
+                                    .entered('a', 'b')
+                                  .endConcurrent()
+                                  .beginConcurrent()
+                                    .entered('c', 'e')
+                                  .endConcurrent()
+                                .end(), 
+    false, 'initial sequence should not be entered[ROOT, a, b, c, e]');
   
   equals(statechart.get('currentStateCount'), 2, 'current state count should be 2');
   

data/lib/frameworks/sproutcore/frameworks/statechart/tests/state_transitioning/standard/with_concurrent_states/intermediate.js

@@ -60,7 +60,20 @@ module("SC.Statechart: With Concurrent States - Goto State Intermediate Tests",
 
 test("check statechart initialization", function() {  
   equals(monitor.get('length'), 6, 'initial state sequence should be of length 5');
-  equals(monitor.matchSequence().begin().entered(root, 'a', 'b', 'd', 'c', 'f').end(), true, 'initial sequence should be entered[ROOT, a, b, d, c, f]');
+  
+  equals(monitor.matchSequence().begin()
+                                  .entered(root, 'a')
+                                  .beginConcurrent()
+                                    .beginSequence()
+                                      .entered('b', 'd')
+                                    .endSequence()
+                                    .beginSequence()
+                                      .entered('c', 'f')
+                                    .endSequence()
+                                  .endConcurrent()
+                                .end(), 
+    true, 'initial sequence should be entered[ROOT, a, b, d, c, f]');
+  
   equals(statechart.get('currentStateCount'), 2, 'current state count should be 2');
   equals(statechart.stateIsCurrentState('d'), true, 'current state should be d');
   equals(statechart.stateIsCurrentState('f'), true, 'current state should be f');
@@ -98,7 +111,21 @@ test("from state a, go to state z and then back to state a", function() {
   stateA.gotoState('z');
 
   equals(monitor.get('length'), 6, 'initial state sequence should be of length 6');
-  equals(monitor.matchSequence().begin().exited('d', 'b', 'f', 'c', 'a').entered('z').end(), true, 'sequence should be exited[d, b, f, c, a], entered[z]');
+  
+  equals(monitor.matchSequence().begin()
+                                  .beginConcurrent()
+                                    .beginSequence()
+                                      .exited('d', 'b')
+                                    .endSequence()
+                                    .beginSequence()
+                                      .exited('f', 'c')
+                                    .endSequence()
+                                  .endConcurrent()
+                                  .exited('a')
+                                  .entered('z')
+                                .end(), 
+    true, 'sequence should be exited[d, b, f, c, a], entered[z]');
+  
   equals(statechart.get('currentStateCount'), 1, 'current state count should be 1');
   equals(statechart.stateIsCurrentState('z'), true, 'current state should be z');
   
@@ -106,7 +133,21 @@ test("from state a, go to state z and then back to state a", function() {
   stateZ.gotoState('a');
   
   equals(monitor.get('length'), 6, 'initial state sequence should be of length 6');
-  equals(monitor.matchSequence().begin().exited('z').entered('a', 'b', 'd', 'c', 'f').end(), true, 'sequence should be exited[z], entered[a, b, d, c, f]');
+  
+  equals(monitor.matchSequence().begin()
+                                  .exited('z')
+                                  .entered('a')
+                                  .beginConcurrent()
+                                    .beginSequence()
+                                      .entered('b', 'd')
+                                    .endSequence()
+                                    .beginSequence()
+                                      .entered('c', 'f')
+                                    .endSequence()
+                                  .endConcurrent()
+                                .end(), 
+    true, 'sequence should be exited[z], entered[a, b, d, c, f]');
+  
   equals(statechart.get('currentStateCount'), 2, 'current state count should be 1');
   equals(statechart.stateIsCurrentState('d'), true, 'current state should be d');
   equals(statechart.stateIsCurrentState('f'), true, 'current state should be f');

data/lib/frameworks/sproutcore/frameworks/testing/core.js

@@ -178,22 +178,74 @@ CoreTest = {
     
     return ret ;
   },
-  
 
   /** Test is OK */
   OK: 'passed',
-  
+
   /** Test failed */
   FAIL: 'failed',
-  
+
   /** Test raised exception */
   ERROR: 'errors',
-  
+
   /** Test raised warning */
   WARN: 'warnings',
-  
-  showUI : false
-  
-  
-  
+
+  showUI : false,
+
+  spyOn: function(object, method) {
+    if(!object) throw new Error('ERROR: Attempted to spy upon an invalid object');
+    if(!object[method]) throw new Error('ERROR: The requested method does not exist on the given object');
+
+    var spy = new CoreTest.Spy;
+    object[method] = function() { spy.call(CoreTest.argumentsArray(arguments)) };
+    return spy;
+  },
+
+  stubMethod: function(object, method) {
+    if(!object) throw new Error('ERROR: Attempted to spy upon an invalid object');
+    if(!object[method]) throw new Error('ERROR: The requested method does not exist on the given object');
+
+    var stub = new CoreTest.Stub;
+    object[method] = function() { return stub.call() };
+    return stub;
+  }
+};
+
+CoreTest.Spy = function() {
+  this.wasCalled = false;
+};
+
+CoreTest.Spy.prototype.call = function(args) {
+  this.wasCalledWithArguments = args;
+  this.wasCalled = true;
+};
+
+CoreTest.Spy.prototype.wasCalledWith = function() {
+  return CoreTest._isIdenticalArray(this.wasCalledWithArguments,CoreTest.argumentsArray(arguments));
+};
+
+CoreTest.Stub = function() {
+};
+
+CoreTest.Stub.prototype.andReturn = function(value) {
+  this.stubbedValue = value;
+};
+
+CoreTest.Stub.prototype.call = function() {
+  if(this.stubbedValue === undefined) throw new Error('ERROR: You never specified what value the stub should return');
+  return this.stubbedValue;
+};
+
+CoreTest.argumentsArray = function(args) {
+  var arrayOfArgs = [];
+  for (var i = 0; i < args.length; i++) arrayOfArgs.push(args[i]);
+  return arrayOfArgs;
+};
+
+CoreTest._isIdenticalArray = function(array1, array2) {
+  if(array1.length !== array2.length) return false;
+  for(var i = 0; i < array1.length; i++)
+    if(array1[i] !== array2[i]) return false;
+  return true;
 };

data/lib/frameworks/sproutcore/frameworks/testing/{english.lproj → resources}/runner.css

@@ -27,7 +27,7 @@
   position: relative;
 }
 
-.testresult label.hide-passed {
+.testresult label.hide-passed, .testresult label.show-progress {
   position: absolute;
   display: block;
   margin: 0;
@@ -38,10 +38,14 @@
   margin-top: -8px;
 }
 
-.testresult label.hide-passed.disabled {
+.testresult label.hide-passed.disabled, .testresult label.show-progress.disabled  {
   color: #aaa;
 }
 
+.testresult label.show-progress {
+  left: 200px;
+}
+
 .testresult em {
   display: block;
   font-weight: normal;
@@ -67,6 +71,7 @@
 .core-test table {
   background: #000;
   border-spacing: 1px;
+  border-collapse: separate;
   width: 100%;
 }
 
@@ -80,6 +85,10 @@
     padding: 4px;
   }
 
+.core-test table th {
+  font-weight: bold;
+}
+
 .core-test tbody td {
   text-align: center;
   padding: 8px;

data/lib/frameworks/sproutcore/frameworks/testing/system/runner.js

@@ -25,7 +25,9 @@ CoreTest.Runner = {
   */
   plan: null,
   errors: null,
-  
+
+  showProgress: false,
+
   create: function() {
     var len = arguments.length,
         ret = CoreTest.beget(this),
@@ -46,41 +48,63 @@ CoreTest.Runner = {
   
   planDidBegin: function(plan) {
     // setup the report DOM element.
-    this.report = Q$(['<div class="core-test">',
-      '<div class="useragent">UserAgent</div>',
-      '<div class="testresult">',
-        '<label class="hide-passed">',
-          '<input type="checkbox" checked="checked" /> Hide passed tests',
-        '</label>',
-        '<span class="status">Running...</span>',
-      '</div>',
-      '<div class="detail">',
-        '<table>',
-          '<thead><tr>',
-            '<th class="desc">Test</th><th>Result</th>',
-          '</tr></thead>',
-          '<tbody><tr></tr></tbody>',
-        '</table>',
-      '</div>',
-    '</div>'].join(''));
-
-      
+    var str = [
+      '<div class="core-test">',
+        '<div class="useragent">UserAgent</div>',
+        '<div class="testresult">',
+          '<label class="hide-passed">',
+            '<input type="checkbox" checked="checked" /> Hide passed tests',
+          '</label>'
+    ];
+
+    if (navigator.userAgent.indexOf('MSIE')==-1) {
+      str.push(
+          '<label class="show-progress">',
+            '<input type="checkbox"'+(this.showProgress?' checked="checked"':'')+'" /> Show progess (slower)',
+          '</label>'
+      );
+    }
+
+    str.push(
+          '<label class="show-progress">',
+            '<input type="checkbox"'+(this.showProgress?' checked="checked"':'')+'" /> Show progess (slower)',
+          '</label>',
+          '<span class="status">Running...</span>',
+        '</div>',
+        '<div class="detail">',
+          '<table>',
+            '<thead><tr>',
+              '<th class="desc">Test</th><th>Result</th>',
+            '</tr></thead>',
+            '<tbody><tr></tr></tbody>',
+          '</table>',
+        '</div>',
+      '</div>'
+    );
+
+    this.report = Q$(str.join(''));
+
     this.report.find('.useragent').html(navigator.userAgent);
     this.logq = this.report.find('tbody');
     this.testCount = 0 ;
     
     // listen to change event
     var runner = this;
-    this.checkbox = this.report.find('.hide-passed input'); 
-    this.checkbox.change(function() {
+    this.hidePassedCheckbox = this.report.find('.hide-passed input');
+    this.hidePassedCheckbox.change(function() {
       runner.hidePassedTestsDidChange();
     });
-    
+
+    this.showProgressCheckbox = this.report.find('.show-progress input');
+    this.showProgressCheckbox.change(function() {
+      runner.showProgressCheckboxDidChange();
+    });
+
     Q$('body').append(this.report);
   },
   
   hidePassedTestsDidChange: function() {
-    var checked = !!this.checkbox.val();
+    var checked = this.hidePassedCheckbox.is(':checked');
         
     if (checked) {
       this.logq.addClass('hide-clean');
@@ -88,7 +112,12 @@ CoreTest.Runner = {
       this.logq.removeClass('hide-clean');
     }
   },
-  
+
+  showProgressCheckboxDidChange: function(){
+    this.showProgress = this.showProgressCheckbox.is(':checked');
+    if (this.showProgress) { this.flush(); }
+  },
+
   planDidFinish: function(plan, r) {
     this.flush();
     
@@ -128,9 +157,11 @@ CoreTest.Runner = {
     if(CoreTest.showUI) Q$('.core-test').css("right", "360px");
     result.html(str);
     
+    CoreTest.finished = true;
+    
     if (this.errors) CoreTest.errors=this.errors.join('');
 
-
+    
     // Unload the SproutCore event system so that the user can select the text
     // of the various events.  (It is handy when looking at failed tests.)
     if (SC  &&  SC.Event  &&  SC.Event.unload) {
@@ -201,7 +232,15 @@ CoreTest.Runner = {
   
   // called when the plan takes a break.  Good time to flush HTML output.
   planDidPause: function(plan) {
-    if(navigator.userAgent.indexOf('MSIE')==-1) this.flush();  
+    if(!this._cacheResultSelector){
+      this._cacheResultSelector = this.report.find('.testresult .status');
+    }
+    var result = this._cacheResultSelector;
+
+    if (this.resultStr && navigator.userAgent.indexOf('MSIE')==-1) result.html(this.resultStr);
+    this.resultStr = null ;
+
+    if (this.showProgress) { this.flush(); }
   },
   
   // flush any pending HTML changes...