Skip to content

Commit

Permalink
Test 19.0.0.2 (#297)
Browse files Browse the repository at this point in the history
Test 19.0.0.2
  • Loading branch information
chyt authored and mattbsox committed Mar 8, 2019
1 parent fe94929 commit 66df1fc
Show file tree
Hide file tree
Showing 197 changed files with 93 additions and 133 deletions.
14 changes: 4 additions & 10 deletions .travis.yml
Expand Up @@ -3,24 +3,18 @@ language: java
jdk:
- oraclejdk8
- oraclejdk9
matrix:
exclude:
- jdk: oraclejdk9
env: RUNTIME=ol RUNTIME_VERSION=18.0.0.3
- jdk: oraclejdk9
env: RUNTIME=wlp RUNTIME_VERSION=18.0.0.3
env:
- RUNTIME=wlp RUNTIME_VERSION=18.0.0.4
- RUNTIME=wlp RUNTIME_VERSION=18.0.0.3
- RUNTIME=wlp RUNTIME_VERSION=19.0.0.2
- RUNTIME=ol RUNTIME_VERSION=18.0.0.4
- RUNTIME=ol RUNTIME_VERSION=18.0.0.3
- RUNTIME=ol RUNTIME_VERSION=19.0.0.2
before_install:
- echo 'Installing ci.common lib ....'
- git clone https://github.com/wasdev/ci.common.git ./ci.common
- cd ./ci.common
- mvn clean install
- cd ..
script:
- export GRADLE_OPTS="-Dorg.gradle.daemon=true -Dorg.gradle.jvmargs='-XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m'"
- travis_wait ./gradlew install integrationTest -Druntime=$RUNTIME -DruntimeVersion=$RUNTIME_VERSION --stacktrace --info --no-daemon
- export GRADLE_OPTS="-Dorg.gradle.daemon=true -Dorg.gradle.jvmargs='-XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m'"
- travis_wait ./gradlew install check -Druntime=$RUNTIME -DruntimeVersion=$RUNTIME_VERSION --stacktrace --info --no-daemon
dist: trusty
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -22,7 +22,7 @@ This will download Gradle, build the plugin, and install it in to the `build\lib
To build the plugin and run the integration tests execute the following commands in the root directory. The `runtime` and `runtimeVersion` parameters are used to select the Liberty runtime that will be used to run the tests. The `wlpLicense` parameter is only needed for Liberty packaged as a JAR file.

```bash
$ ./gradlew install integrationTest -Druntime=<wlp|ol> -DruntimeVersion=<runtime_version> -DwlpLicense=<liberty_license_code>
$ ./gradlew install check -Druntime=<wlp|ol> -DruntimeVersion=<runtime_version> -DwlpLicense=<liberty_license_code>
```

## Usage
Expand Down
6 changes: 3 additions & 3 deletions appveyor.yml
Expand Up @@ -5,13 +5,13 @@ environment:
RUNTIME_VERSION: 18.0.0.4
- jdk: "C:\\Program Files\\Java\\jdk1.8.0\\bin:"
RUNTIME: wlp
RUNTIME_VERSION: 18.0.0.3
RUNTIME_VERSION: 19.0.0.2
- jdk: "C:\\Program Files\\Java\\jdk1.8.0\\bin:"
RUNTIME: ol
RUNTIME_VERSION: 18.0.0.4
- jdk: "C:\\Program Files\\Java\\jdk1.8.0\\bin:"
RUNTIME: ol
RUNTIME_VERSION: 18.0.0.3
RUNTIME_VERSION: 19.0.0.2

install:
- cmd: |
Expand All @@ -29,6 +29,6 @@ before_build:
build_script:
# Build the compiled extension
- "gradlew.bat install integrationTest -Druntime=%RUNTIME% -DruntimeVersion=%RUNTIME_VERSION% --stacktrace --info --no-daemon"
- "gradlew.bat install check -Druntime=%RUNTIME% -DruntimeVersion=%RUNTIME_VERSION% --stacktrace --info --no-daemon"

test: off
69 changes: 24 additions & 45 deletions build.gradle
Expand Up @@ -8,6 +8,10 @@ apply plugin: 'maven'
apply plugin: 'signing'
apply plugin: "com.gradle.plugin-publish"

archivesBaseName = 'liberty-gradle-plugin'
group = 'net.wasdev.wlp.gradle.plugins'
version = '2.6.6-SNAPSHOT'

repositories {
mavenLocal()
mavenCentral()
Expand Down Expand Up @@ -65,38 +69,27 @@ dependencies {
testCompile gradleTestKit()
}

sourceSets {
integrationTest {
groovy.srcDir file('src/integTest/groovy')
resources.srcDir file('src/integTest/resources')
compileClasspath = sourceSets.main.output + configurations.testRuntime
runtimeClasspath = output + compileClasspath
output.dir(files(new File(buildDir, 'classes/groovy/integrationTest')))
}
sourceSets.main.compileClasspath += configurations.provided

task sourcesJar(type: Jar) {
classifier = 'sources'
from sourceSets.main.allSource
}

task integrationTest(type: Test) {
logging.level = LogLevel.INFO
description = 'Runs the integration tests.' + gradle.gradleVersion
if (!gradle.gradleVersion.startsWith('4.') || !gradle.gradleVersion.startsWith('5.')) {
testClassesDirs = sourceSets.integrationTest.output.getDirs()
} else {
Map<String, ?> args = [dir: sourceSets.integrationTest.output.getDirs().getSingleFile()]
if (project.hasProperty("test.excludes.pattern")) {
args.put('excludes', [project.property("test.excludes.pattern")])
}
if (project.hasProperty("test.includes.pattern")) {
args.put('includes', [project.property("test.includes.pattern")])
}
testClassesDirs = fileTree(args)
}
classpath = sourceSets.integrationTest.runtimeClasspath
task groovydocJar(type: Jar) {
classifier = 'groovydoc'
from groovydoc
}

artifacts {
archives groovydocJar, sourcesJar
}

test {
systemProperties System.getProperties()
systemProperty 'runit', 'online'

doFirst {

String runtimeGroup
String runtimeArtifactId
String kernelArtifactId
Expand Down Expand Up @@ -149,26 +142,12 @@ task integrationTest(type: Test) {
}
}
}
}

sourceSets.main.compileClasspath += configurations.provided

archivesBaseName = 'liberty-gradle-plugin'
group = 'net.wasdev.wlp.gradle.plugins'
version = '2.6.6-SNAPSHOT'

task sourcesJar(type: Jar) {
classifier = 'sources'
from sourceSets.main.allSource
}

task groovydocJar(type: Jar) {
classifier = 'groovydoc'
from groovydoc
}

artifacts {
archives groovydocJar, sourcesJar
if (project.hasProperty('test.exclude')){
exclude project.property('test.exclude')
}
if (project.hasProperty('test.include')){
include project.property('test.include')
}
}

if (!version.endsWith("SNAPSHOT")) {
Expand Down
Expand Up @@ -29,7 +29,7 @@ import org.gradle.testkit.runner.GradleRunner
*/
class ConfigureArquillianTest extends AbstractIntegrationTest {

static File resourceDir = new File("build/resources/integrationTest/arquillian-tests")
static File resourceDir = new File("build/resources/test/arquillian-tests")
static File buildDir = new File(integTestDir, "/arquillian-tests")
static String buildFilename = "build.gradle"

Expand Down
Expand Up @@ -24,7 +24,7 @@ import org.junit.runners.MethodSorters

@FixMethodOrder(MethodSorters.NAME_ASCENDING)
class InstallDirSubProject extends AbstractIntegrationTest {
static File resourceDir = new File("build/resources/integrationTest/sub-project-test")
static File resourceDir = new File("build/resources/test/sub-project-test")
static File buildDir = new File(integTestDir, "/InstallDirSubProject")
static String buildFilename = "install_dir_sub_project.gradle"

Expand Down
Expand Up @@ -24,7 +24,7 @@ import org.junit.runners.MethodSorters

@FixMethodOrder(MethodSorters.NAME_ASCENDING)
class InstallFeature_acceptLicense extends AbstractIntegrationTest{
static File resourceDir = new File("build/resources/integrationTest/sample.servlet")
static File resourceDir = new File("build/resources/test/sample.servlet")
static File buildDir = new File(integTestDir, "/InstallFeature_acceptLicense")
static String buildFilename = "installFeatureServerXmlTest.gradle"

Expand Down
Expand Up @@ -24,7 +24,7 @@ import org.junit.runners.MethodSorters

@FixMethodOrder(MethodSorters.NAME_ASCENDING)
class InstallFeature_multiple extends AbstractIntegrationTest{
static File resourceDir = new File("build/resources/integrationTest/liberty-test")
static File resourceDir = new File("build/resources/test/liberty-test")
static File buildDir = new File(integTestDir, "/InstallFeature_multiple")
static File buildFilename = new File(resourceDir, "install_feature_multiple.gradle")

Expand Down
Expand Up @@ -24,7 +24,7 @@ import org.junit.runners.MethodSorters

@FixMethodOrder(MethodSorters.NAME_ASCENDING)
class InstallFeature_single extends AbstractIntegrationTest{
static File resourceDir = new File("build/resources/integrationTest/liberty-test")
static File resourceDir = new File("build/resources/test/liberty-test")
static File buildDir = new File(integTestDir, "/InstallFeature_single")
static File buildFilename = new File(resourceDir, "install_feature_single.gradle")

Expand Down
Expand Up @@ -24,7 +24,7 @@ import org.junit.runners.MethodSorters

@FixMethodOrder(MethodSorters.NAME_ASCENDING)
class InstallLiberty_javaee7 extends AbstractIntegrationTest{
static File resourceDir = new File("build/resources/integrationTest/liberty-test")
static File resourceDir = new File("build/resources/test/liberty-test")
static File buildDir = new File(integTestDir, "/InstallLiberty_javaee7")
static String buildFilename = "install_liberty_javaee7.gradle"

Expand Down
Expand Up @@ -24,7 +24,7 @@ import org.junit.runners.MethodSorters

@FixMethodOrder(MethodSorters.NAME_ASCENDING)
class InstallLiberty_webProfile7 extends AbstractIntegrationTest{
static File resourceDir = new File("build/resources/integrationTest/liberty-test")
static File resourceDir = new File("build/resources/test/liberty-test")
static File buildDir = new File(integTestDir, "/InstallLiberty_webProfile7")
static String buildFilename = "install_liberty_webProfile7.gradle"

Expand Down
Expand Up @@ -25,7 +25,7 @@ import org.junit.Test
import net.wasdev.wlp.common.plugins.util.InstallFeatureUtil

class KernelInstallFeatureTest extends AbstractIntegrationTest{
static File resourceDir = new File("build/resources/integrationTest/kernel-install-feature-test")
static File resourceDir = new File("build/resources/test/kernel-install-feature-test")
static File buildDir = new File(integTestDir, "/kernel-install-feature-test")
static String buildFilename = "build.gradle"

Expand Down
Expand Up @@ -21,7 +21,7 @@ import org.junit.BeforeClass
import org.junit.Test

class LibertyApplicationConfigurationM2Test extends AbstractIntegrationTest {
static File resourceDir = new File("build/resources/integrationTest/app-configuration-m2-test")
static File resourceDir = new File("build/resources/test/app-configuration-m2-test")
static File buildDir = new File(integTestDir, "/LibertyApplicationConfigurationM2Test")
static String buildFilename = "appConfigurationM2Test.gradle"

Expand Down
Expand Up @@ -21,7 +21,7 @@ import org.junit.BeforeClass
import org.junit.Test

class LibertyApplicationConfigurationTest extends AbstractIntegrationTest {
static File resourceDir = new File("build/resources/integrationTest/app-configuration-test")
static File resourceDir = new File("build/resources/test/app-configuration-test")
static File buildDir = new File(integTestDir, "/LibertyApplicationConfigurationTest")
static String buildFilename = "appConfigurationTest.gradle"

Expand Down
Expand Up @@ -25,7 +25,7 @@ import net.wasdev.wlp.ant.ServerTask

@FixMethodOrder(MethodSorters.NAME_ASCENDING)
class LibertyMultiServerTest extends AbstractIntegrationTest{
static File resourceDir = new File("build/resources/integrationTest/liberty-multi-test")
static File resourceDir = new File("build/resources/test/liberty-multi-test")
static File buildDir = new File(integTestDir, "/liberty-multi-test")
static String buildFilename = "multiServerTest.gradle"

Expand Down
Expand Up @@ -24,17 +24,15 @@ import org.junit.runners.MethodSorters

@FixMethodOrder(MethodSorters.NAME_ASCENDING)
class LibertyPackage_archiveJarDirExist_Test extends AbstractIntegrationTest{
static File resourceDir = new File("build/resources/integrationTest/liberty-package-test")
static File resourceDir = new File("build/resources/test/liberty-package-test")
static File buildDir = new File(integTestDir, "liberty-package-archiveJarDirExist-test")
static File buildFilename = new File(resourceDir, "liberty-package-archiveJarDirExist.gradle")

@BeforeClass
public static void setup() {
copyBuildFiles(buildFilename, buildDir)
try {
runTasks(buildDir, 'installLiberty')
runTasks(buildDir, 'libertyStart')
runTasks(buildDir, 'libertyStop')
runTasks(buildDir, 'installLiberty', 'libertyStart', 'libertyStop')
} catch (Exception e) {
throw new AssertionError ("Fail on task installLiberty. "+ e)
}
Expand Down
Expand Up @@ -27,7 +27,7 @@ import java.io.File

@FixMethodOrder(MethodSorters.NAME_ASCENDING)
class LibertyPackage_archiveJar_Test extends AbstractIntegrationTest{
static File resourceDir = new File("build/resources/integrationTest/liberty-package-test")
static File resourceDir = new File("build/resources/test/liberty-package-test")
static File buildDir = new File(integTestDir, "/liberty-package-archiveJar-test")
static File buildFilename = new File(resourceDir, "liberty-package-archiveJar.gradle")

Expand All @@ -36,9 +36,7 @@ class LibertyPackage_archiveJar_Test extends AbstractIntegrationTest{
createDir(buildDir)
copyBuildFiles(buildFilename, buildDir)
try {
runTasks(buildDir, 'installLiberty')
runTasks(buildDir, 'libertyStart')
runTasks(buildDir, 'libertyStop')
runTasks(buildDir, 'installLiberty', 'libertyStart', 'libertyStop')
} catch (Exception e) {
throw new AssertionError ("Fail on task installLiberty. "+ e)
}
Expand Down
Expand Up @@ -24,7 +24,7 @@ import org.junit.runners.MethodSorters

@FixMethodOrder(MethodSorters.NAME_ASCENDING)
class LibertyPackage_archiveZipPath_Test extends AbstractIntegrationTest{
static File resourceDir = new File("build/resources/integrationTest/liberty-package-test")
static File resourceDir = new File("build/resources/test/liberty-package-test")
static File buildDir = new File(integTestDir, "/liberty-package-archiveZipPath-test")
static File buildFilename = new File(resourceDir, "liberty-package-archiveZipPath.gradle")

Expand All @@ -33,9 +33,7 @@ class LibertyPackage_archiveZipPath_Test extends AbstractIntegrationTest{
createDir(buildDir)
copyBuildFiles(buildFilename, buildDir)
try {
runTasks(buildDir, 'installLiberty')
runTasks(buildDir, 'libertyStart')
runTasks(buildDir, 'libertyStop')
runTasks(buildDir, 'installLiberty', 'libertyStart', 'libertyStop')
} catch (Exception e) {
throw new AssertionError ("Fail on task installLiberty. "+ e)
}
Expand Down
Expand Up @@ -24,7 +24,7 @@ import org.junit.runners.MethodSorters

@FixMethodOrder(MethodSorters.NAME_ASCENDING)
class LibertyPackage_archiveZip_Test extends AbstractIntegrationTest{
static File resourceDir = new File("build/resources/integrationTest/liberty-package-test")
static File resourceDir = new File("build/resources/test/liberty-package-test")
static File buildDir = new File(integTestDir, "/liberty-package-archiveZip-test")
static File buildFilename = new File(resourceDir, "liberty-package-archiveZip.gradle")

Expand All @@ -33,9 +33,7 @@ class LibertyPackage_archiveZip_Test extends AbstractIntegrationTest{
createDir(buildDir)
copyBuildFiles(buildFilename, buildDir)
try {
runTasks(buildDir, 'installLiberty')
runTasks(buildDir, 'libertyStart')
runTasks(buildDir, 'libertyStop')
runTasks(buildDir, 'installLiberty', 'libertyStart', 'libertyStop')
} catch (Exception e) {
throw new AssertionError ("Fail on task installLiberty. "+ e)
}
Expand Down
Expand Up @@ -24,7 +24,7 @@ import org.junit.runners.MethodSorters

@FixMethodOrder(MethodSorters.NAME_ASCENDING)
class LibertyPackage_looseApplication_Test extends AbstractIntegrationTest{
static File resourceDir = new File("build/resources/integrationTest/liberty-package-test")
static File resourceDir = new File("build/resources/test/liberty-package-test")
static File buildDir = new File(integTestDir, "/liberty-package-looseApplication-test")
static File buildFilename = new File(resourceDir, "liberty-package-looseApplication.gradle")

Expand All @@ -33,9 +33,7 @@ class LibertyPackage_looseApplication_Test extends AbstractIntegrationTest{
createDir(buildDir)
copyBuildFiles(buildFilename, buildDir)
try {
runTasks(buildDir, 'installLiberty')
runTasks(buildDir, 'libertyStart')
runTasks(buildDir, 'libertyStop')
runTasks(buildDir, 'installLiberty', 'libertyStart', 'libertyStop')
} catch (Exception e) {
throw new AssertionError ("Fail on task installLiberty. "+ e)
}
Expand Down
Expand Up @@ -24,7 +24,7 @@ import org.junit.runners.MethodSorters

@FixMethodOrder(MethodSorters.NAME_ASCENDING)
class LibertyPackage_noArchive_Test extends AbstractIntegrationTest{
static File resourceDir = new File("build/resources/integrationTest/liberty-package-test")
static File resourceDir = new File("build/resources/test/liberty-package-test")
static File buildDir = new File(integTestDir, "/liberty-package-noArchive-test")
static File buildFilename = new File(resourceDir, "liberty-package-noArchive.gradle")

Expand All @@ -33,9 +33,7 @@ class LibertyPackage_noArchive_Test extends AbstractIntegrationTest{
createDir(buildDir)
copyBuildFiles(buildFilename, buildDir)
try {
runTasks(buildDir, 'installLiberty')
runTasks(buildDir, 'libertyStart')
runTasks(buildDir, 'libertyStop')
runTasks(buildDir, 'installLiberty', 'libertyStart', 'libertyStop')
} catch (Exception e) {
throw new AssertionError ("Fail on task installLiberty. "+ e)
}
Expand Down
Expand Up @@ -24,7 +24,7 @@ import org.junit.runners.MethodSorters

@FixMethodOrder(MethodSorters.NAME_ASCENDING)
class LibertyPackage_noAttrib_Test extends AbstractIntegrationTest{
static resourceDir = new File("build/resources/integrationTest/liberty-package-test")
static resourceDir = new File("build/resources/test/liberty-package-test")
static File buildDir = new File(integTestDir, "/liberty-package-noAttrib-test")
static File buildFilename = new File(resourceDir, "liberty-package-noAttrib.gradle")

Expand All @@ -33,9 +33,7 @@ class LibertyPackage_noAttrib_Test extends AbstractIntegrationTest{
createDir(buildDir)
copyBuildFiles(buildFilename, buildDir)
try {
runTasks(buildDir, 'installLiberty')
runTasks(buildDir, 'libertyStart')
runTasks(buildDir, 'libertyStop')
runTasks(buildDir, 'installLiberty', 'libertyStart', 'libertyStop')
} catch (Exception e) {
throw new AssertionError ("Fail on task installLiberty. "+ e)
}
Expand Down

0 comments on commit 66df1fc

Please sign in to comment.