From 728ca4857a549457745b549533e59d8103c0b015 Mon Sep 17 00:00:00 2001 From: Alliu Qemal Date: Mon, 21 Oct 2024 15:27:38 +0200 Subject: [PATCH 1/6] added pom.xml on org.eclipse.fordiac.ide.test.ui --- tests/org.eclipse.fordiac.ide.test.ui/pom.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 tests/org.eclipse.fordiac.ide.test.ui/pom.xml diff --git a/tests/org.eclipse.fordiac.ide.test.ui/pom.xml b/tests/org.eclipse.fordiac.ide.test.ui/pom.xml new file mode 100644 index 0000000000..bb12b7fdd3 --- /dev/null +++ b/tests/org.eclipse.fordiac.ide.test.ui/pom.xml @@ -0,0 +1,15 @@ + + + 4.0.0 + + + ../../pom.xml + org.eclipse.fordiac + parent + 3.0.0-SNAPSHOT + + + org.eclipse.fordiac.ide.test.ui + eclipse-test-plugin + + \ No newline at end of file From e79b72cce510a101ff884d4f4397bbc38861f471 Mon Sep 17 00:00:00 2001 From: Alliu Qemal Date: Tue, 22 Oct 2024 16:19:43 +0200 Subject: [PATCH 2/6] test --- tests/org.eclipse.fordiac.ide.test.ui/pom.xml | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/tests/org.eclipse.fordiac.ide.test.ui/pom.xml b/tests/org.eclipse.fordiac.ide.test.ui/pom.xml index bb12b7fdd3..467873b0de 100644 --- a/tests/org.eclipse.fordiac.ide.test.ui/pom.xml +++ b/tests/org.eclipse.fordiac.ide.test.ui/pom.xml @@ -11,5 +11,28 @@ org.eclipse.fordiac.ide.test.ui eclipse-test-plugin + 4diac SWTBot UI Tests + + + + tycho-latest + ${tycho-repo.url} + p2 + + + + + + + org.eclipse.tycho + tycho-surefire-plugin + ${tycho.version} + + true + org.eclipse.platform.ide + + + + \ No newline at end of file From 575c2bb162cd9f604e0fec9d830c729d746b660f Mon Sep 17 00:00:00 2001 From: Alliu Qemal Date: Wed, 23 Oct 2024 14:55:58 +0200 Subject: [PATCH 3/6] changed product from eclipse ide to 4diac ide --- tests/org.eclipse.fordiac.ide.test.ui/pom.xml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/tests/org.eclipse.fordiac.ide.test.ui/pom.xml b/tests/org.eclipse.fordiac.ide.test.ui/pom.xml index 467873b0de..ed46e2193d 100644 --- a/tests/org.eclipse.fordiac.ide.test.ui/pom.xml +++ b/tests/org.eclipse.fordiac.ide.test.ui/pom.xml @@ -12,15 +12,7 @@ org.eclipse.fordiac.ide.test.ui eclipse-test-plugin 4diac SWTBot UI Tests - - - - tycho-latest - ${tycho-repo.url} - p2 - - - + @@ -29,7 +21,12 @@ ${tycho.version} true - org.eclipse.platform.ide + + + product + org.eclipse.fordiac.ide.product + + From 94d8aec1293db5c418456d20be63f18b12021f3a Mon Sep 17 00:00:00 2001 From: Alliu Qemal Date: Wed, 23 Oct 2024 15:19:45 +0200 Subject: [PATCH 4/6] test --- tests/org.eclipse.fordiac.ide.test.ui/pom.xml | 48 +++++++++++++------ 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/tests/org.eclipse.fordiac.ide.test.ui/pom.xml b/tests/org.eclipse.fordiac.ide.test.ui/pom.xml index ed46e2193d..4f44282df8 100644 --- a/tests/org.eclipse.fordiac.ide.test.ui/pom.xml +++ b/tests/org.eclipse.fordiac.ide.test.ui/pom.xml @@ -15,20 +15,40 @@ - - org.eclipse.tycho - tycho-surefire-plugin - ${tycho.version} - - true - - - product - org.eclipse.fordiac.ide.product - - - - + + org.eclipse.tycho + target-platform-configuration + ${tycho.version} + + + + org.eclipse.fordiac + org.eclipse.fordiac.ide.product + 3.0.0-SNAPSHOT + + + + false + + + + + eclipse-feature + org.eclipse.equinox.executable + ${equinox.executable.version} + + + eclipse-feature + org.eclipse.platform + ${eclipse.platform.version} + + + + true + + + + From 6b64315c403d0be777441a6432a1e4648d644d94 Mon Sep 17 00:00:00 2001 From: Alliu Qemal Date: Thu, 24 Oct 2024 13:16:15 +0200 Subject: [PATCH 5/6] change --- tests/org.eclipse.fordiac.ide.test.ui/pom.xml | 67 +++++++++---------- 1 file changed, 31 insertions(+), 36 deletions(-) diff --git a/tests/org.eclipse.fordiac.ide.test.ui/pom.xml b/tests/org.eclipse.fordiac.ide.test.ui/pom.xml index 4f44282df8..eb19ad63ff 100644 --- a/tests/org.eclipse.fordiac.ide.test.ui/pom.xml +++ b/tests/org.eclipse.fordiac.ide.test.ui/pom.xml @@ -14,42 +14,37 @@ 4diac SWTBot UI Tests - - - org.eclipse.tycho - target-platform-configuration - ${tycho.version} - - - - org.eclipse.fordiac - org.eclipse.fordiac.ide.product - 3.0.0-SNAPSHOT - - - - false - - - - - eclipse-feature - org.eclipse.equinox.executable - ${equinox.executable.version} - - - eclipse-feature - org.eclipse.platform - ${eclipse.platform.version} - - - - true - - - - - + + + + org.eclipse.tycho + tycho-versions-plugin + 4.0.8 + + + org.eclipse.tycho + tycho-surefire-plugin + 4.0.8 + + + default-test + integration-test + + test + + + true + org.eclipse.fordiac.ide.product + + + + + true + org.eclipse.fordiac.ide.product + + + + \ No newline at end of file From c6d079da52d7caebec184ceae0fd738d967df6ed Mon Sep 17 00:00:00 2001 From: Alliu Qemal Date: Fri, 25 Oct 2024 13:41:14 +0200 Subject: [PATCH 6/6] changes --- pom.xml | 10 +++- tests/org.eclipse.fordiac.ide.test.ui/pom.xml | 47 +++++++------------ tests/pom.tycho | 12 +++++ 3 files changed, 36 insertions(+), 33 deletions(-) create mode 100644 tests/pom.tycho diff --git a/pom.xml b/pom.xml index f31c12c79e..1b1ed4a431 100644 --- a/pom.xml +++ b/pom.xml @@ -179,7 +179,7 @@ ${tycho.version} true - org.eclipse.platform.ide + org.eclipse.fordiac.ide.product @@ -193,7 +193,7 @@ **\/* - + @@ -282,6 +282,12 @@ nightly + + testing + + testing + + milestone diff --git a/tests/org.eclipse.fordiac.ide.test.ui/pom.xml b/tests/org.eclipse.fordiac.ide.test.ui/pom.xml index eb19ad63ff..ed46e2193d 100644 --- a/tests/org.eclipse.fordiac.ide.test.ui/pom.xml +++ b/tests/org.eclipse.fordiac.ide.test.ui/pom.xml @@ -14,37 +14,22 @@ 4diac SWTBot UI Tests - - - - org.eclipse.tycho - tycho-versions-plugin - 4.0.8 - - - org.eclipse.tycho - tycho-surefire-plugin - 4.0.8 - - - default-test - integration-test - - test - - - true - org.eclipse.fordiac.ide.product - - - - - true - org.eclipse.fordiac.ide.product - - - - + + + org.eclipse.tycho + tycho-surefire-plugin + ${tycho.version} + + true + + + product + org.eclipse.fordiac.ide.product + + + + + \ No newline at end of file diff --git a/tests/pom.tycho b/tests/pom.tycho new file mode 100644 index 0000000000..519932691c --- /dev/null +++ b/tests/pom.tycho @@ -0,0 +1,12 @@ +## tycho automatic module detection d2a61315-c8ef-48cf-ad3f-1670da1c24b1 +org.eclipse.fordiac.ide.test.contracts +org.eclipse.fordiac.ide.test.deployment +org.eclipse.fordiac.ide.test.export +org.eclipse.fordiac.ide.test.fb.interpreter +org.eclipse.fordiac.ide.test.library +org.eclipse.fordiac.ide.test.model +org.eclipse.fordiac.ide.test.model.commands +org.eclipse.fordiac.ide.test.model.eval +org.eclipse.fordiac.ide.test.model.search +org.eclipse.fordiac.ide.test.ui +org.eclipse.fordiac.ide.test.util