diff --git a/tools/JenkinsScript/Windows/win32/qtp_win32/Action1/Script.mts b/tools/JenkinsScript/Windows/win32/qtp_win32/Action1/Script.mts index 150f5cdc87..a4f98f9380 100644 --- a/tools/JenkinsScript/Windows/win32/qtp_win32/Action1/Script.mts +++ b/tools/JenkinsScript/Windows/win32/qtp_win32/Action1/Script.mts @@ -42,7 +42,7 @@ On Error goto 0 Function common_test(a,b,c) For i = a To b - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 338,291 Wait c Next End Function @@ -53,7 +53,7 @@ Function random_click(a,b,c) For Response = a To b touch_x = Int((400 * Rnd + 0)) touch_y = Int((250 * Rnd + 0)) - Window("Hello Tests").Click touch_x,touch_y + Window("Cocos2dxWin32").Click touch_x,touch_y Wait c Next End Function @@ -66,641 +66,641 @@ Function random_drag(a,b,c) drag_y = Int((250 * Rnd + 0)) drop_x = Int((400 * Rnd + 0)) drop_y = Int((250 * Rnd + 0)) - Window("Hello Tests").Drag drag_x,drag_y - Window("Hello Tests").Drop drop_x,drop_y + Window("Cocos2dxWin32").Drag drag_x,drag_y + Window("Cocos2dxWin32").Drop drop_x,drop_y Wait c Next End Function Function CaseFunctionName() 'SystemUtil.BlockInput - Window("Hello Tests").Activate + Window("Cocos2dxWin32").Activate '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'ActionsTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 241,43 + Window("Cocos2dxWin32").Click 241,43 Wait 2 Call common_test(1,27,1) - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 338,291 Wait 5 - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 338,291 Wait 2 Call common_test(1,5,1) 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 Wait 2 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'TransitionsTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 236,77 + Window("Cocos2dxWin32").Click 236,77 Wait 2 Call common_test(1,26,1) Wait 1 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 Wait 2 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'ActionsProgressTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 287,113 + Window("Cocos2dxWin32").Click 287,113 Wait 2 Call common_test(1,7,2) 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 Wait 2 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'EffectsTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 236,163 + Window("Cocos2dxWin32").Click 236,163 Wait 3 Call common_test(1,21,4) 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 Wait 2 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'ClickAndMoveTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 228,199 + Window("Cocos2dxWin32").Click 228,199 Wait 3 Call random_click(1,10,2) Call random_click(1,100,0) 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 Wait 2 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'RotateWorldTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 237,235 + Window("Cocos2dxWin32").Click 237,235 Wait 3.5 ''MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 Wait 2 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'ParticleTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 236,276 + Window("Cocos2dxWin32").Click 236,276 Wait 3 Call common_test(1,42,2) 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 Wait 2 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'ActionEaseTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Drag 363,307 - Window("Hello Tests").Drop 363,10 + Window("Cocos2dxWin32").Drag 363,307 + Window("Cocos2dxWin32").Drop 363,10 Wait 1 - Window("Hello Tests").Click 237,19 + Window("Cocos2dxWin32").Click 237,19 Wait 2 Call common_test(1,13,2) 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 Wait 2 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'MotionStreakTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 240,61 + Window("Cocos2dxWin32").Click 240,61 Wait 2 - Window("Hello Tests").Click 230,239 - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 230,239 + Window("Cocos2dxWin32").Click 338,291 Call random_drag(1,10,0) - Window("Hello Tests").Click 230,239 + Window("Cocos2dxWin32").Click 230,239 Call random_drag(1,10,0) - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 338,291 Wait 2 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'DrawPrimitivesTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 235,101 + Window("Cocos2dxWin32").Click 235,101 Wait 1 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'NodeTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 237,139 + Window("Cocos2dxWin32").Click 237,139 Wait 1 Call common_test(1,13,1) 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'TouchesTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 238,183 - Window("Hello Tests").Drag 236,221 - Window("Hello Tests").Drop 175,226 + Window("Cocos2dxWin32").Click 238,183 + Window("Cocos2dxWin32").Drag 236,221 + Window("Cocos2dxWin32").Drop 175,226 Wait 5 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'MenuTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 234,220 - Window("Hello Tests").Click 238,63 - Window("Hello Tests").Click 158,132 + Window("Cocos2dxWin32").Click 234,220 + Window("Cocos2dxWin32").Click 238,63 + Window("Cocos2dxWin32").Click 158,132 - Window("Hello Tests").Click 238,155 - Window("Hello Tests").Click 236,180 - Window("Hello Tests").Click 158,188 - Window("Hello Tests").Click 313,184 - Window("Hello Tests").Click 190,217 - Window("Hello Tests").Click 235,216 - Window("Hello Tests").Click 205,144 - Window("Hello Tests").Click 218,143 - Window("Hello Tests").Click 237,247 + Window("Cocos2dxWin32").Click 238,155 + Window("Cocos2dxWin32").Click 236,180 + Window("Cocos2dxWin32").Click 158,188 + Window("Cocos2dxWin32").Click 313,184 + Window("Cocos2dxWin32").Click 190,217 + Window("Cocos2dxWin32").Click 235,216 + Window("Cocos2dxWin32").Click 205,144 + Window("Cocos2dxWin32").Click 218,143 + Window("Cocos2dxWin32").Click 237,247 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'ActionManagerTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 234,261 + Window("Cocos2dxWin32").Click 234,261 Call common_test(1,4,3) 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'LayerTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 240,302 + Window("Cocos2dxWin32").Click 240,302 Call random_drag(1,10,0) - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 338,291 Wait 2 - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 338,291 Wait 2 - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 338,291 Call random_drag(1,10,0) - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 338,291 Wait 1 - Window("Hello Tests").Click 242,164 + Window("Cocos2dxWin32").Click 242,164 Wait 1 - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 338,291 Wait 1 - Window("Hello Tests").Click 254,163 + Window("Cocos2dxWin32").Click 254,163 Wait 1 - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 338,291 Wait 1 - Window("Hello Tests").Click 231,164 + Window("Cocos2dxWin32").Click 231,164 Wait 1 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'SceneTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Drag 370,306 - Window("Hello Tests").Drop 370,-20 + Window("Cocos2dxWin32").Drag 370,306 + Window("Cocos2dxWin32").Drop 370,-20 Wait 1 - Window("Hello Tests").Click 234,17 + Window("Cocos2dxWin32").Click 234,17 Wait 1 - Window("Hello Tests").Click 230,111 - Window("Hello Tests").Click 230,111 - Window("Hello Tests").Click 230,111 - Window("Hello Tests").Click 233,163 - Window("Hello Tests").Click 226,218 - Window("Hello Tests").Click 226,218 + Window("Cocos2dxWin32").Click 230,111 + Window("Cocos2dxWin32").Click 230,111 + Window("Cocos2dxWin32").Click 230,111 + Window("Cocos2dxWin32").Click 233,163 + Window("Cocos2dxWin32").Click 226,218 + Window("Cocos2dxWin32").Click 226,218 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'ParallaxTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 232,55 + Window("Cocos2dxWin32").Click 232,55 Wait 5 - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 338,291 Call random_drag(1,10,0) 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'TileMapTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 233,99 + Window("Cocos2dxWin32").Click 233,99 Wait 2 - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 338,291 Wait 2 Call random_drag(1,10,0) 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'IntervalTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 235,139 + Window("Cocos2dxWin32").Click 235,139 Wait 3 - Window("Hello Tests").Click 224,48 + Window("Cocos2dxWin32").Click 224,48 Wait 1 - Window("Hello Tests").Click 231,52 - Window("Hello Tests").Click 228,56 - Window("Hello Tests").Click 228,56 + Window("Cocos2dxWin32").Click 231,52 + Window("Cocos2dxWin32").Click 228,56 + Window("Cocos2dxWin32").Click 228,56 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'ChipmunkAccelTouchTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 235,178 + Window("Cocos2dxWin32").Click 235,178 Call random_click(1,20,2) 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'LabelTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 239,216 + Window("Cocos2dxWin32").Click 239,216 Wait 3 Call common_test(1,25,0.5) 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'TextInputTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 236,255 + Window("Cocos2dxWin32").Click 236,255 - Window("Hello Tests").Click 238,161 + Window("Cocos2dxWin32").Click 238,161 Const constring = "0123456789abcdefgchijklmnopqrstuvwxyz" Dim TextInput_i,TextInput_j,randstring Randomize For TextInput_i=1 To 8 randstring = randstring & Mid(constring, Int(Len(constring)*Rnd)+1, 1) Next - Window("Hello Tests").Type randstring - Window("Hello Tests").Click 338,291 - Window("Hello Tests").Click 238,161 + Window("Cocos2dxWin32").Type randstring + Window("Cocos2dxWin32").Click 338,291 + Window("Cocos2dxWin32").Click 238,161 Randomize For TextInput_j=1 To 8 randstring = randstring & Mid(constring, Int(Len(constring)*Rnd)+1, 1) Next - Window("Hello Tests").Type randstring + Window("Cocos2dxWin32").Type randstring 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'SpriteTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 238,294 + Window("Cocos2dxWin32").Click 238,294 Call random_click(1,10,2) - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 338,291 Call random_click(1,10,2) - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 338,291 Call common_test(1,108,0.5) 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'SchdulerTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Drag 359,309 - Window("Hello Tests").Drop 359,-11 + Window("Cocos2dxWin32").Drag 359,309 + Window("Cocos2dxWin32").Drop 359,-11 Wait 1 'Schedule with delay of 3sec,repeat 4 - Window("Hello Tests").Click 236,15 - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 236,15 + Window("Cocos2dxWin32").Click 338,291 'Scheduler timeScale Test - Window("Hello Tests").Drag 260,212 - Window("Hello Tests").Drop 301,212 + Window("Cocos2dxWin32").Drag 260,212 + Window("Cocos2dxWin32").Drop 301,212 Wait 1 - Window("Hello Tests").Drag 301,212 - Window("Hello Tests").Drop 209,214 + Window("Cocos2dxWin32").Drag 301,212 + Window("Cocos2dxWin32").Drop 209,214 Wait 1 - Window("Hello Tests").Drag 209,214 - Window("Hello Tests").Drop 100,208 + Window("Cocos2dxWin32").Drag 209,214 + Window("Cocos2dxWin32").Drop 100,208 Wait 2 - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 338,291 'Two custom schedulers - Window("Hello Tests").Drag 126,16 - Window("Hello Tests").Drop 81,22 + Window("Cocos2dxWin32").Drag 126,16 + Window("Cocos2dxWin32").Drop 81,22 Wait 1 - Window("Hello Tests").Drag 361,19 - Window("Hello Tests").Drop 422,22 + Window("Cocos2dxWin32").Drag 361,19 + Window("Cocos2dxWin32").Drop 422,22 Wait 3 - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 338,291 'Self -remove an scheduler - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 338,291 'Pause/Resume - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 338,291 'Pause/Resume Wait 3 - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 338,291 'Unschedule All selectors - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 338,291 'Unschedule All selectors(HARD) Wait 2 - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 338,291 'Unschedule All selectors Wait 4 - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 338,291 'Schedule from Schedule - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 338,291 'Schedule update with priority - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 338,291 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'RenderTextureTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 240,59 + Window("Cocos2dxWin32").Click 240,59 'Save Image Call random_drag(1,10,0) - Window("Hello Tests").Click 388,17 - Window("Hello Tests").Click 398,41 + Window("Cocos2dxWin32").Click 388,17 + Window("Cocos2dxWin32").Click 398,41 Wait 1 - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 338,291 'Testing issue #937 - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 338,291 'Testing Z Buffer in Render Texture Call random_click(1,10,0) - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 338,291 'Testing depthStencil attachment MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'Texture2DTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 234,97 + Window("Cocos2dxWin32").Click 234,97 Call common_test(1,35,0.5) MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'Box2dTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 235,134 + Window("Cocos2dxWin32").Click 235,134 Call random_click(1,30,2) 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'Box2dTestBed '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 236,176 + Window("Cocos2dxWin32").Click 236,176 Call common_test(1,35,2) 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'EffectAdvancedTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 237,217 + Window("Cocos2dxWin32").Click 237,217 Call common_test(1,5,1) 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' AccelerometerTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 244,255 + Window("Cocos2dxWin32").Click 244,255 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'KeypadTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 240,298 + Window("Cocos2dxWin32").Click 240,298 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'CocosDenshionTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Drag 377,314 - Window("Hello Tests").Drop 377,0 + Window("Cocos2dxWin32").Drag 377,314 + Window("Cocos2dxWin32").Drop 377,0 Wait 1 - Window("Hello Tests").Click 243,20 + Window("Cocos2dxWin32").Click 243,20 - Window("Hello Tests").Click 248,38 + Window("Cocos2dxWin32").Click 248,38 Wait 1 - Window("Hello Tests").Click 248,78 + Window("Cocos2dxWin32").Click 248,78 Wait 1 - Window("Hello Tests").Click 247,121 + Window("Cocos2dxWin32").Click 247,121 Wait 1 - Window("Hello Tests").Click 246,158 + Window("Cocos2dxWin32").Click 246,158 Wait 1 - Window("Hello Tests").Click 251,202 + Window("Cocos2dxWin32").Click 251,202 Wait 1 - Window("Hello Tests").Click 246,238 + Window("Cocos2dxWin32").Click 246,238 Wait 1 - Window("Hello Tests").Click 241,282 + Window("Cocos2dxWin32").Click 241,282 Wait 1 - Window("Hello Tests").Drag 427,260 - Window("Hello Tests").Drop 427,6 - Window("Hello Tests").Click 232,18 + Window("Cocos2dxWin32").Drag 427,260 + Window("Cocos2dxWin32").Drop 427,6 + Window("Cocos2dxWin32").Click 232,18 Wait 1 - Window("Hello Tests").Click 245,56 + Window("Cocos2dxWin32").Click 245,56 Wait 1 - Window("Hello Tests").Click 242,109 + Window("Cocos2dxWin32").Click 242,109 Wait 1 - Window("Hello Tests").Click 242,144 + Window("Cocos2dxWin32").Click 242,144 Wait 1 - Window("Hello Tests").Click 243,189 + Window("Cocos2dxWin32").Click 243,189 Wait 1 - Window("Hello Tests").Click 243,230 + Window("Cocos2dxWin32").Click 243,230 Wait 1 - Window("Hello Tests").Click 254,275 + Window("Cocos2dxWin32").Click 254,275 Wait 1 - Window("Hello Tests").Click 248,304 + Window("Cocos2dxWin32").Click 248,304 Wait 1 - Window("Hello Tests").Drag 412,272 - Window("Hello Tests").Drop 412,-13 - Window("Hello Tests").Click 235,124 + Window("Cocos2dxWin32").Drag 412,272 + Window("Cocos2dxWin32").Drop 412,-13 + Window("Cocos2dxWin32").Click 235,124 Wait 1 - Window("Hello Tests").Click 238,158 + Window("Cocos2dxWin32").Click 238,158 Wait 1 - Window("Hello Tests").Click 229,200 + Window("Cocos2dxWin32").Click 229,200 Wait 1 - Window("Hello Tests").Click 239,243 + Window("Cocos2dxWin32").Click 239,243 Wait 1 - Window("Hello Tests").Click 246,277 + Window("Cocos2dxWin32").Click 246,277 Wait 1 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'PerformanceTest ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 237,64 - Window("Hello Tests").Click 238,37 + Window("Cocos2dxWin32").Click 237,64 + Window("Cocos2dxWin32").Click 238,37 'PerformanceNodeChildrenTest - Window("Hello Tests").Click 238,38 + Window("Cocos2dxWin32").Click 238,38 Dim Performance_i For Performance_i = 1 To 4 - Window("Hello Tests").Click 273,145 - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 273,145 + Window("Cocos2dxWin32").Click 338,291 Wait 1 Next Back - Window("Hello Tests").Click 427,290 + Window("Cocos2dxWin32").Click 427,290 'PerformanceParticeTest - Window("Hello Tests").Click 237,78 + Window("Cocos2dxWin32").Click 237,78 For Performance_j = 1 To 4 - Window("Hello Tests").Click 273,145 - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 273,145 + Window("Cocos2dxWin32").Click 338,291 Wait 1 Next 'Back - Window("Hello Tests").Click 427,290 + Window("Cocos2dxWin32").Click 427,290 'PerformanceSpriteTest - Window("Hello Tests").Click 233,120 + Window("Cocos2dxWin32").Click 233,120 Dim Performance_k For Performance_k = 1 To 5 - Window("Hello Tests").Click 271,64 - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 271,64 + Window("Cocos2dxWin32").Click 338,291 Wait 1 Next 'Back - Window("Hello Tests").Click 427,290 + Window("Cocos2dxWin32").Click 427,290 'PerformanceTextureTest - Window("Hello Tests").Click 229,159 + Window("Cocos2dxWin32").Click 229,159 'Back - Window("Hello Tests").Click 427,290 + Window("Cocos2dxWin32").Click 427,290 'PerformanceTouchesTest - Window("Hello Tests").Click 234,200 + Window("Cocos2dxWin32").Click 234,200 Call random_drag(1,10,0) - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 338,291 Call random_drag(1,10,0) 'Back - Window("Hello Tests").Click 427,290 + Window("Cocos2dxWin32").Click 427,290 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'ZwoptexTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 233,104 + Window("Cocos2dxWin32").Click 233,104 Wait 1 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'CurlTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 239,141 - Window("Hello Tests").Click 242,160 + Window("Cocos2dxWin32").Click 239,141 + Window("Cocos2dxWin32").Click 242,160 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'UserDefaultTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 238,184 + Window("Cocos2dxWin32").Click 238,184 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'BugsTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 240,222 + Window("Cocos2dxWin32").Click 240,222 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'FontTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 237,261 + Window("Cocos2dxWin32").Click 237,261 Call common_test(1,4,0.5) 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'CurrentLanguageTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 244,301 + Window("Cocos2dxWin32").Click 244,301 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'TextureCacheTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Drag 385,309 - Window("Hello Tests").Drop 385,33 + Window("Cocos2dxWin32").Drag 385,309 + Window("Cocos2dxWin32").Drop 385,33 Wait 1 - Window("Hello Tests").Click 241,159 + Window("Cocos2dxWin32").Click 241,159 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'ExtensionsTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 241,197 + Window("Cocos2dxWin32").Click 241,197 Wait 1 'NotificationCenterTest - Window("Hello Tests").Click 235,41 - Window("Hello Tests").Click 339,166 - Window("Hello Tests").Click 339,166 - Window("Hello Tests").Click 113,189 + Window("Cocos2dxWin32").Click 235,41 + Window("Cocos2dxWin32").Click 339,166 + Window("Cocos2dxWin32").Click 339,166 + Window("Cocos2dxWin32").Click 113,189 'Back - Window("Hello Tests").Click 429,289 + Window("Cocos2dxWin32").Click 429,289 Wait 1 'CCControlButtonTest - Window("Hello Tests").Click 238,79 - Window("Hello Tests").Drag 118,181 - Window("Hello Tests").Drop 374,189 + Window("Cocos2dxWin32").Click 238,79 + Window("Cocos2dxWin32").Drag 118,181 + Window("Cocos2dxWin32").Drop 374,189 Wait 1 - Window("Hello Tests").Drag 367,179 - Window("Hello Tests").Drop 76,183 + Window("Cocos2dxWin32").Drag 367,179 + Window("Cocos2dxWin32").Drop 76,183 Wait 1 'Back - Window("Hello Tests").Click 422,293 + Window("Cocos2dxWin32").Click 422,293 'CocosBuilderTest - Window("Hello Tests").Click 237,119 + Window("Cocos2dxWin32").Click 237,119 'Menus_Items - Window("Hello Tests").Click 137,158 - Window("Hello Tests").Click 242,157 - Window("Hello Tests").Click 113,147 - Window("Hello Tests").Click 23,20 + Window("Cocos2dxWin32").Click 137,158 + Window("Cocos2dxWin32").Click 242,157 + Window("Cocos2dxWin32").Click 113,147 + Window("Cocos2dxWin32").Click 23,20 'Button - Window("Hello Tests").Click 132,209 - Window("Hello Tests").Click 240,149 - Window("Hello Tests").Drag 255,150 - Window("Hello Tests").Drop 259,233 - Window("Hello Tests").Click 23,20 + Window("Cocos2dxWin32").Click 132,209 + Window("Cocos2dxWin32").Click 240,149 + Window("Cocos2dxWin32").Drag 255,150 + Window("Cocos2dxWin32").Drop 259,233 + Window("Cocos2dxWin32").Click 23,20 'Particle Systems - Window("Hello Tests").Click 131,261 - Window("Hello Tests").Click 23,20 + Window("Cocos2dxWin32").Click 131,261 + Window("Cocos2dxWin32").Click 23,20 'Sprites_9 Slice - Window("Hello Tests").Click 341,161 - Window("Hello Tests").Click 23,20 + Window("Cocos2dxWin32").Click 341,161 + Window("Cocos2dxWin32").Click 23,20 'Labels - Window("Hello Tests").Click 345,210 - Window("Hello Tests").Click 23,20 + Window("Cocos2dxWin32").Click 345,210 + Window("Cocos2dxWin32").Click 23,20 'ScrollViewTest - Window("Hello Tests").Click 347,259 + Window("Cocos2dxWin32").Click 347,259 Call random_drag(1,10,0) - Window("Hello Tests").Click 23,20 + Window("Cocos2dxWin32").Click 23,20 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'SharderTest '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 242,239 + Window("Cocos2dxWin32").Click 242,239 Dim Sharder_i Call common_test(1,6,0.5) - Window("Hello Tests").Drag 197,235 - Window("Hello Tests").Drop 358,236 + Window("Cocos2dxWin32").Drag 197,235 + Window("Cocos2dxWin32").Drop 358,236 Wait 1 - Window("Hello Tests").Drag 358,236 - Window("Hello Tests").Drop 78,221 + Window("Cocos2dxWin32").Drag 358,236 + Window("Cocos2dxWin32").Drop 78,221 - Window("Hello Tests").Click 338,291 + Window("Cocos2dxWin32").Click 338,291 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'MutiTouchTest ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 240,279 + Window("Cocos2dxWin32").Click 240,279 Call random_drag(1,5,0) 'MainMenu - Window("Hello Tests").Click 441,296 + Window("Cocos2dxWin32").Click 441,296 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 'Quit '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - Window("Hello Tests").Click 461,22 + Window("Cocos2dxWin32").Click 461,22 'SystemUtil.UnblockInput End function \ No newline at end of file diff --git a/tools/JenkinsScript/Windows/win32/qtp_win32/qtrunner.vbs b/tools/JenkinsScript/Windows/win32/qtp_win32/qtrunner.vbs index 697a387a29..7ca6144046 100644 Binary files a/tools/JenkinsScript/Windows/win32/qtp_win32/qtrunner.vbs and b/tools/JenkinsScript/Windows/win32/qtp_win32/qtrunner.vbs differ diff --git a/tools/JenkinsScript/Windows/win32/vs2008_debugtest.bat b/tools/JenkinsScript/Windows/win32/vs2008_debugtest.bat index 4abd8566f6..043aefdf69 100644 --- a/tools/JenkinsScript/Windows/win32/vs2008_debugtest.bat +++ b/tools/JenkinsScript/Windows/win32/vs2008_debugtest.bat @@ -6,7 +6,7 @@ echo. set qtpproj=%cd% cd ..\..\..\..\ -"%VS90COMNTOOLS%..\IDE\devenv.com" "%WORKSPACE%\cocos2d-win32.vc2008.sln" /Build "Debug|Win32" +"%VS90COMNTOOLS%..\IDE\devenv.com" "%cd%\cocos2d-win32.vc2008.sln" /Build "Debug|Win32" set CC_TEST_BIN=TestCpp.exe diff --git a/tools/JenkinsScript/Windows/win32/vs2008_releasetest.bat b/tools/JenkinsScript/Windows/win32/vs2008_releasetest.bat index 0a59315573..7492ee6b1f 100644 --- a/tools/JenkinsScript/Windows/win32/vs2008_releasetest.bat +++ b/tools/JenkinsScript/Windows/win32/vs2008_releasetest.bat @@ -6,7 +6,7 @@ echo. set qtpproj=%cd% cd ..\..\..\..\ -"%VS90COMNTOOLS%..\IDE\devenv.com" "%WORKSPACE%\cocos2d-win32.vc2008.sln" /Build "Release|Win32" +"%VS90COMNTOOLS%..\IDE\devenv.com" "%cd%\cocos2d-win32.vc2008.sln" /Build "Release|Win32" set CC_TEST_BIN=TestCpp.exe diff --git a/tools/JenkinsScript/Windows/win32/vs2010_debugtest.bat b/tools/JenkinsScript/Windows/win32/vs2010_debugtest.bat index d01ab98612..be411c5de9 100644 --- a/tools/JenkinsScript/Windows/win32/vs2010_debugtest.bat +++ b/tools/JenkinsScript/Windows/win32/vs2010_debugtest.bat @@ -6,7 +6,7 @@ echo. set qtpproj=%cd% cd ..\..\..\..\ -"%VS100COMNTOOLS%..\IDE\devenv.com" "%WORKSPACE%\cocos2d-win32.vc2010.sln" /Build "Debug|Win32" +"%VS100COMNTOOLS%..\IDE\devenv.com" "%cd%\cocos2d-win32.vc2010.sln" /Build "Debug|Win32" set CC_TEST_BIN=TestCpp.exe diff --git a/tools/JenkinsScript/Windows/win32/vs2010_releasetest.bat b/tools/JenkinsScript/Windows/win32/vs2010_releasetest.bat index 58ac5409e7..99818dee85 100644 --- a/tools/JenkinsScript/Windows/win32/vs2010_releasetest.bat +++ b/tools/JenkinsScript/Windows/win32/vs2010_releasetest.bat @@ -6,7 +6,7 @@ echo. set qtpproj=%cd% cd ..\..\..\..\ -"%VS100COMNTOOLS%..\IDE\devenv.com" "%WORKSPACE%\cocos2d-win32.vc2010.sln" /Build "Release|Win32" +"%VS100COMNTOOLS%..\IDE\devenv.com" "%cd%\cocos2d-win32.vc2010.sln" /Build "Release|Win32" set CC_TEST_BIN=TestCpp.exe