Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13015 from VisualSJ/v3.7.1-12940 

[ci skip] Moveing ActionTimeline tests
This commit is contained in:
pandamicro 2015-07-25 14:44:10 +08:00
parent 33007e832f a0bf2c782f
commit c16cab7e53
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/js-tests/project.json
View File

@ -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",

2
tests/js-tests/src/ExtensionsTest/ActionTimelineTest/ActionTimelineTest.js → tests/js-tests/src/CocoStudioTest/ActionTimelineTest/ActionTimelineTest.js
View File

@ -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);

6
tests/js-tests/src/CocoStudioTest/CocoStudioTest.js
View File

@ -51,6 +51,12 @@ var cocoStudioTestItemNames = [
testScene:function(){
runParserTest();
}
},
{
itemTitle:"ActionTimeLineTest",
testScene:function () {
runActionTimeLineTest();
}
}
];

6
tests/js-tests/src/ExtensionsTest/ExtensionsTest.js
View File

@ -87,12 +87,6 @@ var extensionsTestItemNames = [
testScene:function () {
runCCPoolTest();
}
},
{
itemTitle:"ActionTimeLineTest",
testScene:function () {
runActionTimeLineTest();
}
}
];

8
tests/js-tests/src/tests_resources.js
View File

@ -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 = [