added wizard integration test for Java 21

eclipse · May 16, 2024 · bcad9a9 · bcad9a9
1 parent ba104e8
commit bcad9a9
Show file tree

Hide file tree

Showing 29 changed files with 1,079 additions and 0 deletions.
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/cli/CliWizardIntegrationTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/cli/CliWizardIntegrationTest.java
@@ -201,6 +201,18 @@ public static void main(String[] args) {
 				project.getIdeProject().setEnabled(true);
 				project.getWebProject().setEnabled(true);
 				project.getP2Project().setEnabled(true);
+			}), CliWizardIntegrationTest.newProjectConfig(project -> {
+				project.setBaseName("mavenTychoP2J21");
+				project.setJavaVersion(JavaVersion.JAVA21);
+				project.setPreferredBuildSystem(BuildSystem.MAVEN);
+				project.setSourceLayout(SourceLayout.PLAIN);
+				project.setProjectLayout(ProjectLayout.HIERARCHICAL);
+				project.getRuntimeProject().getTestProject().setEnabled(true);
+				project.getUiProject().setEnabled(true);
+				project.getUiProject().getTestProject().setEnabled(true);
+				project.getIdeProject().setEnabled(true);
+				project.getWebProject().setEnabled(true);
+				project.getP2Project().setEnabled(true);
 			}), CliWizardIntegrationTest.newProjectConfig(project -> {
 				project.setBaseName("full");
 				project.setPreferredBuildSystem(BuildSystem.GRADLE);

diff --git a/...ectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.feature/build.properties b/...ectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/...d-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.feature/feature.xml b/...d-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.feature/feature.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature id="mavenTychoP2J21.feature"
+	label="MyDsl Feature "
+	version="1.0.0.qualifier">
+	<plugin
+			id="mavenTychoP2J21"
+			download-size="0"
+			install-size="0"
+			version="0.0.0"
+			unpack="false"/>
+	<plugin
+			id="mavenTychoP2J21.ide"
+			download-size="0"
+			install-size="0"
+			version="0.0.0"
+			unpack="false"/>
+	<plugin
+			id="mavenTychoP2J21.ui"
+			download-size="0"
+			install-size="0"
+			version="0.0.0"
+			unpack="false"/>
+</feature>
diff --git a/...izard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.feature/pom.xml b/...izard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.feature/pom.xml
@@ -0,0 +1,15 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>mavenTychoP2J21</groupId>
+		<artifactId>mavenTychoP2J21.parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>mavenTychoP2J21.feature</artifactId>
+	<packaging>eclipse-feature</packaging>
+
+
+	<dependencies>
+	</dependencies>
+</project>
diff --git a/...ectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.ide/META-INF/MANIFEST.MF b/...ectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.ide/META-INF/MANIFEST.MF
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: mavenTychoP2J21.ide
+Bundle-Vendor: My Company
+Bundle-Version: 1.0.0.qualifier
+Bundle-SymbolicName: mavenTychoP2J21.ide; singleton:=true
+Bundle-ActivationPolicy: lazy
+Require-Bundle: mavenTychoP2J21,
+ org.eclipse.xtext.ide,
+ org.eclipse.xtext.xbase.ide
+Bundle-RequiredExecutionEnvironment: JavaSE-21
+Automatic-Module-Name: mavenTychoP2J21.ide
diff --git a/...-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.ide/build.properties b/...-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.ide/build.properties
@@ -0,0 +1,6 @@
+source.. = src/,\
+           src-gen/,\
+           xtend-gen/
+bin.includes = .,\
+               META-INF/
+bin.excludes = **/*.xtend
diff --git a/...ta/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.ide/pom.xml b/...ta/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.ide/pom.xml
@@ -0,0 +1,21 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>mavenTychoP2J21</groupId>
+		<artifactId>mavenTychoP2J21.parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>mavenTychoP2J21.ide</artifactId>
+	<packaging>eclipse-plugin</packaging>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.xtend</groupId>
+				<artifactId>xtend-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/...pectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.repository/category.xml b/...pectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.repository/category.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+	<feature id="mavenTychoP2J21.feature" version="0.0.0">
+		<category name="main"/>
+	</feature>
+	<feature id="mavenTychoP2J21.feature.source" version="0.0.0">
+		<category name="main.source"/>
+	</feature>
+	<category-def name="main" label="MyDsl"/>
+	<category-def name="main.source" label="MyDsl (Sources)"/>
+</site>
diff --git a/...rd-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.repository/pom.xml b/...rd-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.repository/pom.xml
@@ -0,0 +1,51 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>mavenTychoP2J21</groupId>
+		<artifactId>mavenTychoP2J21.parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>mavenTychoP2J21.repository</artifactId>
+	<packaging>eclipse-repository</packaging>
+
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.apache.maven.plugins
+										</groupId>
+										<artifactId>
+											maven-clean-plugin
+										</artifactId>
+										<versionRange>
+											[2.5,)
+										</versionRange>
+										<goals>
+											<goal>clean</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
+
+	<dependencies>
+	</dependencies>
+</project>
diff --git a/...venTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.target/mavenTychoP2J21.target.target b/...venTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.target/mavenTychoP2J21.target.target
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="mavenTychoP2J21.target" sequenceNumber="1">
+	<locations>
+		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+			<repository location="https://download.eclipse.org/releases/2024-06"/>
+		</location>
+		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
+			<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202404050451/"/>
+		</location>
+		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
+			<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/"/>
+		</location>
+		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<unit id="com.google.gson" version="2.10.1"/>
+			<unit id="com.google.inject" version="7.0.0"/>
+			<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
+			<unit id="org.antlr.runtime" version="3.2.0.v20230929-1400"/>
+			<unit id="org.junit" version="4.13.2.v20230809-1000"/>
+			<unit id="org.hamcrest" version="2.2.0"/>
+			<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
+			<unit id="org.apache.commons.logging" version="1.2.0"/>
+			<unit id="org.objectweb.asm" version="9.7.0"/>
+			<unit id="io.github.classgraph.classgraph" version="4.8.168"/>
+			<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06"/>
+		</location>
+	</locations>
+</target>
diff --git a/...wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.target/pom.xml b/...wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.target/pom.xml
@@ -0,0 +1,15 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>mavenTychoP2J21</groupId>
+		<artifactId>mavenTychoP2J21.parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>mavenTychoP2J21.target</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+
+
+	<dependencies>
+	</dependencies>
+</project>
diff --git a/...tations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.tests/META-INF/MANIFEST.MF b/...tations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: mavenTychoP2J21.tests
+Bundle-Vendor: My Company
+Bundle-Version: 1.0.0.qualifier
+Bundle-SymbolicName: mavenTychoP2J21.tests; singleton:=true
+Bundle-ActivationPolicy: lazy
+Require-Bundle: mavenTychoP2J21,
+ org.junit;bundle-version="4.13.2",
+ org.eclipse.xtext.testing,
+ org.eclipse.xtext.xbase.testing
+Bundle-RequiredExecutionEnvironment: JavaSE-21
+Automatic-Module-Name: mavenTychoP2J21.tests
diff --git a/...xpectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.tests/build.properties b/...xpectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.tests/build.properties
@@ -0,0 +1,6 @@
+source.. = src/,\
+           src-gen/,\
+           xtend-gen/
+bin.includes = .,\
+               META-INF/
+bin.excludes = **/*.xtend
diff --git a/.../wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.tests/pom.xml b/.../wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.tests/pom.xml
@@ -0,0 +1,21 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>mavenTychoP2J21</groupId>
+		<artifactId>mavenTychoP2J21.parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>mavenTychoP2J21.tests</artifactId>
+	<packaging>eclipse-test-plugin</packaging>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.xtend</groupId>
+				<artifactId>xtend-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/...ions/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.ui.tests/META-INF/MANIFEST.MF b/...ions/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.ui.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,15 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: mavenTychoP2J21.ui.tests
+Bundle-Vendor: My Company
+Bundle-Version: 1.0.0.qualifier
+Bundle-SymbolicName: mavenTychoP2J21.ui.tests; singleton:=true
+Bundle-ActivationPolicy: lazy
+Require-Bundle: mavenTychoP2J21.ui,
+ org.junit;bundle-version="4.13.2",
+ org.eclipse.xtext.testing,
+ org.eclipse.xtext.ui.testing,
+ org.eclipse.xtext.xbase.testing,
+ org.eclipse.xtext.xbase.ui.testing
+Bundle-RequiredExecutionEnvironment: JavaSE-21
+Automatic-Module-Name: mavenTychoP2J21.ui.tests
diff --git a/...ctations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.ui.tests/build.properties b/...ctations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.ui.tests/build.properties
@@ -0,0 +1,6 @@
+source.. = src/,\
+           src-gen/,\
+           xtend-gen/
+bin.includes = .,\
+               META-INF/
+bin.excludes = **/*.xtend
diff --git a/...zard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.ui.tests/pom.xml b/...zard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.ui.tests/pom.xml
@@ -0,0 +1,28 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>mavenTychoP2J21</groupId>
+		<artifactId>mavenTychoP2J21.parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>mavenTychoP2J21.ui.tests</artifactId>
+	<packaging>eclipse-test-plugin</packaging>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.xtend</groupId>
+				<artifactId>xtend-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
+				<configuration>
+					<useUIHarness>true</useUIHarness>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/...pectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.ui/META-INF/MANIFEST.MF b/...pectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: mavenTychoP2J21.ui
+Bundle-Vendor: My Company
+Bundle-Version: 1.0.0.qualifier
+Bundle-SymbolicName: mavenTychoP2J21.ui; singleton:=true
+Bundle-ActivationPolicy: lazy
+Require-Bundle: mavenTychoP2J21,
+ mavenTychoP2J21.ide,
+ org.eclipse.xtext.ui,
+ org.eclipse.xtext.ui.shared,
+ org.eclipse.xtext.ui.codetemplates.ui,
+ org.eclipse.ui.editors;bundle-version="3.14.300",
+ org.eclipse.ui.ide;bundle-version="3.18.500"
+Import-Package: org.apache.log4j
+Bundle-RequiredExecutionEnvironment: JavaSE-21
+Automatic-Module-Name: mavenTychoP2J21.ui
diff --git a/...d-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.ui/build.properties b/...d-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.ui/build.properties
@@ -0,0 +1,7 @@
+source.. = src/,\
+           src-gen/,\
+           xtend-gen/
+bin.includes = .,\
+               META-INF/,\
+               plugin.xml
+bin.excludes = **/*.xtend
diff --git a/...ata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.ui/pom.xml b/...ata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.ui/pom.xml
@@ -0,0 +1,21 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>mavenTychoP2J21</groupId>
+		<artifactId>mavenTychoP2J21.parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>mavenTychoP2J21.ui</artifactId>
+	<packaging>eclipse-plugin</packaging>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.xtend</groupId>
+				<artifactId>xtend-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>