Merge pull request #5570 from ricardoquesada/test_names_improvements

Test names improvements

CHANGELOG.REMOVED.git-id

@@ -1 +1 @@
-7ba5e6701b6f50ef32418d0f1fd8396dc79ffc3a
+50f1022c672a57d837362191d33d09f6bf69986b

cocos/2d/CCLabel.h

@@ -144,7 +144,7 @@ public:
     TextHAlignment getTextAlignment() const;
     
     // label related stuff
-    CC_DEPRECATED_ATTRIBUTE float getWidth() const { getMaxLineWidth(); }
+    CC_DEPRECATED_ATTRIBUTE float getWidth() const { return getMaxLineWidth(); }
     float getMaxLineWidth() const;
     bool breakLineWithoutSpace() const;
     

tests/Classes/NewRendererTest/NewRendererTest.cpp

@@ -214,7 +214,7 @@ void NewSpriteTest::onTouchesEnded(const std::vector<Touch *> &touches, Event *e
 
 std::string NewSpriteTest::title() const
 {
-    return "NewRender";
+    return "Renderer";
 }
 
 std::string NewSpriteTest::subtitle() const
@@ -241,7 +241,7 @@ NewSpriteBatchTest::~NewSpriteBatchTest()
 
 std::string NewSpriteBatchTest::title() const
 {
-    return "NewRender";
+    return "Renderer";
 }
 
 std::string NewSpriteBatchTest::subtitle() const

tests/Classes/controller.cpp

@@ -30,80 +30,72 @@ Controller g_aTestNames[] = {
     // TESTS MUST BE ORDERED ALPHABETICALLY
     //     violators will be prosecuted
     //
-    { "AUnitTest", []() { return new UnitTestScene(); }},
-    { "ANewRenderTest", []() { return new NewRendererTestScene(); } },
 	{ "Accelerometer", []() { return new AccelerometerTestScene(); } },
-	{ "ActionManagerTest", [](){return new ActionManagerTestScene(); } },
-	{ "ActionsEaseTest", [](){return new ActionsEaseTestScene();} },
-	{ "ActionsProgressTest", [](){return new ProgressActionsTestScene(); } },
-	{ "ActionsTest", [](){ return new ActionsTestScene(); } },
-	{ "Box2dTest", []() { return new Box2DTestScene(); } },
-	{ "Box2dTestBed", []() { return new Box2dTestBedScene(); } },
-	{ "BugsTest", []() { return new BugsTestScene(); } },
-#if (CC_TARGET_PLATFORM != CC_PLATFORM_MARMALADE)
-	{ "ChipmunkTest", []() { return new ChipmunkAccelTouchTestScene(); } },
-#endif
-	{ "ClickAndMoveTest", [](){return new ClickAndMoveTestScene(); } },
-#if (CC_TARGET_PLATFORM != CC_PLATFORM_MARMALADE)
-	{ "ClippingNodeTest", []() { return new ClippingNodeTestScene(); } },
-#endif
-	{ "CocosDenshionTest", []() { return new CocosDenshionTestScene(); } },
-	{ "ConfigurationTest", []() { return new ConfigurationTestScene(); } },
-	{ "ConsoleTest", []() { return new ConsoleTestScene(); } },
+	{ "ActionManager", [](){return new ActionManagerTestScene(); } },
+	{ "Actions - Basic", [](){ return new ActionsTestScene(); } },
+	{ "Actions - Ease", [](){return new ActionsEaseTestScene();} },
+	{ "Actions - Progress", [](){return new ProgressActionsTestScene(); } },
+	{ "Audio - CocosDenshion", []() { return new CocosDenshionTestScene(); } },
+	{ "Box2d - Basic", []() { return new Box2DTestScene(); } },
+	{ "Box2d - TestBed", []() { return new Box2dTestBedScene(); } },
+	{ "Bugs", []() { return new BugsTestScene(); } },
+	{ "Chipmunk", []() { return new ChipmunkAccelTouchTestScene(); } },
+	{ "Click and Move", [](){return new ClickAndMoveTestScene(); } },
+	{ "Configuration", []() { return new ConfigurationTestScene(); } },
+	{ "Console", []() { return new ConsoleTestScene(); } },
 #if (CC_TARGET_PLATFORM != CC_PLATFORM_EMSCRIPTEN)
 #if (CC_TARGET_PLATFORM != CC_PLATFORM_NACL)
 #if (CC_TARGET_PLATFORM != CC_PLATFORM_MARMALADE)
 #if (CC_TARGET_PLATFORM != CC_PLATFORM_BADA)
-	{ "CurlTest", []() { return new CurlTestScene(); } },
+	{ "Curl", []() { return new CurlTestScene(); } },
 #endif
 #endif
 #endif
 #endif
-	{ "CurrentLanguageTest", []() { return new CurrentLanguageTestScene(); } },
-	{ "DrawPrimitivesTest", [](){return new DrawPrimitivesTestScene();} },
-    { "EventDispatcherTest(NEW)", []() { return new EventDispatcherTestScene(); } },
-	{ "EffectAdvancedTest", []() { return new EffectAdvanceScene(); } },
-	{ "EffectsTest", [](){return new EffectTestScene();} },
-	{ "ExtensionsTest", []() { return new ExtensionsTestScene(); } },
-	{ "FileUtilsTest", []() { return new FileUtilsTestScene(); } },
-	{ "FontTest", []() { return new FontTestScene(); } },
-	{ "IntervalTest", [](){return new IntervalTestScene(); } },
-	{ "KeyboardTest", []() { return new KeyboardTestScene(); } },
-#if (CC_TARGET_PLATFORM != CC_PLATFORM_BADA)
-	{ "KeypadTest", []() { return new KeypadTestScene(); } },
-#endif
-	{ "LabelTest", [](){return new AtlasTestScene(); } },
-    { "LabelTestNew", [](){return new AtlasTestSceneNew(); } },
-	{ "LayerTest", [](){return new LayerTestScene();} },
-	{ "MenuTest", [](){return new MenuTestScene();} },
-	{ "MotionStreakTest", [](){return new MotionStreakTestScene();} },
-    { "MouseTest", []() { return new MouseTestScene(); } },
-	{ "MutiTouchTest", []() { return new MutiTouchTestScene(); } },
-	{ "NodeTest", [](){return new CocosNodeTestScene();} },
-	{ "ParallaxTest", [](){return new ParallaxTestScene(); } },
-	{ "ParticleTest", [](){return new ParticleTestScene(); } },
-	{ "PerformanceTest", []() { return new PerformanceTestScene(); } },
-	{ "PhysicsTest", []() { return new PhysicsTestScene(); } },
-    { "ReleasePoolTest", [](){ return new ReleasePoolTestScene(); } },
-	{ "RenderTextureTest", [](){return new RenderTextureScene(); } },
-	{ "RotateWorldTest", [](){return new RotateWorldTestScene(); } },
-	{ "SceneTest", [](){return new SceneTestScene();} },
-	{ "SchedulerTest", [](){return new SchedulerTestScene(); } },
-	{ "ShaderTest", []() { return new ShaderTestScene(); } },
-    { "ShaderTestSprite", []() { return new ShaderTestScene2(); } },
-	{ "SpineTest", []() { return new SpineTestScene(); } },
-	{ "SpriteTest", [](){return new SpriteTestScene(); } },
-	{ "TextInputTest", [](){return new TextInputTestScene(); } },
-	{ "Texture2DTest", [](){return new TextureTestScene(); } },
-#if (CC_TARGET_PLATFORM != CC_PLATFORM_MARMALADE)
-	{ "TextureCacheTest", []() { return new TextureCacheTestScene(); } },
-#endif
-	{ "TexturePackerEncryption", []() { return new TextureAtlasEncryptionTestScene(); } },
-	{ "TileMapTest", [](){return new TileMapTestScene(); } },
-	{ "TouchesTest", [](){return new PongScene();} },
-	{ "TransitionsTest", [](){return new TransitionsTestScene();} },
-	{ "UserDefaultTest", []() { return new UserDefaultTestScene(); } },
-	{ "ZwoptexTest", []() { return new ZwoptexTestScene(); } },
+	{ "Current Language", []() { return new CurrentLanguageTestScene(); } },
+    { "EventDispatcher", []() { return new EventDispatcherTestScene(); } },
+	{ "Effects - Advanced", []() { return new EffectAdvanceScene(); } },
+	{ "Effects - Basic", [](){return new EffectTestScene();} },
+	{ "Extensions", []() { return new ExtensionsTestScene(); } },
+	{ "FileUtils", []() { return new FileUtilsTestScene(); } },
+	{ "Fonts", []() { return new FontTestScene(); } },
+	{ "Interval", [](){return new IntervalTestScene(); } },
+	{ "Keyboard", []() { return new KeyboardTestScene(); } },
+	{ "Keypad", []() { return new KeypadTestScene(); } },
+	{ "Node: Clipping", []() { return new ClippingNodeTestScene(); } },
+	{ "Node: Draw", [](){return new DrawPrimitivesTestScene();} },
+    { "Node: Label - New API", [](){return new AtlasTestSceneNew(); } },
+	{ "Node: Label - Old API", [](){return new AtlasTestScene(); } },
+	{ "Node: Layer", [](){return new LayerTestScene();} },
+	{ "Node: Menu", [](){return new MenuTestScene();} },
+	{ "Node: MotionStreak", [](){return new MotionStreakTestScene();} },
+	{ "Node: Node", [](){return new CocosNodeTestScene();} },
+	{ "Node: Parallax", [](){return new ParallaxTestScene(); } },
+	{ "Node: Particles", [](){return new ParticleTestScene(); } },
+	{ "Node: Physics", []() { return new PhysicsTestScene(); } },
+	{ "Node: RenderTexture", [](){return new RenderTextureScene(); } },
+	{ "Node: Scene", [](){return new SceneTestScene();} },
+	{ "Node: Spine", []() { return new SpineTestScene(); } },
+	{ "Node: Sprite", [](){return new SpriteTestScene(); } },
+	{ "Node: TileMap", [](){return new TileMapTestScene(); } },
+	{ "Node: Text Input", [](){return new TextInputTestScene(); } },
+    { "Mouse", []() { return new MouseTestScene(); } },
+	{ "MutiTouch", []() { return new MutiTouchTestScene(); } },
+	{ "Performance tests", []() { return new PerformanceTestScene(); } },
+    { "Renderer", []() { return new NewRendererTestScene(); } },
+    { "ReleasePool", [](){ return new ReleasePoolTestScene(); } },
+	{ "Rotate World", [](){return new RotateWorldTestScene(); } },
+	{ "Scheduler", [](){return new SchedulerTestScene(); } },
+	{ "Shader - Basic", []() { return new ShaderTestScene(); } },
+    { "Shader - Sprite", []() { return new ShaderTestScene2(); } },
+	{ "Texture2D", [](){return new TextureTestScene(); } },
+	{ "TextureCache", []() { return new TextureCacheTestScene(); } },
+	{ "TexturePacker Encryption", []() { return new TextureAtlasEncryptionTestScene(); } },
+	{ "Touches", [](){return new PongScene();} },
+	{ "Transitions", [](){return new TransitionsTestScene();} },
+    { "Unit Test", []() { return new UnitTestScene(); }},
+	{ "UserDefault", []() { return new UserDefaultTestScene(); } },
+	{ "Zwoptex", []() { return new ZwoptexTestScene(); } },
 };
 
 static int g_testCount = sizeof(g_aTestNames) / sizeof(g_aTestNames[0]);