Skip to content

Use same JVM that maven is using. #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 8, 2019
Merged

Use same JVM that maven is using. #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0c75e97
Use same JVM that maven is using.
cstroe May 25, 2017
0c1fb65
add tests around MojoUtils.getJvm
cstroe May 31, 2017
a126f76
correctly restore system property as to not affect other tests
cstroe May 31, 2017
fe598ec
don't fight with the Scala type engine, mark methods as void returning
cstroe May 31, 2017
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
32 changes: 11 additions & 21 deletions src/main/java/org/scalatest/tools/maven/AbstractScalaTestMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,21 @@

import org.apache.maven.artifact.DependencyResolutionRequiredException;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.cli.CommandLineException;
import org.codehaus.plexus.util.cli.CommandLineTimeOutException;
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
import org.codehaus.plexus.util.cli.StreamConsumer;
import org.codehaus.plexus.util.cli.*;

import static org.scalatest.tools.maven.MojoUtils.*;

import java.io.*;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;

import static java.util.Collections.singletonList;

import java.net.MalformedURLException;
import java.net.URLClassLoader;
import java.net.URL;
import java.io.File;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.*;

import static java.util.Collections.singletonList;
import static org.apache.commons.lang3.StringUtils.isEmpty;
import static org.scalatest.tools.maven.MojoUtils.*;

/**
* Provides the base for all mojos.
Expand Down Expand Up @@ -270,7 +260,7 @@ private boolean runForkingOnce(String[] args) throws MojoFailureException {

final Commandline cli = new Commandline();
cli.setWorkingDirectory(project.getBasedir());
cli.setExecutable("java");
cli.setExecutable(getJvm());

// Set up environment
if (environmentVariables != null) {
Expand Down
11 changes: 10 additions & 1 deletion src/main/java/org/scalatest/tools/maven/MojoUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
import java.util.List;
import java.util.ArrayList;
import java.io.File;
import java.io.IOException;

import static org.apache.commons.lang3.StringUtils.isEmpty;

/**
* Provides internal utilities for the Mojo's operations.
Expand Down Expand Up @@ -121,4 +122,12 @@ static String[] concat(List<String>...lists){
}
return c.toArray(new String[c.size()]);
}

static String getJvm() {
if (!isEmpty(System.getProperty( "java.home" ))) {
return System.getProperty( "java.home" ) + File.separator + "bin" + File.separator + "java";
} else {
return "java";
}
}
}
32 changes: 32 additions & 0 deletions src/test/scala/org/scalatest/tools/maven/MojoUtilsTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package org.scalatest.tools.maven

import org.junit.{After, Before, Test}

class MojoUtilsTest {
private var savedJavaHome: Option[String] = _

@Before
def save(): Unit = {
savedJavaHome = Option(System.getProperty("java.home"))
}

@After
def restore(): Unit = {
savedJavaHome match {
case None => System.clearProperty("java.home")
case Some(value) => System.setProperty("java.home", value)
}
}

@Test
def getJvmHappyPath(): Unit = {
System.setProperty("java.home", "/test/jvm")
assert(MojoUtils.getJvm == "/test/jvm/bin/java")
}

@Test
def getJvmWithoutJavaHome(): Unit = {
System.clearProperty("java.home")
assert(MojoUtils.getJvm == "java")
}
}