Bug 498892: Report resource corruption when scanning test suites for tests
Change-Id: Ib1872504275b9a90e1db5b1afcf65deddc1d2160
diff --git a/core/org.eclipse.rcptt.core/src/org/eclipse/rcptt/core/model/Q7Status.java b/core/org.eclipse.rcptt.core/src/org/eclipse/rcptt/core/model/Q7Status.java
index 6d68955..cbc49ca 100644
--- a/core/org.eclipse.rcptt.core/src/org/eclipse/rcptt/core/model/Q7Status.java
+++ b/core/org.eclipse.rcptt.core/src/org/eclipse/rcptt/core/model/Q7Status.java
@@ -34,7 +34,7 @@
}
public Q7Status(int code, Throwable throwable) {
- super(ERROR, RcpttPlugin.PLUGIN_ID, code, "Q7Status", throwable); //$NON-NLS-1$
+ super(ERROR, RcpttPlugin.PLUGIN_ID, code, throwable.getMessage(), throwable); //$NON-NLS-1$
}
public Q7Status(int severity, int code) {
diff --git a/launching/tests/org.eclipse.rcptt.launching.tests/resources/testSuiteReferencingCorruptedResource/.project b/launching/tests/org.eclipse.rcptt.launching.tests/resources/testSuiteReferencingCorruptedResource/.project
new file mode 100644
index 0000000..e4f5ea9
--- /dev/null
+++ b/launching/tests/org.eclipse.rcptt.launching.tests/resources/testSuiteReferencingCorruptedResource/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>testSuiteReferencingCorruptedResource</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.rcptt.core.builder.q7Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.rcptt.core.rcpttnature</nature>
+ </natures>
+</projectDescription>
diff --git a/launching/tests/org.eclipse.rcptt.launching.tests/resources/testSuiteReferencingCorruptedResource/corrupted.test b/launching/tests/org.eclipse.rcptt.launching.tests/resources/testSuiteReferencingCorruptedResource/corrupted.test
new file mode 100644
index 0000000..cb19326
--- /dev/null
+++ b/launching/tests/org.eclipse.rcptt.launching.tests/resources/testSuiteReferencingCorruptedResource/corrupted.test
@@ -0,0 +1,18 @@
+--- RCPTT testcase ---
+Format-Version: 1.0
+Element-Name: corrupted
+Element-Type: testcase
+Element-Version: 3.0
+External-Reference:
+<<<<< Corruption
+Id: _qf9gEHY5Eeml66Zx_xKITg
+Runtime-Version: 2.4.2.201905122359
+Save-Time: 5/14/19 6:16 PM
+Testcase-Type: ecl
+
+------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
+Content-Type: text/ecl
+Entry-Name: .content
+
+Test body
+------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/launching/tests/org.eclipse.rcptt.launching.tests/resources/testSuiteReferencingCorruptedResource/rcptt.properties b/launching/tests/org.eclipse.rcptt.launching.tests/resources/testSuiteReferencingCorruptedResource/rcptt.properties
new file mode 100644
index 0000000..aec55a6
--- /dev/null
+++ b/launching/tests/org.eclipse.rcptt.launching.tests/resources/testSuiteReferencingCorruptedResource/rcptt.properties
@@ -0,0 +1,9 @@
+--- RCPTT testcase ---
+Format-Version: 1.0
+Element-Name: Project Settings
+Element-Type: projectMetadata
+Element-Version: 2.0
+Id: _oYCxUHY5Eeml66Zx_xKITg
+Runtime-Version: 2.4.2.201905122359
+Save-Time: 5/14/19 6:15 PM
+
diff --git a/launching/tests/org.eclipse.rcptt.launching.tests/resources/testSuiteReferencingCorruptedResource/suite.suite b/launching/tests/org.eclipse.rcptt.launching.tests/resources/testSuiteReferencingCorruptedResource/suite.suite
new file mode 100644
index 0000000..8be615e
--- /dev/null
+++ b/launching/tests/org.eclipse.rcptt.launching.tests/resources/testSuiteReferencingCorruptedResource/suite.suite
@@ -0,0 +1,16 @@
+--- RCPTT testcase ---
+Format-Version: 1.0
+Element-Name: suite
+Element-Type: testsuite
+Element-Version: 2.0
+Id: _rjtcEHY5Eeml66Zx_xKITg
+Runtime-Version: 2.4.2.201905122359
+Save-Time: 5/14/19 6:16 PM
+
+------=_testcase-items-62c497da-4241-31f4-811a-6b453a3ecff8
+Content-Type: text/testcase
+Entry-Name: testcase-items
+
+_qf9gEHY5Eeml66Zx_xKITg // kind: 'test' name: 'corrupted' path: 'corrupted.test'
+
+------=_testcase-items-62c497da-4241-31f4-811a-6b453a3ecff8--
diff --git a/launching/tests/org.eclipse.rcptt.launching.tests/src/org/eclipse/rcptt/internal/launching/TestSuiteElementCollectorTest.java b/launching/tests/org.eclipse.rcptt.launching.tests/src/org/eclipse/rcptt/internal/launching/TestSuiteElementCollectorTest.java
new file mode 100644
index 0000000..8356af9
--- /dev/null
+++ b/launching/tests/org.eclipse.rcptt.launching.tests/src/org/eclipse/rcptt/internal/launching/TestSuiteElementCollectorTest.java
@@ -0,0 +1,76 @@
+package org.eclipse.rcptt.internal.launching;
+
+import static org.eclipse.core.runtime.Path.fromPortableString;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceDescription;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.rcptt.core.model.ModelException;
+import org.eclipse.rcptt.core.workspace.RcpttCore;
+import org.eclipse.rcptt.internal.core.RcpttPlugin;
+import org.eclipse.rcptt.internal.core.model.index.TestSuiteElementCollector;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class TestSuiteElementCollectorTest {
+ private static final IWorkspace WORKSPACE = ResourcesPlugin.getWorkspace();
+
+
+ @Test
+ public void corruptedResourcesShouldProduceReadaleErrorMessage() throws CoreException, IOException {
+ TestSuiteElementCollector subject = new TestSuiteElementCollector(Arrays.asList("testsuite1"), false);
+ IProject project = importProject(fromPortableString("/resources/testSuiteReferencingCorruptedResource"), new IPath[] {
+ fromPortableString("corrupted.test"),
+ fromPortableString("rcptt.properties"),
+ fromPortableString("suite.suite")
+ });
+
+ try {
+ RcpttCore.create(project).accept(subject);
+ Assert.fail("Should throw on corrupted resource");
+ } catch (ModelException e) {
+ Assert.assertEquals("Empty resource platform:/resource/testSuiteReferencingCorruptedResource/corrupted.test", e.getMessage());
+ }
+
+ }
+
+ private IProject importProject(IPath bundleAbsoluteProjecRoot, IPath[] relativeProjectFiles) {
+ Assert.assertTrue(bundleAbsoluteProjecRoot.isAbsolute());
+ IProjectDescription description;
+ IProject project;
+ try (InputStream is = TestSuiteElementCollectorTest.class.getResourceAsStream(bundleAbsoluteProjecRoot.append(".project").toPortableString())) {
+ description = WORKSPACE.loadProjectDescription(is);
+ project = WORKSPACE.getRoot().getProject(description.getName());
+ project.create(description, null);
+ project.open(null);
+ for (IPath filePath: relativeProjectFiles) {
+ IFile file = project.getFile(filePath);
+ try(InputStream fis = TestSuiteElementCollectorTest.class.getResourceAsStream(bundleAbsoluteProjecRoot.append(filePath).toPortableString())) {
+ file.create(fis, true, null);
+ }
+ }
+ return project;
+ } catch (Exception e) {
+ RcpttPlugin.log(e);
+ throw new AssertionError(e);
+ }
+ }
+
+ @Before
+ public void before() throws CoreException {
+ IWorkspaceDescription d = WORKSPACE.getDescription();
+ d.setAutoBuilding(false);
+ WORKSPACE.setDescription(d);
+ WORKSPACE.getRoot().getProject("1").delete(true, null);
+ }
+}
diff --git a/rcpttTests/2019-03_regression.suite b/rcpttTests/2019-03_regression.suite
deleted file mode 100644
index 1e68099..0000000
--- a/rcpttTests/2019-03_regression.suite
+++ /dev/null
@@ -1,47 +0,0 @@
---- RCPTT testcase ---
-Format-Version: 1.0
-Element-Name: 2019-03_regression
-Element-Type: testsuite
-Element-Version: 2.0
-Id: _7BRNEFRJEemY1KVRTSK_ug
-Runtime-Version: 2.4.2.qualifier
-Save-Time: 4/23/19 9:12 PM
-
-------=_testcase-items-62c497da-4241-31f4-811a-6b453a3ecff8
-Content-Type: text/testcase
-Entry-Name: testcase-items
-
-_Gl17AMpgEeCVO9X7TqWdlg // kind: 'test' name: 'FilteringContextsInContextList' path: 'platform_tests/Editing/TestCase/ContextList/FilteringContextsInContextList.test'
-_WXXeIK42EeKG-dRk9kbnJA // kind: 'test' name: 'GenerateSecondPomFileInProject' path: 'platform_tests/q7Explorer/generatePom/GenerateSecondPomFileInProject.test'
-_ERrwwBkWEeOt9MVDSr4v5A // kind: 'test' name: 'LaunchCheck_Group_SuperConext' path: 'ECL_IDE_module/selfAUTTests/SuperContext/LaunchCheck_Group_SuperConext.test'
-_cJ8b0BkVEeOt9MVDSr4v5A // kind: 'test' name: 'LaunchCheck_Launch_SuperContext' path: 'ECL_IDE_module/selfAUTTests/SuperContext/LaunchCheck_Launch_SuperContext.test'
-_PumK4RkUEeOt9MVDSr4v5A // kind: 'test' name: 'LaunchCheck_Wb_SuperContext' path: 'ECL_IDE_module/selfAUTTests/SuperContext/LaunchCheck_Wb_SuperContext.test'
-_xjq2oBkOEeOwAuU1H7YyVQ // kind: 'test' name: 'LaunchCheck_Ws_Pref_SuperContext' path: 'ECL_IDE_module/selfAUTTests/SuperContext/LaunchCheck_Ws_Pref_SuperContext.test'
-_nZDtgIGUEeKRQ-O0Mh9igg // kind: 'test' name: 'ListFeatures' path: 'ECL_IDE_module/selfAUTTests/q7commands/ListFeatures.test'
-_E1wokYJEEeKn_ZM6yFZIHw // kind: 'test' name: 'ListPlugins' path: 'ECL_IDE_module/selfAUTTests/q7commands/ListPlugins.test'
-_cw0EYF0IEeGDGrudSYLu8w // kind: 'test' name: 'MarkTaskAsCompleted' path: 'ECL_IDE_module/editors/ScenarioEditor/TasksInScriptEditor/MarkTaskAsCompleted.test'
-_hMoCUAu-EeOLiPM97zhEfw // kind: 'test' name: 'QS-2821_Add tooltip information for references' path: 'ECL_IDE_module/editors/ScenarioEditor/QS-2821_Add tooltip information for references.test'
-_V4RUAAK-EeWIbeVIcuukYQ // kind: 'test' name: 'RCPTT-478_HTML report looks different if it is copied as only html-file' path: 'platform_tests/selfAUTTests/RCPTT-478_HTML report looks different if it is copied as only html-file.test'
-_pLS-0CBTEeOjX5Yww5t2_A // kind: 'test' name: 'Set Breakpoint In Proc_Step Into_Step Return' path: 'ECL_IDE_module/selfAUTTests/debugging/Set Breakpoint In Proc_Step Into_Step Return.test'
-_wFfUMDwFEeGWcueqnS9xrA // kind: 'test' name: 'SetBreakpointInTestWithRestarting' path: 'ECL_IDE_module/selfAUTTests/debugging/SetBreakpointInTestWithRestarting.test'
-_K14SUHPREeGn3IInLDRicw // kind: 'test' name: 'SetBreakpointOnPartOfLine' path: 'ECL_IDE_module/selfAUTTests/debugging/SetBreakpointOnPartOfLine.test'
-_u_S3IHM6EeGsLtfm1BUmHg // kind: 'test' name: 'SetBreakpointToCommentLine' path: 'ECL_IDE_module/selfAUTTests/debugging/SetBreakpointToCommentLine.test'
-_EgTa4e_8EeCXWfaP50PILw // kind: 'test' name: 'SwitchToAssertionMode' path: 'platform_tests/ControlPanel/SwitchToAssertionMode.test'
-_Jr67MPMdEeCE19s6EOk3LA // kind: 'test' name: 'TestNumsAreDisplayedInExecutionView' path: 'ECL_IDE_module/selfAUTTests/executionView/TestNumsAreDisplayedInExecutionView.test'
-_6UOKUILYEeGVWel_bIqsJQ // kind: 'test' name: 'UndoRedoDeleteProjectWithoutDeleteFromDiskByHotKey' path: 'platform_tests/Editing/ProjectAndFolder/UndoRedo/UndoDeleteProjectWithoutDeleteFromDiskByHotKey.test'
-_ok65YPMBEeCE19s6EOk3LA // kind: 'test' name: 'Undo/Redo in Control Panel' path: 'ECL_IDE_module/ControlPanel/Undo_Redo in Control Panel.test'
-_BKzUsBZtEeWfXuiNKOMhqw // kind: 'test' name: 'Verify/Not Verify Icons' path: 'ECL_IDE_module/selfAUTTests/verifications/TableTree/Verify_Not Verify Icons.test'
-_GVh0cM79EeCw4ppgsBRMGg // kind: 'test' name: 'EnableClearWorkspaceInContext' path: 'platform_tests/Editing/Context/Workspace Context/Create/EnableClearWorkspaceInContext.test'
-_KE5VEWswEeGhKJWOtX9noQ // kind: 'test' name: 'AddTaskToEclContext' path: 'ECL_IDE_module/editors/ECLContext/AddTaskToEclContext.test'
-_MOxZYM71EeCw4ppgsBRMGg // kind: 'test' name: 'CreateNewObjectFromToolbar' path: 'platform_tests/toolbar/CreateNewObjectFromToolbar.test'
-_RtglkCbJEeS6GLpDYENyEA // kind: 'test' name: 'Autocomplete' path: 'ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Autocomplete.test'
-_EdBBULVEEeGHo51xlkPHGw // kind: 'test' name: 'ContextMenuActionsRecordingForBrowser' path: 'platform_tests/Recording/ContextMenuActionsRecordingForBrowser.test'
-_GODpIF0IEeGDGrudSYLu8w // kind: 'test' name: 'AddTaskToScriptEditor' path: 'ECL_IDE_module/editors/ScenarioEditor/TasksInScriptEditor/AddTaskToScriptEditor.test'
-_EdCW8CYfEeGbAuIIX5cVWQ // kind: 'test' name: 'Ignore Some Files At Clearing Workspace' path: 'platform_tests/Editing/Context/Workspace Context/Create/Ignore Some Files At Clearing Workspace.test'
-_KiWwwBOIEeOQfY3M4mNcSA // kind: 'test' name: 'AddVerificationIntoTestCase' path: 'ECL_IDE_module/selfAUTTests/verifications/Time/AddVerificationIntoTestCase.test'
-_rjE6IBZzEeWfXuiNKOMhqw // kind: 'test' name: 'Allow/Not Alow Uncaptured Children' path: 'ECL_IDE_module/selfAUTTests/verifications/TableTree/Allow_Not Alow Uncaptured Children.test'
-_BRzvUauEEeCWRZbw2IzBOQ // kind: 'test' name: 'CheckResourceModifications' path: 'platform_tests/q7Explorer/CheckResourceModifications.test'
-_NuUnkD2QEeSxD9UFwnFS6w // kind: 'test' name: 'Encrypt passwords during test recording' path: 'platform_tests/selfAUTTests/Encrypt passwords during test recording.test'
-_KSuaANiJEeSXouPau0KnWQ // kind: 'test' name: 'FormToolkitRecording' path: 'platform_tests/Recording/EclipseForms/FormToolkitRecording.test'
-
-------=_testcase-items-62c497da-4241-31f4-811a-6b453a3ecff8--
diff --git a/rcpttTests/ECL_IDE_module/selfAUTTests/SuperContext/LaunchCheck_Group_SuperConext.test b/rcpttTests/ECL_IDE_module/selfAUTTests/SuperContext/LaunchCheck_Group_SuperConext.test
index 8cfd87f..5fc1128 100644
--- a/rcpttTests/ECL_IDE_module/selfAUTTests/SuperContext/LaunchCheck_Group_SuperConext.test
+++ b/rcpttTests/ECL_IDE_module/selfAUTTests/SuperContext/LaunchCheck_Group_SuperConext.test
@@ -1,14 +1,13 @@
--- RCPTT testcase ---
Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
Contexts: _9lhUYRkNEeOwAuU1H7YyVQ,_4zI9AWpgEeCzId1Gnkds9A,_ZQYygK2sEeCqBbDEJWufvQ
Element-Name: LaunchCheck_Group_SuperConext
Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _ERrwwBkWEeOt9MVDSr4v5A
-Q7-Runtime-Version: 1.5.0.201406131029
-Save-Time: 6/13/14 7:10 PM
+Runtime-Version: 2.4.3.201905141211
+Save-Time: 5/15/19 1:30 PM
Tags: selfAUT
Testcase-Type: ecl
@@ -34,7 +33,9 @@
get-editor "Test_SuperFolder_SuperGroup" | get-button Replay | click
wait 11000
with [get-view "Execution View"] {
- get-label "2/2" | get-property caption | equals "2/2" | verify-true
+ try -command {
+ get-label "2/2" | get-property caption | equals "2/2" | verify-true
+ } -times 60 -delay 1000
get-label 0 | get-property caption | equals 0 | verify-true
}
with [get-view "Execution View" | get-tree] {
diff --git a/rcpttTests/ECL_IDE_module/selfAUTTests/SuperContext/LaunchCheck_Launch_SuperContext.test b/rcpttTests/ECL_IDE_module/selfAUTTests/SuperContext/LaunchCheck_Launch_SuperContext.test
index 153a574..4342c37 100644
--- a/rcpttTests/ECL_IDE_module/selfAUTTests/SuperContext/LaunchCheck_Launch_SuperContext.test
+++ b/rcpttTests/ECL_IDE_module/selfAUTTests/SuperContext/LaunchCheck_Launch_SuperContext.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _cJ8b0BkVEeOt9MVDSr4v5A
-Runtime-Version: 1.5.4.201410231434
-Save-Time: 10/31/14 3:46 PM
+Runtime-Version: 2.4.3.201905141211
+Save-Time: 5/15/19 1:30 PM
Tags: selfAUT
Testcase-Type: ecl
@@ -32,7 +32,7 @@
get-view "Test Explorer" | get-tree | select "MyProject/Test_SuperLaunch" | double-click
get-editor "Test_SuperLaunch" | get-button Replay | click
with [get-view "Execution View"] {
- try -times 12 -delay 1000 -command {
+ try -times 60 -delay 1000 -command {
get-label "2/2"
}
get-label 0 | get-property caption | equals 0 | verify-true
diff --git a/rcpttTests/ECL_IDE_module/selfAUTTests/SuperContext/LaunchCheck_Ws_Pref_SuperContext.test b/rcpttTests/ECL_IDE_module/selfAUTTests/SuperContext/LaunchCheck_Ws_Pref_SuperContext.test
index 7b61a2b..2a333ce 100644
--- a/rcpttTests/ECL_IDE_module/selfAUTTests/SuperContext/LaunchCheck_Ws_Pref_SuperContext.test
+++ b/rcpttTests/ECL_IDE_module/selfAUTTests/SuperContext/LaunchCheck_Ws_Pref_SuperContext.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _xjq2oBkOEeOwAuU1H7YyVQ
-Runtime-Version: 1.5.0.qualifier
-Save-Time: 8/11/14 2:29 PM
+Runtime-Version: 2.4.3.201905141211
+Save-Time: 5/15/19 1:31 PM
Tags: selfAUT
Testcase-Type: ecl
@@ -35,8 +35,10 @@
set-q7-option jobTreatAsSleepingTimeout 30000
with [get-view "Execution View"] {
+ try -command {
+ get-label "4/4" | get-property caption | equals "4/4" | verify-true
+ } -times 60 -delay 1000
get-label 0 | get-property caption | equals 0 | verify-true
- get-label "4/4" | get-property caption | equals "4/4" | verify-true
get-tree | get-property itemCount | equals 4 | verify-true
}
with [get-view "Execution View" | get-tree] {
diff --git a/rcpttTests/ECL_IDE_module/selfAUTTests/executionView/Execute1Tests.test b/rcpttTests/ECL_IDE_module/selfAUTTests/executionView/Execute1Tests.test
index 5773d8e..b1dfe40 100644
--- a/rcpttTests/ECL_IDE_module/selfAUTTests/executionView/Execute1Tests.test
+++ b/rcpttTests/ECL_IDE_module/selfAUTTests/executionView/Execute1Tests.test
@@ -1,14 +1,13 @@
--- RCPTT testcase ---
Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
Contexts: _4zI9AWpgEeCzId1Gnkds9A,_bbpo0a2vEeCqpoE1MJ1fFQ,_18rr8K25EeCZfrGRg7GXDg
Element-Name: Execute1Test
Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _DIqLwK2_EeCZfrGRg7GXDg
-Q7-Runtime-Version: 1.5.0.201406131029
-Save-Time: 6/13/14 7:10 PM
+Runtime-Version: 2.4.3.201905141211
+Save-Time: 5/15/19 1:27 PM
Tags: ECL_IDE_module, selfAUT, Runtime, ExecutionView
Testcase-Type: ecl
@@ -38,7 +37,9 @@
get-editor simpleTest1 | get-button Replay | click
with [get-view "Execution View"] {
with [get-button "Run Selected"] {
- get-property enablement | equals true | verify-true
+ try -command {
+ get-property enablement | equals true | verify-true
+ } -times 60 -delay 1000
get-property tooltip | equals "Run Selected" | verify-true
}
with [get-button "Stop Execution"] {
diff --git a/rcpttTests/ECL_IDE_module/selfAUTTests/executionView/Execute3Tests.test b/rcpttTests/ECL_IDE_module/selfAUTTests/executionView/Execute3Tests.test
index 955f9e6..a74d08b 100644
--- a/rcpttTests/ECL_IDE_module/selfAUTTests/executionView/Execute3Tests.test
+++ b/rcpttTests/ECL_IDE_module/selfAUTTests/executionView/Execute3Tests.test
@@ -1,14 +1,13 @@
--- RCPTT testcase ---
Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
Contexts: _4zI9AWpgEeCzId1Gnkds9A,_bbpo0a2vEeCqpoE1MJ1fFQ,_18rr8K25EeCZfrGRg7GXDg
Element-Name: Execute3Tests
Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _olNUgK25EeCZfrGRg7GXDg
-Q7-Runtime-Version: 1.5.0.201406131029
-Save-Time: 6/13/14 7:04 PM
+Runtime-Version: 2.4.3.201905141211
+Save-Time: 5/15/19 1:29 PM
Tags: ECL_IDE_module, selfAUT, Runtime, ExecutionView
Testcase-Type: ecl
@@ -43,8 +42,10 @@
select "q7project/simpleTest1" "q7project/simpleTest2" "q7project/simpleTest3"
get-menu "Run As/1 Test Cases" | click
}
-wait 10000
-get-view "Execution View" | get-label -after [get-label "Runs:"]
- | get-property caption | equals "3/3" | verify-true
+
+try -command {
+ get-view "Execution View" | get-label -after [get-label "Runs:"]
+ | get-property caption | equals "3/3" | verify-true
+} -delay 1000 -times 60
get-view "Execution View" | get-label -after [get-label "Failures:"] | get-property caption | equals 1 | verify-true
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/rcpttTests/platform_tests/ControlPanel/EnterTestDescriptionInControlPanel.test b/rcpttTests/platform_tests/ControlPanel/EnterTestDescriptionInControlPanel.test
index 9fdf8c7..8f82d1d 100644
--- a/rcpttTests/platform_tests/ControlPanel/EnterTestDescriptionInControlPanel.test
+++ b/rcpttTests/platform_tests/ControlPanel/EnterTestDescriptionInControlPanel.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _F8k5sO_-EeCXWfaP50PILw
-Runtime-Version: 2.0.0.201505131625
-Save-Time: 5/14/15 3:29 PM
+Runtime-Version: 2.4.3.201905141211
+Save-Time: 5/15/19 1:28 PM
Tags: selfAUT, ControlPanel
Testcase-Type: ecl
@@ -38,11 +38,14 @@
get-view "Test Explorer" | get-tree | select "TestQ7Prj/Test scenario" | double-click
get-editor "Test scenario" | get-button Record | click
-with [get-window "Control Panel - Test scenario (TestQ7Prj) - selfQ7 [Recording]"] {
- get-tab-folder | get-tab-item Description | click
- get-text-viewer | set-text "test description"
- get-button Stop | click
-}
+try -command {
+ take-screenshot
+ with [get-window "Control Panel - Test scenario (TestQ7Prj) - selfQ7 [Recording]"] {
+ get-tab-folder | get-tab-item Description | click
+ get-text-viewer | set-text "test description"
+ get-button Stop | click
+ }
+} -times 60 -delay 1000
with [get-window "Control Panel - Test scenario (TestQ7Prj) - selfQ7"] {
get-button Save | click
get-button "Return to RCPTT" | click
