Adding tests for boostApplication using dev and release projects

Author: mattbsox

boost-gradle/src/main/groovy/io/openliberty/boost/gradle/utils/GradleProjectUtil.groovy

@@ -49,7 +49,13 @@ public class GradleProjectUtil {
 
         try {
             //Projects without the war/java plugin won't have this configuration
-            dependencies.putAll(project.configurations.getByName('compileClasspath'), logger)
+            //compileClasspath is not a regular Configuration object so we have to go through without using getAllDependenciesFromConfiguration()
+            project.configurations.getByName('compileClasspath').resolvedConfiguration.resolvedArtifacts.collect { it.moduleVersion.id }.each { ModuleVersionIdentifier id ->
+                logger.debug("Found dependency while processing project: " + id.group.toString() + ":"
+                        + id.name.toString() + ":" + id.version.toString())
+                        
+                dependencies.put(id.group.toString() + ":" + id.name.toString(), id.version.toString())
+            }
         } catch (UnknownConfigurationException ue) {
             logger.debug("The compileClasspath configuration was not found.")
         }

boost-gradle/src/test/groovy/BoostPackageDevReleaseTest.groovy

@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright (c) 2019 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+import org.apache.commons.io.FileUtils
+
+import org.gradle.testkit.runner.BuildResult
+import org.gradle.testkit.runner.GradleRunner
+import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
+
+import org.junit.After
+import org.junit.BeforeClass
+import org.junit.Test
+import static org.junit.Assert.assertEquals
+import static org.junit.Assert.assertTrue
+
+
+public class BoostPackageDevReleaseTest extends AbstractBoostTest {
+    static File resourceDir = new File("build/resources/test/devReleaseApp")
+    static File testProjectDir = new File(integTestDir, "BoostPackageDevReleaseTest")
+    
+    static File devDir = new File(testProjectDir, 'dev')
+    static File releaseDir = new File(testProjectDir, 'release')
+
+    private static String URL = "http://localhost:9080/"
+
+    private static String SERVLET_RESPONSE = "</font><font color=red>myHomeCounty</font></h1>"
+
+    @BeforeClass
+    public static void setup() {
+        createDir(testProjectDir)
+        FileUtils.copyDirectory(resourceDir, testProjectDir)
+        copyFile(new File("build/gradle.properties"), new File(devDir, 'gradle.properties'))
+        copyFile(new File("build/gradle.properties"), new File(releaseDir, 'gradle.properties'))
+        
+        //Build the dev project
+        BuildResult result = GradleRunner.create()
+            .withProjectDir(devDir)
+            .forwardOutput()
+            .withArguments("install", "-i", "-s")
+            .build()
+
+        assertEquals(SUCCESS, result.task(":boostPackage").getOutcome())
+
+        //Build the release project
+        result = GradleRunner.create()
+            .withProjectDir(releaseDir)
+            .forwardOutput()
+            .withArguments("boostPackage", "boostStart", "-i", "-s")
+            .build()
+
+        assertEquals(SUCCESS, result.task(":boostPackage").getOutcome())
+        assertEquals(SUCCESS, result.task(":boostStart").getOutcome())
+    }
+    
+    @After
+    public void teardown() {
+    
+        BuildResult result = GradleRunner.create()
+            .withProjectDir(releaseDir)
+            .forwardOutput()
+            .withArguments("boostStop", "-i", "-s")
+            .build()
+       
+        assertEquals(SUCCESS, result.task(":boostStop").getOutcome())
+       
+    }
+
+    @Test
+    public void checkForApplication() {
+        assertTrue(new File(releaseDir, 'build/wlp/usr/servers/BoostServer/apps/app-1.0.war').exists())
+    }
+    
+    @Test
+    public void testServletResponse() throws Exception {
+        testServlet(URL, SERVLET_RESPONSE)
+    }
+}

boost-gradle/src/test/resources/devProdApp/dev/build.gradle renamed to boost-gradle/src/test/resources/devReleaseApp/dev/build.gradle

@@ -8,7 +8,7 @@ buildscript {
         maven { url 'https://repo.spring.io/plugins-snapshot' }
     }
     dependencies {
-        classpath("io.openliberty.boost:boost-gradle-plugin:0.1.1-SNAPSHOT")
+        classpath("io.openliberty.boost:boost-gradle-plugin:${boostVersion}")
 		classpath 'io.spring.gradle:dependency-management-plugin:1.0.6.RELEASE'
     }
 }
@@ -35,7 +35,7 @@ targetCompatibility = 1.8
 
 dependencyManagement {
     imports {
-          mavenBom "io.openliberty.boosters:ee8-bom:0.1.3-SNAPSHOT"
+          mavenBom "io.openliberty.boosters:ee8-bom:${boosterVersion}"
     }
 }
 

boost-gradle/src/test/resources/devProdApp/dev/src/main/java/application/servlet/JdbcServlet.java renamed to boost-gradle/src/test/resources/devReleaseApp/dev/src/main/java/application/servlet/JdbcServlet.java

@@ -8,7 +8,7 @@ buildscript {
         maven { url 'https://repo.spring.io/plugins-snapshot' }
     }
     dependencies {
-        classpath("io.openliberty.boost:boost-gradle-plugin:0.1.1-SNAPSHOT")
+        classpath("io.openliberty.boost:boost-gradle-plugin:${boostVersion}")
     }
 }