Scheduler and Sys Tests can be automated

Author: ricardoquesada

tests/RenderTextureTest/RenderTextureTest.js

@@ -61,6 +61,7 @@ var RenderTextureBaseLayer = BaseTestLayer.extend({
         director.replaceScene(s);
     },
 
+    // automation
     numberOfPendingTests:function() {
         return ( (arrayOfRenderTextureTest.length-1) - sceneRenderTextureIdx );
     },

tests/SchedulerTest/SchedulerTest.js

@@ -24,47 +24,13 @@
  THE SOFTWARE.
  ****************************************************************************/
 var TAG_ANIMATION_DANCE = 1;
-var MAX_TESTS = 8;
-var sceneIdx = -1;
+var schedulerTestSceneIdx = -1;
 
 /*
     Base Layer
 */
-var SchedulerTestLayer = cc.Layer.extend({
+var SchedulerTestLayer = BaseTestLayer.extend({
 
-    ctor:function() {
-        cc.associateWithNative( this, cc.Layer );
-        this.init();
-    },
-
-    onEnter:function () {
-        this._super();
-
-        var s = director.getWinSize();
-
-        var label = cc.LabelTTF.create(this.title(), "Arial", 30);
-        this.addChild(label);
-        label.setPosition(cc.p(s.width / 2, s.height - 50));
-
-        var subTitle = this.subtitle();
-        if (subTitle != "") {
-            var subLabel = cc.LabelTTF.create(subTitle, "Thonburi", 13);
-            this.addChild(subLabel, 1);
-            subLabel.setPosition(s.width / 2, s.height - 80);
-        }
-
-        var item1 = cc.MenuItemImage.create("res/Images/b1.png", "res/Images/b2.png", this.onBackCallback, this);
-        var item2 = cc.MenuItemImage.create("res/Images/r1.png", "res/Images/r2.png", this.onRestartCallback, this);
-        var item3 = cc.MenuItemImage.create("res/Images/f1.png", "res/Images/f2.png", this.onNextCallback.bind(this) ); // another way to pass 'this'
-
-        var menu = cc.Menu.create(item1, item2, item3);
-        menu.setPosition(0,0);
-        item1.setPosition(s.width / 2 - 100, 30);
-        item2.setPosition(s.width / 2, 30);
-        item3.setPosition(s.width / 2 + 100, 30);
-
-        this.addChild(menu, 1);
-    },
     title:function () {
         return "No title";
     },
@@ -92,7 +58,16 @@ var SchedulerTestLayer = cc.Layer.extend({
 
         scene.addChild(layer);
         director.replaceScene(scene);
+    },
+    // automation
+    numberOfPendingTests:function() {
+        return ( (arrayOfSchedulerTest.length-1) - schedulerTestSceneIdx );
+    },
+
+    getTestNumber:function() {
+        return schedulerTestSceneIdx;
     }
+
 });
 
 /*
@@ -482,7 +457,7 @@ var ScheduleUsingSchedulerTest = SchedulerTestLayer.extend({
 */
 var SchedulerTestScene = TestScene.extend({
     runThisTest:function () {
-        sceneIdx = -1;
+        schedulerTestSceneIdx = -1;
         var layer = nextSchedulerTest();
         this.addChild(layer);
 
@@ -508,18 +483,18 @@ var arrayOfSchedulerTest = [
 ];
 
 var nextSchedulerTest = function () {
-    sceneIdx++;
-    sceneIdx = sceneIdx % arrayOfSchedulerTest.length;
+    schedulerTestSceneIdx++;
+    schedulerTestSceneIdx = schedulerTestSceneIdx % arrayOfSchedulerTest.length;
 
-    return new arrayOfSchedulerTest[sceneIdx]();
+    return new arrayOfSchedulerTest[schedulerTestSceneIdx]();
 };
 var previousSchedulerTest = function () {
-    sceneIdx--;
-    if (sceneIdx < 0)
-        sceneIdx += arrayOfSchedulerTest.length;
+    schedulerTestSceneIdx--;
+    if (schedulerTestSceneIdx < 0)
+        schedulerTestSceneIdx += arrayOfSchedulerTest.length;
 
-    return new arrayOfSchedulerTest[sceneIdx]();
+    return new arrayOfSchedulerTest[schedulerTestSceneIdx]();
 };
 var restartSchedulerTest = function () {
-    return new arrayOfSchedulerTest[sceneIdx]();
+    return new arrayOfSchedulerTest[schedulerTestSceneIdx]();
 };

tests/SysTest/SysTest.js

@@ -24,50 +24,18 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+var sysTestSceneIdx = -1;
 //------------------------------------------------------------------
 //
 // SysTestBase
 //
 //------------------------------------------------------------------
-var SysTestBase = cc.LayerGradient.extend({
+var SysTestBase = BaseTestLayer.extend({
     _title:"",
     _subtitle:"",
 
     ctor:function() {
-        this._super();
-        cc.associateWithNative( this, cc.LayerGradient );
-        this.init( cc.c4b(0,0,0,255), cc.c4b(98,99,117,255));
-    },
-    onEnter:function () {
-        this._super();
-
-        var label = cc.LabelTTF.create(this._title, "Arial", 28);
-        this.addChild(label, 1);
-        label.setPosition(cc.p(winSize.width / 2, winSize.height - 50));
-
-        if (this._subtitle !== "") {
-            var l = cc.LabelTTF.create(this._subtitle, "Thonburi", 16);
-            this.addChild(l, 1);
-            l.setPosition(cc.p(winSize.width / 2, winSize.height - 80));
-        }
-
-        var item1 = cc.MenuItemImage.create(s_pathB1, s_pathB2, this.onBackCallback, this);
-        var item2 = cc.MenuItemImage.create(s_pathR1, s_pathR2, this.onRestartCallback, this);
-        var item3 = cc.MenuItemImage.create(s_pathF1, s_pathF2, this.onNextCallback, this);
-
-        var menu = cc.Menu.create(item1, item2, item3);
-
-        menu.setPosition(cc.p(0,0));
-        var cs = item2.getContentSize();
-        item1.setPosition( cc.p(winSize.width/2 - cs.width*2, cs.height/2) );
-        item2.setPosition( cc.p(winSize.width/2, cs.height/2) );
-        item3.setPosition( cc.p(winSize.width/2 + cs.width*2, cs.height/2) );
-
-        this.addChild(menu, 1);
-    },
-
-    onExit:function () {
-        this._super();
+        this._super(cc.c4b(0,0,0,255), cc.c4b(98,99,117,255));
     },
 
     onRestartCallback:function (sender) {
@@ -84,7 +52,16 @@ var SysTestBase = cc.LayerGradient.extend({
         var s = new SysTestScene();
         s.addChild(previousSysTest());
         director.replaceScene(s);
+    },
+    // automation
+    numberOfPendingTests:function() {
+        return ( (arrayOfSysTest.length-1) - sysTestSceneIdx );
+    },
+
+    getTestNumber:function() {
+        return sysTestSceneIdx;
     }
+
 });
 
 //------------------------------------------------------------------
@@ -139,7 +116,7 @@ var CapabilitiesTest = SysTestBase.extend({
 
 var SysTestScene = TestScene.extend({
     runThisTest:function () {
-        sceneIdx = -1;
+        sysTestSceneIdx = -1;
         var layer = nextSysTest();
         this.addChild(layer);
 
@@ -158,19 +135,19 @@ var arrayOfSysTest = [
 ];
 
 var nextSysTest = function () {
-    sceneIdx++;
-    sceneIdx = sceneIdx % arrayOfSysTest.length;
+    sysTestSceneIdx++;
+    sysTestSceneIdx = sysTestSceneIdx % arrayOfSysTest.length;
 
-    return new arrayOfSysTest[sceneIdx]();
+    return new arrayOfSysTest[sysTestSceneIdx]();
 };
 var previousSysTest = function () {
-    sceneIdx--;
-    if (sceneIdx < 0)
-        sceneIdx += arrayOfSysTest.length;
+    sysTestSceneIdx--;
+    if (sysTestSceneIdx < 0)
+        sysTestSceneIdx += arrayOfSysTest.length;
 
-    return new arrayOfSysTest[sceneIdx]();
+    return new arrayOfSysTest[sysTestSceneIdx]();
 };
 var restartSysTest = function () {
-    return new arrayOfSysTest[sceneIdx]();
+    return new arrayOfSysTest[sysTestSceneIdx]();
 };