sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-15 08:18:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[eclipse/xtext-xtend#818] Adjusted new project wizard

Browse source
This commit is contained in:
Sebastian Zarnekow 2019-06-19 20:55:12 +02:00
parent 0475f0dcf7
commit db80cd8a50
6 changed files with 36 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/JUnitFragment.xtend
View file

@ -48,7 +48,7 @@ class JUnitFragment extends AbstractStubGeneratingFragment {
}
protected def String getUiTestingPackage() {
"org.eclipse.xtext.junit4"
"org.eclipse.xtext.ui.testing"
}
def protected getXbaseTestingPackage() {

2
org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/junit/JUnitFragment.java
View file

@ -67,7 +67,7 @@ public class JUnitFragment extends AbstractStubGeneratingFragment {
}
protected String getUiTestingPackage() {
return "org.eclipse.xtext.junit4";
return "org.eclipse.xtext.ui.testing";
}
protected String getXbaseTestingPackage() {

18
org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend
View file

@ -83,18 +83,20 @@ class TargetPlatformProject extends ProjectDescriptor {
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>
«IF config.junitVersion == JUnitVersion.JUNIT_5»
<unit id="org.junit.jupiter.api" version="5.4.0.v20190212-2109"/>
<unit id="org.junit.jupiter.engine" version="5.4.0.v20190212-2109"/>
<unit id="org.junit.platform.commons" version="1.4.0.v20190212-2109"/>
<unit id="org.junit.platform.engine" version="1.4.0.v20190212-2109"/>
<unit id="org.junit.platform.launcher" version="1.4.0.v20190212-2109"/>
<unit id="org.junit.platform.runner" version="1.4.0.v20190212-2109"/>
<unit id="org.opentest4j" version="1.1.1.v20190212-2109"/>
<unit id="org.junit.jupiter.api" version="5.4.0.v20190212-2109"/>
<unit id="org.junit.jupiter.engine" version="5.4.0.v20190212-2109"/>
<unit id="org.junit.platform.commons" version="1.4.0.v20190212-2109"/>
<unit id="org.junit.platform.engine" version="1.4.0.v20190212-2109"/>
<unit id="org.junit.platform.launcher" version="1.4.0.v20190212-2109"/>
<unit id="org.junit.platform.runner" version="1.4.0.v20190212-2109"/>
<unit id="org.opentest4j" version="1.1.1.v20190212-2109"/>
«ELSE»
<unit id="org.junit" version="4.12.0.v201504281640"/>
«ENDIF»
<unit id="org.objectweb.asm" version="7.1.0.v20190412-2143"/>
<unit id="org.objectweb.asm.tree" version="7.1.0.v20190412-2143"/>
<unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/orbit/2019-09"/>
</location>
</locations>

5
org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/UiTestProjectDescriptor.xtend
View file

@ -10,6 +10,7 @@ package org.eclipse.xtext.xtext.wizard
import org.eclipse.xtext.xtext.wizard.TestProjectDescriptor
import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor
import static org.eclipse.xtext.xtext.wizard.ExternalDependency.*
import org.eclipse.xtext.util.JUnitVersion
@FinalFieldsConstructor
class UiTestProjectDescriptor extends TestProjectDescriptor {
@ -19,7 +20,9 @@ class UiTestProjectDescriptor extends TestProjectDescriptor {
deps += super.externalDependencies
deps += createXtextDependency("org.eclipse.xtext.testing") => [maven.scope = Scope.TESTCOMPILE]
deps += createXtextDependency("org.eclipse.xtext.xbase.testing") => [maven.scope = Scope.TESTCOMPILE]
deps += createXtextDependency("org.eclipse.xtext.junit4") => [maven.scope = Scope.TESTCOMPILE]
if (config.junitVersion == JUnitVersion.JUNIT_4) {
deps += createXtextDependency("org.eclipse.xtext.junit4") => [maven.scope = Scope.TESTCOMPILE]
}
deps += createXtextDependency("org.eclipse.xtext.xbase.junit") => [maven.scope = Scope.TESTCOMPILE]
deps
}

10
org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java
View file

@ -163,9 +163,6 @@ public class TargetPlatformProject extends ProjectDescriptor {
_builder.append("\t");
_builder.append("<unit id=\"org.antlr.runtime\" version=\"3.2.0.v201101311130\"/>");
_builder.newLine();
_builder.append("\t");
_builder.append("<unit id=\"org.junit\" version=\"4.12.0.v201504281640\"/>");
_builder.newLine();
{
JUnitVersion _junitVersion = this.getConfig().getJunitVersion();
boolean _equals = Objects.equal(_junitVersion, JUnitVersion.JUNIT_5);
@ -191,6 +188,10 @@ public class TargetPlatformProject extends ProjectDescriptor {
_builder.append("\t");
_builder.append("<unit id=\"org.opentest4j\" version=\"1.1.1.v20190212-2109\"/>");
_builder.newLine();
} else {
_builder.append("\t");
_builder.append("<unit id=\"org.junit\" version=\"4.12.0.v201504281640\"/>");
_builder.newLine();
}
}
_builder.append("\t");
@ -200,6 +201,9 @@ public class TargetPlatformProject extends ProjectDescriptor {
_builder.append("<unit id=\"org.objectweb.asm.tree\" version=\"7.1.0.v20190412-2143\"/>");
_builder.newLine();
_builder.append("\t");
_builder.append("<unit id=\"io.github.classgraph\" version=\"4.8.35.v20190528-1517\"/>");
_builder.newLine();
_builder.append("\t");
_builder.append("<repository location=\"https://download.eclipse.org/modeling/tmf/xtext/updates/orbit/2019-09\"/>");
_builder.newLine();
_builder.append("</location>");

20
org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/UiTestProjectDescriptor.java
View file

@ -7,10 +7,12 @@
*/
package org.eclipse.xtext.xtext.wizard;
import com.google.common.base.Objects;
import com.google.common.collect.Iterables;
import java.util.LinkedHashSet;
import java.util.Set;
import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor;
import org.eclipse.xtext.util.JUnitVersion;
import org.eclipse.xtext.xbase.lib.CollectionLiterals;
import org.eclipse.xtext.xbase.lib.ObjectExtensions;
import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
@ -43,13 +45,17 @@ public class UiTestProjectDescriptor extends TestProjectDescriptor {
};
ExternalDependency _doubleArrow_1 = ObjectExtensions.<ExternalDependency>operator_doubleArrow(_createXtextDependency_1, _function_1);
deps.add(_doubleArrow_1);
ExternalDependency _createXtextDependency_2 = ExternalDependency.createXtextDependency("org.eclipse.xtext.junit4");
final Procedure1<ExternalDependency> _function_2 = (ExternalDependency it) -> {
ExternalDependency.MavenCoordinates _maven = it.getMaven();
_maven.setScope(Scope.TESTCOMPILE);
};
ExternalDependency _doubleArrow_2 = ObjectExtensions.<ExternalDependency>operator_doubleArrow(_createXtextDependency_2, _function_2);
deps.add(_doubleArrow_2);
JUnitVersion _junitVersion = this.getConfig().getJunitVersion();
boolean _equals = Objects.equal(_junitVersion, JUnitVersion.JUNIT_4);
if (_equals) {
ExternalDependency _createXtextDependency_2 = ExternalDependency.createXtextDependency("org.eclipse.xtext.junit4");
final Procedure1<ExternalDependency> _function_2 = (ExternalDependency it) -> {
ExternalDependency.MavenCoordinates _maven = it.getMaven();
_maven.setScope(Scope.TESTCOMPILE);
};
ExternalDependency _doubleArrow_2 = ObjectExtensions.<ExternalDependency>operator_doubleArrow(_createXtextDependency_2, _function_2);
deps.add(_doubleArrow_2);
}
ExternalDependency _createXtextDependency_3 = ExternalDependency.createXtextDependency("org.eclipse.xtext.xbase.junit");
final Procedure1<ExternalDependency> _function_3 = (ExternalDependency it) -> {
ExternalDependency.MavenCoordinates _maven = it.getMaven();