Merge pull request #10192 from samuele3hu/v3_4_rc1

[ci skip]Fix some lua test cases bug

tests/lua-tests/src/CocoStudioTest/CocoStudioUIEditorTest/CocoStudioUIEditorTest.lua

@@ -676,7 +676,8 @@ function LayoutComponentTest:configureGUIScene()
 
     local back_label = ccui.Helper:seekWidgetByName(root, "back")
     back_label:addTouchEventListener(function(sender, eventType)
-        self:unscheduleUpdate()
+        scheduler:unscheduleScriptEntry(schedulerEntry)
+        schedulerEntry = 0
         runCocoStudioUIEditorTestScene()
     end)
 

tests/lua-tests/src/LabelTest/LabelTest.lua

@@ -45,6 +45,10 @@ end
 function LabelAtlasTest.onNodeEvent(tag)
     if tag == "exit" then
         LabelAtlasTest.layer:unscheduleUpdate()
+    elseif tag == "enter" then
+        if nil ~= LabelAtlasTest.layer then
+            LabelAtlasTest.layer:scheduleUpdateWithPriorityLua(LabelAtlasTest.step, 0)
+        end
     end
 end
 
@@ -64,8 +68,6 @@ function LabelAtlasTest.create()
     label2:setPosition( cc.p(10,200) )
     label2:setOpacity( 32 )
 
-    layer:scheduleUpdateWithPriorityLua(LabelAtlasTest.step, 0)
-
     Helper.titleLabel:setString("LabelAtlas")
     Helper.subtitleLabel:setString("Updating label should be fast")
 
@@ -105,6 +107,10 @@ end
 function LabelAtlasColorTest.onNodeEvent(tag)
     if tag == "exit" then
         LabelAtlasColorTest.layer:unscheduleUpdate()
+    elseif tag == "enter" then
+        if nil ~= LabelAtlasColorTest.layer then
+            LabelAtlasColorTest.layer:scheduleUpdateWithPriorityLua(LabelAtlasColorTest.step, 0)
+        end
     end
 end
 
@@ -135,7 +141,6 @@ function LabelAtlasColorTest.create()
     label2:runAction( repeatAction )
 
     layer:registerScriptHandler(LabelAtlasColorTest.onNodeEvent)
-    layer:scheduleUpdateWithPriorityLua(LabelAtlasColorTest.step, 0)
 
     Helper.titleLabel:setString("LabelAtlas")
     Helper.subtitleLabel:setString("Opacity + Color should work at the same time")
@@ -161,6 +166,8 @@ Atlas3.__index = Atlas3
 function Atlas3.onNodeEvent(tag)
     if tag == "exit" then
         Atlas3.layer:unscheduleUpdate()
+    elseif tag == "enter" then
+        Atlas3.layer:scheduleUpdateWithPriorityLua(Atlas3.step, 0)
     end
 end
 
@@ -211,7 +218,6 @@ function Atlas3.create()
     label3:setPosition( VisibleRect:rightTop() )
 
     layer:registerScriptHandler(Atlas3.onNodeEvent)
-    layer:scheduleUpdateWithPriorityLua(Atlas3.step, 0)
 
     Helper.titleLabel:setString( "LabelBMFont" )
     Helper.subtitleLabel:setString( "Testing alignment. Testing opacity + tint" )

tests/lua-tests/src/LabelTestNew/LabelTestNew.lua

@@ -28,6 +28,10 @@ LabelFNTColorAndOpacity.__index = LabelFNTColorAndOpacity
 function LabelFNTColorAndOpacity.onNodeEvent(tag)
     if tag == "exit" then
         LabelFNTColorAndOpacity.layer:unscheduleUpdate()
+    elseif tag == "enter" then
+        if nil ~= LabelFNTColorAndOpacity.layer then
+            LabelFNTColorAndOpacity.layer:scheduleUpdateWithPriorityLua(LabelFNTColorAndOpacity.step, 0)
+        end
     end
 end
 
@@ -73,7 +77,6 @@ function LabelFNTColorAndOpacity.create()
     label3:setPosition( VisibleRect:rightTop() )
 
     layer:registerScriptHandler(LabelFNTColorAndOpacity.onNodeEvent)
-    layer:scheduleUpdateWithPriorityLua(LabelFNTColorAndOpacity.step, 0)
 
     Helper.titleLabel:setString( "New Label + .FNT file" )
     Helper.subtitleLabel:setString( "Testing opacity + tint" )