Add Java native to new smoke_test layout

paketo-buildpacks · Sep 25, 2023 · 6c18446 · 6c18446
1 parent 47c387e
commit 6c18446
Show file tree

Hide file tree

Showing 49 changed files with 29 additions and 69 deletions.
diff --git a/.github/workflows/test-pull-request-java-native-image.yml b/.github/workflows/test-pull-request-java-native-image.yml
diff --git a/...ative-image/public-static-main/.gitignore → ...static-main-native-image-maven/.gitignore b/...ative-image/public-static-main/.gitignore → ...static-main-native-image-maven/.gitignore
diff --git a/.../.mvn/wrapper/MavenWrapperDownloader.java → .../.mvn/wrapper/MavenWrapperDownloader.java b/.../.mvn/wrapper/MavenWrapperDownloader.java → .../.mvn/wrapper/MavenWrapperDownloader.java
diff --git a/...age-sample/.mvn/wrapper/maven-wrapper.jar → ...mage-maven/.mvn/wrapper/maven-wrapper.jar b/...age-sample/.mvn/wrapper/maven-wrapper.jar → ...mage-maven/.mvn/wrapper/maven-wrapper.jar
diff --git a/...ple/.mvn/wrapper/maven-wrapper.properties → ...ven/.mvn/wrapper/maven-wrapper.properties b/...ple/.mvn/wrapper/maven-wrapper.properties → ...ven/.mvn/wrapper/maven-wrapper.properties
diff --git a/java/native-image/public-static-main/mvnw → ...ublic-static-main-native-image-maven/mvnw b/java/native-image/public-static-main/mvnw → ...ublic-static-main-native-image-maven/mvnw
diff --git a/java/native-image/public-static-main/pom.xml → ...ic-static-main-native-image-maven/pom.xml b/java/native-image/public-static-main/pom.xml → ...ic-static-main-native-image-maven/pom.xml
diff --git a/...a_native_image_public_static_main_test.go → ...a_native_image_public_static_main_test.go b/...a_native_image_public_static_main_test.go → ...a_native_image_public_static_main_test.go
@@ -1,7 +1,9 @@
-package java_test
+package native_image_test
 
 import (
+	"flag"
 	"fmt"
+	"github.com/paketo-buildpacks/samples/tests"
 	"os"
 	"path/filepath"
 	"testing"
@@ -15,6 +17,11 @@ import (
 	. "github.com/paketo-buildpacks/occam/matchers"
 )
 
+var builders tests.BuilderFlags
+
+func init() {
+	flag.Var(&builders, "name", "the name a builder to test with")
+}
 func TestJNIPublicStaticMain(t *testing.T) {
 	Expect := NewWithT(t).Expect
 
@@ -69,7 +76,7 @@ func testPublicStaticMainWithBuilder(builder string) func(*testing.T, spec.G, sp
 			context("app uses simple JAR", func() {
 				it("builds successfully", func() {
 					var err error
-					source, err = occam.Source(filepath.Join(".", "public-static-main"))
+					source, err = occam.Source(filepath.Join("../"))
 					Expect(err).NotTo(HaveOccurred())
 
 					var logs fmt.Stringer

diff --git a/...tic-main/src/main/java/io/paketo/App.java → ...ge-maven/src/main/java/io/paketo/App.java b/...tic-main/src/main/java/io/paketo/App.java → ...ge-maven/src/main/java/io/paketo/App.java
diff --git a/java/native-image/quarkus-native/.gitignore → ...age/quarkus-native-image-maven/.gitignore b/java/native-image/quarkus-native/.gitignore → ...age/quarkus-native-image-maven/.gitignore
diff --git a/.../.mvn/wrapper/MavenWrapperDownloader.java → .../.mvn/wrapper/MavenWrapperDownloader.java b/.../.mvn/wrapper/MavenWrapperDownloader.java → .../.mvn/wrapper/MavenWrapperDownloader.java
diff --git a/...kus-native/.mvn/wrapper/maven-wrapper.jar → ...mage-maven/.mvn/wrapper/maven-wrapper.jar b/...kus-native/.mvn/wrapper/maven-wrapper.jar → ...mage-maven/.mvn/wrapper/maven-wrapper.jar
diff --git a/...ive/.mvn/wrapper/maven-wrapper.properties → ...ven/.mvn/wrapper/maven-wrapper.properties b/...ive/.mvn/wrapper/maven-wrapper.properties → ...ven/.mvn/wrapper/maven-wrapper.properties
diff --git a/...ive-image/quarkus-native/.s2i/environment → ...arkus-native-image-maven/.s2i/environment b/...ive-image/quarkus-native/.s2i/environment → ...arkus-native-image-maven/.s2i/environment
diff --git a/java/native-image/quarkus-native/README.md → ...mage/quarkus-native-image-maven/README.md b/java/native-image/quarkus-native/README.md → ...mage/quarkus-native-image-maven/README.md
diff --git a/java/native-image/quarkus-native/mvnw → ...ive-image/quarkus-native-image-maven/mvnw b/java/native-image/quarkus-native/mvnw → ...ive-image/quarkus-native-image-maven/mvnw
diff --git a/java/native-image/quarkus-native/mvnw.cmd → ...image/quarkus-native-image-maven/mvnw.cmd b/java/native-image/quarkus-native/mvnw.cmd → ...image/quarkus-native-image-maven/mvnw.cmd
diff --git a/java/native-image/quarkus-native/pom.xml → ...-image/quarkus-native-image-maven/pom.xml b/java/native-image/quarkus-native/pom.xml → ...-image/quarkus-native-image-maven/pom.xml
diff --git a/.../java_native_image_quarkus_native_test.go → .../java_native_image_quarkus_native_test.go b/.../java_native_image_quarkus_native_test.go → .../java_native_image_quarkus_native_test.go
@@ -1,7 +1,9 @@
-package java_test
+package native_image_test
 
 import (
+	"flag"
 	"fmt"
+	"github.com/paketo-buildpacks/samples/tests"
 	"os"
 	"path/filepath"
 	"testing"
@@ -15,6 +17,11 @@ import (
 	. "github.com/paketo-buildpacks/occam/matchers"
 )
 
+var builders tests.BuilderFlags
+
+func init() {
+	flag.Var(&builders, "name", "the name a builder to test with")
+}
 func TestJNIQuarkus(t *testing.T) {
 	Expect := NewWithT(t).Expect
 
@@ -69,7 +76,7 @@ func testQuarkusWithBuilder(builder string) func(*testing.T, spec.G, spec.S) {
 			context("uses simple Quarkus app", func() {
 				it("builds successfully", func() {
 					var err error
-					source, err = occam.Source(filepath.Join(".", "quarkus-native"))
+					source, err = occam.Source(filepath.Join("../"))
 					Expect(err).NotTo(HaveOccurred())
 
 					var logs fmt.Stringer

diff --git a/...cme/getting/started/GreetingResource.java → ...cme/getting/started/GreetingResource.java b/...cme/getting/started/GreetingResource.java → ...cme/getting/started/GreetingResource.java
diff --git a/...acme/getting/started/GreetingService.java → ...acme/getting/started/GreetingService.java b/...acme/getting/started/GreetingService.java → ...acme/getting/started/GreetingService.java
diff --git a/...n/resources/META-INF/resources/index.html → ...n/resources/META-INF/resources/index.html b/...n/resources/META-INF/resources/index.html → ...n/resources/META-INF/resources/index.html
diff --git a/...src/main/resources/application.properties → ...src/main/resources/application.properties b/...src/main/resources/application.properties → ...src/main/resources/application.properties
diff --git a/...getting/started/GreetingResourceTest.java → ...getting/started/GreetingResourceTest.java b/...getting/started/GreetingResourceTest.java → ...getting/started/GreetingResourceTest.java
diff --git a/...ing/started/NativeGreetingResourceIT.java → ...ing/started/NativeGreetingResourceIT.java b/...ing/started/NativeGreetingResourceIT.java → ...ing/started/NativeGreetingResourceIT.java
diff --git a/...ava-native-image-sample-gradle/.gitignore → ...pring-boot-native-image-gradle/.gitignore b/...ava-native-image-sample-gradle/.gitignore → ...pring-boot-native-image-gradle/.gitignore
diff --git a/...java-native-image-sample-gradle/README.md → ...spring-boot-native-image-gradle/README.md b/...java-native-image-sample-gradle/README.md → ...spring-boot-native-image-gradle/README.md
diff --git a/...a-native-image-sample-gradle/build.gradle → ...ing-boot-native-image-gradle/build.gradle b/...a-native-image-sample-gradle/build.gradle → ...ing-boot-native-image-gradle/build.gradle
diff --git a/...-gradle/gradle/wrapper/gradle-wrapper.jar → ...-gradle/gradle/wrapper/gradle-wrapper.jar b/...-gradle/gradle/wrapper/gradle-wrapper.jar → ...-gradle/gradle/wrapper/gradle-wrapper.jar
diff --git a/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
diff --git a/...e/java-native-image-sample-gradle/gradlew → ...e/spring-boot-native-image-gradle/gradlew b/...e/java-native-image-sample-gradle/gradlew → ...e/spring-boot-native-image-gradle/gradlew
diff --git a/...va-native-image-sample-gradle/gradlew.bat → ...ring-boot-native-image-gradle/gradlew.bat b/...va-native-image-sample-gradle/gradlew.bat → ...ring-boot-native-image-gradle/gradlew.bat
diff --git a/...ative-image-sample-gradle/settings.gradle → ...-boot-native-image-gradle/settings.gradle b/...ative-image-sample-gradle/settings.gradle → ...-boot-native-image-gradle/settings.gradle
diff --git a/...ve-image/java_native_image_gradle_test.go → ...oke_test/java_native_image_gradle_test.go b/...ve-image/java_native_image_gradle_test.go → ...oke_test/java_native_image_gradle_test.go
@@ -1,4 +1,4 @@
-package java_test
+package native_image_test
 
 import (
 	"flag"
@@ -77,7 +77,7 @@ func testGradleWithBuilder(builder string) func(*testing.T, spec.G, spec.S) {
 			context("uses Gradle based Spring Boot app", func() {
 				it("builds successfully", func() {
 					var err error
-					source, err = occam.Source(filepath.Join(".", "java-native-image-sample-gradle"))
+					source, err = occam.Source(filepath.Join("../"))
 					Expect(err).NotTo(HaveOccurred())
 
 					var logs fmt.Stringer

diff --git a/.../java/io/paketo/demo/DemoApplication.java → .../java/io/paketo/demo/DemoApplication.java b/.../java/io/paketo/demo/DemoApplication.java → .../java/io/paketo/demo/DemoApplication.java
diff --git a/...src/main/resources/application.properties → ...src/main/resources/application.properties b/...src/main/resources/application.properties → ...src/main/resources/application.properties
diff --git a/.../io/paketo/demo/DemoApplicationTests.java → .../io/paketo/demo/DemoApplicationTests.java b/.../io/paketo/demo/DemoApplicationTests.java → .../io/paketo/demo/DemoApplicationTests.java
diff --git a/...image/java-native-image-sample/.gitignore → ...spring-boot-native-image-maven/.gitignore b/...image/java-native-image-sample/.gitignore → ...spring-boot-native-image-maven/.gitignore
diff --git a/.../.mvn/wrapper/MavenWrapperDownloader.java → .../.mvn/wrapper/MavenWrapperDownloader.java b/.../.mvn/wrapper/MavenWrapperDownloader.java → .../.mvn/wrapper/MavenWrapperDownloader.java
diff --git a/...tatic-main/.mvn/wrapper/maven-wrapper.jar → ...mage-maven/.mvn/wrapper/maven-wrapper.jar b/...tatic-main/.mvn/wrapper/maven-wrapper.jar → ...mage-maven/.mvn/wrapper/maven-wrapper.jar
diff --git a/...ain/.mvn/wrapper/maven-wrapper.properties → ...ven/.mvn/wrapper/maven-wrapper.properties b/...ain/.mvn/wrapper/maven-wrapper.properties → ...ven/.mvn/wrapper/maven-wrapper.properties
diff --git a/...-image/java-native-image-sample/README.md → .../spring-boot-native-image-maven/README.md b/...-image/java-native-image-sample/README.md → .../spring-boot-native-image-maven/README.md
diff --git a/...ative-image/java-native-image-sample/mvnw → ...image/spring-boot-native-image-maven/mvnw b/...ative-image/java-native-image-sample/mvnw → ...image/spring-boot-native-image-maven/mvnw
diff --git a/...e-image/java-native-image-sample/mvnw.cmd → ...e/spring-boot-native-image-maven/mvnw.cmd b/...e-image/java-native-image-sample/mvnw.cmd → ...e/spring-boot-native-image-maven/mvnw.cmd
diff --git a/...ve-image/java-native-image-sample/pom.xml → ...ge/spring-boot-native-image-maven/pom.xml b/...ve-image/java-native-image-sample/pom.xml → ...ge/spring-boot-native-image-maven/pom.xml
diff --git a/...ive-image/java_native_image_maven_test.go → ...moke_test/java_native_image_maven_test.go b/...ive-image/java_native_image_maven_test.go → ...moke_test/java_native_image_maven_test.go
@@ -1,7 +1,9 @@
-package java_test
+package native_image_test
 
 import (
+	"flag"
 	"fmt"
+	"github.com/paketo-buildpacks/samples/tests"
 	"os"
 	"path/filepath"
 	"testing"
@@ -15,6 +17,11 @@ import (
 	. "github.com/paketo-buildpacks/occam/matchers"
 )
 
+var builders tests.BuilderFlags
+
+func init() {
+	flag.Var(&builders, "name", "the name a builder to test with")
+}
 func TestJNIMaven(t *testing.T) {
 	Expect := NewWithT(t).Expect
 
@@ -69,7 +76,7 @@ func testMavenWithBuilder(builder string) func(*testing.T, spec.G, spec.S) {
 			context("uses Spring Boot app Maven", func() {
 				it("builds successfully", func() {
 					var err error
-					source, err = occam.Source(filepath.Join(".", "java-native-image-sample"))
+					source, err = occam.Source(filepath.Join("../"))
 					Expect(err).NotTo(HaveOccurred())
 
 					var logs fmt.Stringer

diff --git a/.../java/io/paketo/demo/DemoApplication.java → .../java/io/paketo/demo/DemoApplication.java b/.../java/io/paketo/demo/DemoApplication.java → .../java/io/paketo/demo/DemoApplication.java
diff --git a/...src/main/resources/application.properties → ...src/main/resources/application.properties b/...src/main/resources/application.properties → ...src/main/resources/application.properties
diff --git a/.../io/paketo/demo/DemoApplicationTests.java → .../io/paketo/demo/DemoApplicationTests.java b/.../io/paketo/demo/DemoApplicationTests.java → .../io/paketo/demo/DemoApplicationTests.java