Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarvin Mueller2022-01-21 10:48:35 +0000
committerMarvin Mueller2022-01-21 10:48:35 +0000
commitaafbcd0ebc5a34a7395b0bb197fca3f9edd79b8d (patch)
tree8505d34e29aa90232df475e4be374411037e5e95
parent71c719f6f7ad6d29af015fee675ded9ccd5c7905 (diff)
downloadorg.eclipse.jubula.core-aafbcd0ebc5a34a7395b0bb197fca3f9edd79b8d.tar.gz
org.eclipse.jubula.core-aafbcd0ebc5a34a7395b0bb197fca3f9edd79b8d.tar.xz
org.eclipse.jubula.core-aafbcd0ebc5a34a7395b0bb197fca3f9edd79b8d.zip
Fixes Problem with Importing projectsHEADmaster
Test jobs could be created before the test suites did Change-Id: I04a1698ef4593f4b70c1fc82d6fb95d9e9f155f7
-rw-r--r--org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/JsonImporter.java11
1 files changed, 11 insertions, 0 deletions
diff --git a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/JsonImporter.java b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/JsonImporter.java
index 3f83bf1b6..469989ecc 100644
--- a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/JsonImporter.java
+++ b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/JsonImporter.java
@@ -1397,12 +1397,23 @@ public class JsonImporter {
ProjectDTO dto, boolean assignNewGuid) throws InterruptedException,
InvalidDataException {
+ List<TestJobDTO> testjobs = new ArrayList<>();
for (NodeDTO node : dto.getExecCategories()) {
ImportExportUtil.checkCancel(m_monitor);
+ if (node instanceof TestJobDTO) {
+ testjobs.add((TestJobDTO) node);
+ continue;
+ }
proj.getExecObjCont().addNode(
createTestSuitesOrTestJobsOrCategories(proj, node,
assignNewGuid));
}
+ for (TestJobDTO testJobDTO : testjobs) {
+ ImportExportUtil.checkCancel(m_monitor);
+ proj.getExecObjCont().addNode(
+ createTestSuitesOrTestJobsOrCategories(proj, testJobDTO,
+ assignNewGuid));
+ }
}
/**

Back to the top