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

[wizard] fixed test expectations

Browse source
This commit is contained in:
Stefan Oehme 2015-10-02 15:02:33 +02:00
parent cddb1b10de
commit 9c99083366
12 changed files with 70 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/gradle/source-layout.gradle vendored
View file

@ -24,6 +24,14 @@ if (name.endsWith(".tests")) {
}
}
sourceSets.all {
resources.exclude '**/*.g', '**/*.xtext', '**/*.mwe2', '**/*.xtend', '**/*._trace'
}
jar.manifest {
attributes 'Bundle-SymbolicName': project.name
}
plugins.withId('war') {
webAppDirName = "WebRoot"
}

6
tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/build.gradle vendored
View file

@ -27,5 +27,11 @@ task generateXtextLanguage(type: JavaExec) {
compileXtend.dependsOn(generateXtextLanguage)
clean.dependsOn(cleanGenerateXtextLanguage)
eclipse.classpath.plusConfigurations += [configurations.mwe2]
jar {
from('model/generated') {
into('model/generated')
}
}
//this is an eclipse plugin project
eclipseClasspath.enabled=false

4
tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/gradle/source-layout.gradle vendored
View file

@ -11,6 +11,10 @@ sourceSets {
}
}
jar.manifest {
attributes 'Bundle-SymbolicName': project.name
}
plugins.withId('war') {
webAppDirName = "src/main/webapp"
}

12
tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle/build.gradle vendored
View file

@ -18,10 +18,10 @@ dependencies {
task generateXtextLanguage(type: JavaExec) {
main = 'org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher'
classpath = configurations.mwe2
inputs.file "src/main/resources/org/xtext/example/mydsl/GenerateMyDsl.mwe2"
inputs.file "src/main/resources/org/xtext/example/mydsl/MyDsl.xtext"
inputs.file "src/main/java/org/xtext/example/mydsl/GenerateMyDsl.mwe2"
inputs.file "src/main/java/org/xtext/example/mydsl/MyDsl.xtext"
outputs.dir "src/main/xtext-gen"
args += "src/main/resources/org/xtext/example/mydsl/GenerateMyDsl.mwe2"
args += "src/main/java/org/xtext/example/mydsl/GenerateMyDsl.mwe2"
args += "-p"
args += "rootPath=/${projectDir}/.."
}
@ -29,3 +29,9 @@ task generateXtextLanguage(type: JavaExec) {
compileXtend.dependsOn(generateXtextLanguage)
clean.dependsOn(cleanGenerateXtextLanguage)
eclipse.classpath.plusConfigurations += [configurations.mwe2]
jar {
from('model/generated') {
into('model/generated')
}
}

2
tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle/src/main/resources/org/xtext/example/mydsl/GenerateMyDsl.mwe2 → tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle/src/main/java/org/xtext/example/mydsl/GenerateMyDsl.mwe2 vendored
View file

@ -9,7 +9,7 @@ var baseName = "org.xtext.example.gradle"
var rootPath = ".."
var fileExtensions = "mydsl"
var grammarURI = "platform:/resource/${baseName}/src/main/resources/org/xtext/example/mydsl/MyDsl.xtext"
var grammarURI = "platform:/resource/${baseName}/src/main/java/org/xtext/example/mydsl/MyDsl.xtext"
var encoding = "UTF-8"
var lineDelimiter = "\n"

0
tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle/src/main/resources/org/xtext/example/mydsl/MyDsl.xtext → tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle/src/main/java/org/xtext/example/mydsl/MyDsl.xtext vendored
View file

7
tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.web/pom.xml vendored
View file

@ -14,6 +14,10 @@
<resources>
<resource>
<directory>src</directory>
<excludes>
<exclude>**/*.java</exclude>
<exclude>**/*.xtend</exclude>
</excludes>
</resource>
</resources>
<plugins>
@ -56,6 +60,9 @@
<resources>
<resource>
<directory>src-gen</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
</configuration>

4
tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven.ide/pom.xml vendored
View file

@ -34,6 +34,10 @@
<resources>
<resource>
<directory>src/main/xtext-gen</directory>
<excludes>
<exclude>**/*.java</exclude>
<exclude>**/*.g</exclude>
</excludes>
</resource>
</resources>
</configuration>

3
tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven.web/pom.xml vendored
View file

@ -50,6 +50,9 @@
<resources>
<resource>
<directory>src/main/xtext-gen</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
</configuration>

28
tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven/pom.xml vendored
View file

@ -27,7 +27,7 @@
<configuration>
<mainClass>org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher</mainClass>
<arguments>
<argument>/${project.basedir}/src/main/resources/org/xtext/example/mydsl/GenerateMyDsl.mwe2</argument>
<argument>/${project.basedir}/src/main/java/org/xtext/example/mydsl/GenerateMyDsl.mwe2</argument>
<argument>-p</argument>
<argument>rootPath=/${project.basedir}/..</argument>
</arguments>
@ -96,6 +96,10 @@
<resources>
<resource>
<directory>src/main/xtext-gen</directory>
<excludes>
<exclude>**/*.java</exclude>
<exclude>**/*.g</exclude>
</excludes>
</resource>
</resources>
</configuration>
@ -114,12 +118,34 @@
<resources>
<resource>
<directory>src/test/xtext-gen</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.5.5</version>
<configuration>
<descriptors>
<descriptor>jar-with-ecore-model.xml</descriptor>
</descriptors>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

2
tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven/src/main/resources/org/xtext/example/mydsl/GenerateMyDsl.mwe2 → tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven/src/main/java/org/xtext/example/mydsl/GenerateMyDsl.mwe2 vendored
View file

@ -9,7 +9,7 @@ var baseName = "org.xtext.example.plainMaven"
var rootPath = ".."
var fileExtensions = "mydsl"
var grammarURI = "platform:/resource/${baseName}/src/main/resources/org/xtext/example/mydsl/MyDsl.xtext"
var grammarURI = "platform:/resource/${baseName}/src/main/java/org/xtext/example/mydsl/MyDsl.xtext"
var encoding = "UTF-8"
var lineDelimiter = "\n"

0
tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven/src/main/resources/org/xtext/example/mydsl/MyDsl.xtext → tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven/src/main/java/org/xtext/example/mydsl/MyDsl.xtext vendored
View file