diff --git a/tests/js-tests/project.json b/tests/js-tests/project.json index 529ef972d4..c3c712b80d 100644 --- a/tests/js-tests/project.json +++ b/tests/js-tests/project.json @@ -118,7 +118,6 @@ "src/ExtensionsTest/PluginXTest/PluginXTestsManager.js", "src/ExtensionsTest/PluginXTest/IOSIAPTest.js", "src/ExtensionsTest/PluginXTest/AnalyticsTest.js", - "src/ExtensionsTest/ActionTimelineTest/ActionTimelineTest.js", "src/CocoStudioTest/ArmatureTest/ArmatureTest.js", "src/CocoStudioTest/ComponentsTest/ComponentsTestScene.js", "src/CocoStudioTest/ComponentsTest/EnemyController.js", @@ -151,6 +150,7 @@ "src/CocoStudioTest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.js", "src/CocoStudioTest/CustomTest/CustomImageScene/CustomImageScene.js", "src/CocoStudioTest/CustomTest/CustomGUIScene.js", + "src/CocoStudioTest/ActionTimelineTest/ActionTimelineTest.js", "src/GUITest/UIScene.js", "src/GUITest/UIButtonTest/UIButtonTest.js", "src/GUITest/UICheckBoxTest/UICheckBoxTest.js", diff --git a/tests/js-tests/src/ExtensionsTest/ActionTimelineTest/ActionTimelineTest.js b/tests/js-tests/src/CocoStudioTest/ActionTimelineTest/ActionTimelineTest.js similarity index 98% rename from tests/js-tests/src/ExtensionsTest/ActionTimelineTest/ActionTimelineTest.js rename to tests/js-tests/src/CocoStudioTest/ActionTimelineTest/ActionTimelineTest.js index ae97c04a21..7ea941e859 100644 --- a/tests/js-tests/src/ExtensionsTest/ActionTimelineTest/ActionTimelineTest.js +++ b/tests/js-tests/src/CocoStudioTest/ActionTimelineTest/ActionTimelineTest.js @@ -105,7 +105,7 @@ var runActionTimeLineTest; menus.push(menuItem); }); var menuItem = new cc.MenuItemFont("Back", function(){ - var scene = new ExtensionsTestScene(); + var scene = new CocoStudioTestScene(); scene.runThisTest(); }, this); menuItem.setPosition(325, -175); diff --git a/tests/js-tests/src/CocoStudioTest/CocoStudioTest.js b/tests/js-tests/src/CocoStudioTest/CocoStudioTest.js index b8e18bba3e..74d8ccfda2 100644 --- a/tests/js-tests/src/CocoStudioTest/CocoStudioTest.js +++ b/tests/js-tests/src/CocoStudioTest/CocoStudioTest.js @@ -51,6 +51,12 @@ var cocoStudioTestItemNames = [ testScene:function(){ runParserTest(); } + }, + { + itemTitle:"ActionTimeLineTest", + testScene:function () { + runActionTimeLineTest(); + } } ]; diff --git a/tests/js-tests/src/ExtensionsTest/ExtensionsTest.js b/tests/js-tests/src/ExtensionsTest/ExtensionsTest.js index fec53f20ad..0bdae8491f 100644 --- a/tests/js-tests/src/ExtensionsTest/ExtensionsTest.js +++ b/tests/js-tests/src/ExtensionsTest/ExtensionsTest.js @@ -87,12 +87,6 @@ var extensionsTestItemNames = [ testScene:function () { runCCPoolTest(); } - }, - { - itemTitle:"ActionTimeLineTest", - testScene:function () { - runActionTimeLineTest(); - } } ]; diff --git a/tests/js-tests/src/tests_resources.js b/tests/js-tests/src/tests_resources.js index 2e115deed9..c4c9319704 100644 --- a/tests/js-tests/src/tests_resources.js +++ b/tests/js-tests/src/tests_resources.js @@ -547,9 +547,7 @@ var g_extensions = [ ccbjs + "ccb/markerfelt24shadow.fnt", ccbjs + "ccb/grossini-generic.plist", - ccbjs + "ccb/animated-grossini.plist", - - "ActionTimeline/DemoPlayer_skeleton.json" + ccbjs + "ccb/animated-grossini.plist" ]; var g_cocoStudio = [ @@ -908,7 +906,9 @@ var g_cocoStudio = [ "Particles/BoilingFoam.plist", "ccs-res/cocosui/CustomImageViewTest/NewProject_2_1.ExportJson", "ccs-res/cocosui/CustomImageViewTest/NewProject_20.plist", - "ccs-res/cocosui/CustomImageViewTest/NewProject_20.png" + "ccs-res/cocosui/CustomImageViewTest/NewProject_20.png", + + "ActionTimeline/DemoPlayer_skeleton.json" ]; var g_ui = [