Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,31 @@ class JavaApplicationWithTestsFunctionalTest extends AbstractGraalVMMavenFunctio
""".trim()
}

def "can run tests in src/main/java in a native image with the Maven plugin"() {
withSample("java-application-with-tests-in-src-main")

when:
mvn '-Pnative', '-DquickBuild', 'test'

then:
buildSucceeded
outputContains "[junit-platform-native] Running in 'test listener' mode"
outputContains """
[ 3 containers found ]
[ 0 containers skipped ]
[ 3 containers started ]
[ 0 containers aborted ]
[ 3 containers successful ]
[ 0 containers failed ]
[ 6 tests found ]
[ 0 tests skipped ]
[ 6 tests started ]
[ 0 tests aborted ]
[ 6 tests successful ]
[ 0 tests failed ]
""".trim()
}

def "can run tests in a native image with the Maven plugin using shading"() {
withSample("java-application-with-tests")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
import org.graalvm.buildtools.utils.JUnitUtils;
import org.graalvm.buildtools.utils.NativeImageConfigurationUtils;

import java.io.File;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.nio.file.Files;
Expand Down Expand Up @@ -99,10 +100,13 @@ public class NativeTestMojo extends AbstractNativeImageMojo {
@Parameter(property = "skipNativeTests", defaultValue = "false")
private boolean skipNativeTests;

@Parameter(property = "testClassesDirectory", defaultValue = "${project.build.testOutputDirectory}")
private File testClassesDirectory;

@Override
protected void populateApplicationClasspath() throws MojoExecutionException {
super.populateApplicationClasspath();
imageClasspath.add(Paths.get(project.getBuild().getTestOutputDirectory()));
imageClasspath.add(testClassesDirectory.toPath());
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this is not a default location, should we print some "warning" where the tests come from (if the location is not default)? Maybe with logger.debug?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could log it but the Surefire plugin does not specifically log config settings (Surefire is basically the functionality you are copying). If you run a Maven build with debug (i.e. -X) then it logs all the plugin configs before they execute anyway.

project.getBuild()
.getTestResources()
.stream()
Expand Down Expand Up @@ -217,7 +221,7 @@ private void applyPluginProperties(Xpp3Dom pluginProperty, Map<String, String> v
}

private boolean hasTests() {
Path testOutputPath = Paths.get(project.getBuild().getTestOutputDirectory());
Path testOutputPath = testClassesDirectory.toPath();
if (Files.exists(testOutputPath) && Files.isDirectory(testOutputPath)) {
try (Stream<Path> testClasses = Files.walk(testOutputPath)) {
return testClasses.anyMatch(p -> p.getFileName().toString().endsWith(".class"));
Expand Down
66 changes: 66 additions & 0 deletions samples/java-application-with-tests-in-src-main/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
/*
* Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* The Universal Permissive License (UPL), Version 1.0
*
* Subject to the condition set forth below, permission is hereby granted to any
* person obtaining a copy of this software, associated documentation and/or
* data (collectively the "Software"), free of charge and under any and all
* copyright rights in the Software, and any and all patent rights owned or
* freely licensable by each licensor hereunder covering either (i) the
* unmodified Software as contributed to or provided by such licensor, or (ii)
* the Larger Works (as defined below), to deal in both
*
* (a) the Software, and
*
* (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
* one is included with the Software each a "Larger Work" to which the Software
* is contributed by such licensors),
*
* without restriction, including without limitation the rights to copy, create
* derivative works of, display, perform, and distribute the Software and make,
* use, sell, offer for sale, import, export, have made, and have sold the
* Software and the Larger Work(s), and to sublicense the foregoing rights on
* either these or other terms.
*
* This license is subject to the following condition:
*
* The above copyright notice and either this complete permission notice or at a
* minimum a reference to the UPL must be included in all copies or substantial
* portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/

plugins {
id 'application'
id 'org.graalvm.buildtools.native'
}

repositories {
mavenCentral()
}

application {
mainClass.set('org.graalvm.demo.Application')
}

def junitVersion = providers.gradleProperty('junit.jupiter.version')
.get()

dependencies {
testImplementation(platform("org.junit:junit-bom:${junitVersion}"))
testImplementation('org.junit.jupiter:junit-jupiter')
testRuntimeOnly('org.junit.platform:junit-platform-launcher')
}

test {
useJUnitPlatform()
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
native.gradle.plugin.version = 0.11.1-SNAPSHOT
junit.jupiter.version = 5.13.0
junit.platform.version = 1.13.0
Loading