Skip to content

Commit

Permalink
updated project wizard tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@LorenzoBettini
LorenzoBettini committed Oct 30, 2024
1 parent d1c68c1 commit 5fdf15d
Show file tree
Hide file tree
Showing 52 changed files with 67 additions and 1,041 deletions.
15 changes: 1 addition & 14 deletions org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/cli/CliWizardIntegrationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public static void main(String[] args) {
project.getIdeProject().setEnabled(true);
project.getWebProject().setEnabled(true);
}), CliWizardIntegrationTest.newProjectConfig(project -> {
project.setBaseName("mavenTychoJ17");
project.setBaseName("mavenTychoJUnit5");
project.setPreferredBuildSystem(BuildSystem.MAVEN);
project.setSourceLayout(SourceLayout.PLAIN);
project.setProjectLayout(ProjectLayout.HIERARCHICAL);
Expand All @@ -148,7 +148,6 @@ public static void main(String[] args) {
project.getUiProject().getTestProject().setEnabled(true);
project.getIdeProject().setEnabled(true);
project.getWebProject().setEnabled(true);
project.setJavaVersion(JavaVersion.JAVA17);
project.setJunitVersion(JUnitVersion.JUNIT_5);
}), CliWizardIntegrationTest.newProjectConfig(project -> {
project.setBaseName("gradle");
Expand Down Expand Up @@ -189,18 +188,6 @@ public static void main(String[] args) {
project.getIdeProject().setEnabled(true);
project.getWebProject().setEnabled(true);
project.getP2Project().setEnabled(true);
}), CliWizardIntegrationTest.newProjectConfig(project -> {
project.setBaseName("mavenTychoP2J17");
project.setJavaVersion(JavaVersion.JAVA17);
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("mavenTychoP2J21");
project.setJavaVersion(JavaVersion.JAVA21);
Expand Down
15 changes: 0 additions & 15 deletions ...tdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/pom.xml
View file

This file was deleted.

17 changes: 0 additions & 17 deletions ...ard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui/META-INF/MANIFEST.MF
View file

This file was deleted.

21 changes: 0 additions & 21 deletions .../testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui/pom.xml
View file

This file was deleted.

34 changes: 0 additions & 34 deletions ...ns/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/.launch/Launch Runtime Eclipse.launch
View file

This file was deleted.

12 changes: 0 additions & 12 deletions ...wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/META-INF/MANIFEST.MF
View file

This file was deleted.

8 changes: 4 additions & 4 deletions ...nt/mavenTychoJ17.ide/META-INF/MANIFEST.MF → ...mavenTychoJUnit5.ide/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: mavenTychoJ17.ide
Bundle-Name: mavenTychoJUnit5.ide
Bundle-Vendor: My Company
Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: mavenTychoJ17.ide; singleton:=true
Bundle-SymbolicName: mavenTychoJUnit5.ide; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: mavenTychoJ17,
Require-Bundle: mavenTychoJUnit5,
org.eclipse.xtext.ide,
org.eclipse.xtext.xbase.ide
Bundle-RequiredExecutionEnvironment: JavaSE-17
Automatic-Module-Name: mavenTychoJ17.ide
Automatic-Module-Name: mavenTychoJUnit5.ide
0 ...parent/mavenTychoJ17.ide/build.properties → ...ent/mavenTychoJUnit5.ide/build.properties
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions ...TychoJ17.parent/mavenTychoJ17.ide/pom.xml → ...Unit5.parent/mavenTychoJUnit5.ide/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
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>mavenTychoJ17</groupId>
<artifactId>mavenTychoJ17.parent</artifactId>
<groupId>mavenTychoJUnit5</groupId>
<artifactId>mavenTychoJUnit5.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>mavenTychoJ17.ide</artifactId>
<artifactId>mavenTychoJUnit5.ide</artifactId>
<packaging>eclipse-plugin</packaging>

<build>
Expand Down
2 changes: 1 addition & 1 deletion ...choJ17.target/mavenTychoJ17.target.target → ...it5.target/mavenTychoJUnit5.target.target
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="mavenTychoJ17.target" sequenceNumber="1">
<target name="mavenTychoJUnit5.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"/>
Expand Down
6 changes: 3 additions & 3 deletions ...J17.parent/mavenTychoP2J17.target/pom.xml → ...t5.parent/mavenTychoJUnit5.target/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
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>mavenTychoP2J17</groupId>
<artifactId>mavenTychoP2J17.parent</artifactId>
<groupId>mavenTychoJUnit5</groupId>
<artifactId>mavenTychoJUnit5.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>mavenTychoP2J17.target</artifactId>
<artifactId>mavenTychoJUnit5.target</artifactId>
<packaging>eclipse-target-definition</packaging>


Expand Down
8 changes: 4 additions & 4 deletions .../mavenTychoJ17.tests/META-INF/MANIFEST.MF → ...venTychoJUnit5.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: mavenTychoJ17.tests
Bundle-Name: mavenTychoJUnit5.tests
Bundle-Vendor: My Company
Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: mavenTychoJ17.tests; singleton:=true
Bundle-SymbolicName: mavenTychoJUnit5.tests; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: mavenTychoJ17,
Require-Bundle: mavenTychoJUnit5,
org.eclipse.xtext.testing,
org.eclipse.xtext.xbase.testing
Import-Package: org.junit.jupiter.api;version="[5.1.0,6.0.0)",
org.junit.jupiter.api.extension;version="[5.1.0,6.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-17
Automatic-Module-Name: mavenTychoJ17.tests
Automatic-Module-Name: mavenTychoJUnit5.tests
0 ...rent/mavenTychoJ17.tests/build.properties → ...t/mavenTychoJUnit5.tests/build.properties
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions ...choJ17.parent/mavenTychoJ17.tests/pom.xml → ...it5.parent/mavenTychoJUnit5.tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
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>mavenTychoJ17</groupId>
<artifactId>mavenTychoJ17.parent</artifactId>
<groupId>mavenTychoJUnit5</groupId>
<artifactId>mavenTychoJUnit5.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>mavenTychoJ17.tests</artifactId>
<artifactId>mavenTychoJUnit5.tests</artifactId>
<packaging>eclipse-test-plugin</packaging>

<build>
Expand Down
8 changes: 4 additions & 4 deletions ...venTychoJ17.ui.tests/META-INF/MANIFEST.MF → ...TychoJUnit5.ui.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: mavenTychoJ17.ui.tests
Bundle-Name: mavenTychoJUnit5.ui.tests
Bundle-Vendor: My Company
Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: mavenTychoJ17.ui.tests; singleton:=true
Bundle-SymbolicName: mavenTychoJUnit5.ui.tests; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: mavenTychoJ17.ui,
Require-Bundle: mavenTychoJUnit5.ui,
org.eclipse.xtext.testing,
org.eclipse.xtext.ui.testing,
org.eclipse.xtext.xbase.testing,
org.eclipse.xtext.xbase.ui.testing
Import-Package: org.junit.jupiter.api;version="[5.1.0,6.0.0)",
org.junit.jupiter.api.extension;version="[5.1.0,6.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-17
Automatic-Module-Name: mavenTychoJ17.ui.tests
Automatic-Module-Name: mavenTychoJUnit5.ui.tests
0 ...t/mavenTychoJ17.ui.tests/build.properties → ...avenTychoJUnit5.ui.tests/build.properties
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions ...J17.parent/mavenTychoJ17.ui.tests/pom.xml → ....parent/mavenTychoJUnit5.ui.tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
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>mavenTychoJ17</groupId>
<artifactId>mavenTychoJ17.parent</artifactId>
<groupId>mavenTychoJUnit5</groupId>
<artifactId>mavenTychoJUnit5.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>mavenTychoJ17.ui.tests</artifactId>
<artifactId>mavenTychoJUnit5.ui.tests</artifactId>
<packaging>eclipse-test-plugin</packaging>

<build>
Expand Down
10 changes: 5 additions & 5 deletions ...t/mavenTychoP2J17.ui/META-INF/MANIFEST.MF → .../mavenTychoJUnit5.ui/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: mavenTychoP2J17.ui
Bundle-Name: mavenTychoJUnit5.ui
Bundle-Vendor: My Company
Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: mavenTychoP2J17.ui; singleton:=true
Bundle-SymbolicName: mavenTychoJUnit5.ui; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: mavenTychoP2J17,
mavenTychoP2J17.ide,
Require-Bundle: mavenTychoJUnit5,
mavenTychoJUnit5.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-17
Automatic-Module-Name: mavenTychoP2J17.ui
Automatic-Module-Name: mavenTychoJUnit5.ui
0 ....parent/mavenTychoJ17.ui/build.properties → ...rent/mavenTychoJUnit5.ui/build.properties
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions ...hoP2J17.parent/mavenTychoP2J17.ui/pom.xml → ...JUnit5.parent/mavenTychoJUnit5.ui/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
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>mavenTychoP2J17</groupId>
<artifactId>mavenTychoP2J17.parent</artifactId>
<groupId>mavenTychoJUnit5</groupId>
<artifactId>mavenTychoJUnit5.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>mavenTychoP2J17.ui</artifactId>
<artifactId>mavenTychoJUnit5.ui</artifactId>
<packaging>eclipse-plugin</packaging>

<build>
Expand Down
10 changes: 5 additions & 5 deletions ...TychoJ17.parent/mavenTychoJ17.web/pom.xml → ...Unit5.parent/mavenTychoJUnit5.web/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
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>mavenTychoJ17</groupId>
<artifactId>mavenTychoJ17.parent</artifactId>
<groupId>mavenTychoJUnit5</groupId>
<artifactId>mavenTychoJUnit5.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>mavenTychoJ17.web</artifactId>
<artifactId>mavenTychoJUnit5.web</artifactId>
<packaging>war</packaging>

<build>
Expand Down Expand Up @@ -76,12 +76,12 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mavenTychoJ17</artifactId>
<artifactId>mavenTychoJUnit5</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mavenTychoJ17.ide</artifactId>
<artifactId>mavenTychoJUnit5.ide</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ...sl (mydsl) Language Infrastructure.launch → ...sl (mydsl) Language Infrastructure.launch
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.emf.mwe2.launch.Mwe2LaunchConfigurationType">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/mavenTychoJ17"/>
<listEntry value="/mavenTychoJUnit5"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="4"/>
Expand All @@ -10,9 +10,9 @@
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/mavenTychoJ17.parent&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJ17&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJ17.ide&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJ17.ui&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJ17.web&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJ17.target&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJ17.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJ17.ui.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJ17.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJ17.ui.tests&quot; type=&quot;4&quot;/&gt;&#10;;&lt;/resources&gt;}"/>
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/mavenTychoJUnit5.parent&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJUnit5&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJUnit5.ide&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJUnit5.ui&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJUnit5.web&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJUnit5.target&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJUnit5.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJUnit5.ui.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJUnit5.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJUnit5.ui.tests&quot; type=&quot;4&quot;/&gt;&#10;;&lt;/resources&gt;}"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="mydsl.GenerateMyDsl"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="mavenTychoJ17"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="mavenTychoJUnit5"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m"/>
</launchConfiguration>
2 changes: 1 addition & 1 deletion ...J17/.launch/Launch Runtime Eclipse.launch → ...it5/.launch/Launch Runtime Eclipse.launch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<booleanAttribute key="askclear" value="true"/>
<booleanAttribute key="automaticAdd" value="true"/>
<booleanAttribute key="automaticValidate" value="false"/>
<stringAttribute key="bad_container_name" value="/mavenTychoP2J17/.launch/"/>
<stringAttribute key="bad_container_name" value="/mavenTychoJUnit5/.launch/"/>
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
<booleanAttribute key="clearConfig" value="true"/>
Expand Down
6 changes: 3 additions & 3 deletions ...rent/mavenTychoP2J17/META-INF/MANIFEST.MF → ...ent/mavenTychoJUnit5/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: mavenTychoP2J17
Bundle-Name: mavenTychoJUnit5
Bundle-Vendor: My Company
Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: mavenTychoP2J17; singleton:=true
Bundle-SymbolicName: mavenTychoJUnit5; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext,
org.eclipse.xtext.xbase,
org.eclipse.equinox.common;bundle-version="3.19.0"
Bundle-RequiredExecutionEnvironment: JavaSE-17
Automatic-Module-Name: mavenTychoP2J17
Automatic-Module-Name: mavenTychoJUnit5
0 ...J17.parent/mavenTychoJ17/build.properties → ....parent/mavenTychoJUnit5/build.properties
View file
File renamed without changes.
Loading

0 comments on commit 5fdf15d

Please sign in to comment.