Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #5 from lessonz/master
[JENKINS-17318] resolved
  • Loading branch information
lessonz committed Aug 8, 2013
2 parents dbce1c7 + cdb7b0e commit eec2894
Show file tree
Hide file tree
Showing 7 changed files with 78 additions and 176 deletions.
206 changes: 35 additions & 171 deletions .classpath

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -3,3 +3,4 @@
.settings
target
work
/bin
11 changes: 10 additions & 1 deletion pom.xml
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>1.401</version>
<version>1.420</version>
</parent>
<profiles>
<profile>
Expand Down Expand Up @@ -93,5 +93,14 @@
<url>http://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>

<dependencies>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.0</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>

2 changes: 1 addition & 1 deletion src/main/java/hudson/plugins/fitnesse/FitnesseBuilder.java
Expand Up @@ -91,7 +91,7 @@ public String getFitnesseHost() {
public String getFitnesseHost(AbstractBuild<?,?> build) throws InterruptedException, IOException {
if (getFitnesseStart()){
EnvironmentVariablesNodeProperty prop = build.getBuiltOn().getNodeProperties().get(EnvironmentVariablesNodeProperty.class);
if (prop.getEnvVars()!=null && prop.getEnvVars().get(_HOSTNAME_SLAVE_PROPERTY)!=null){
if (prop!=null && prop.getEnvVars()!=null && prop.getEnvVars().get(_HOSTNAME_SLAVE_PROPERTY)!=null){
return prop.getEnvVars().get(_HOSTNAME_SLAVE_PROPERTY);
} else {
return _LOCALHOST;
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/hudson/plugins/fitnesse/FitnesseExecutor.java
Expand Up @@ -83,12 +83,13 @@ private Proc startFitnesse(AbstractBuild<?,?> build, Launcher launcher, EnvVars

public ArrayList<String> getJavaCmd(FilePath workingDirectory, EnvVars envVars) {
String java = "java";
if (envVars.containsKey("JAVA_HOME"))
java = new File(new File(envVars.get("JAVA_HOME"), "bin"), java).getAbsolutePath();
if(!builder.getFitnesseJdk().isEmpty()){
File customJavaHome = Hudson.getInstance().getJDK(builder.getFitnesseJdk()).getBinDir();
java = new File(customJavaHome, java).getAbsolutePath();
} else if (envVars.containsKey("JAVA_HOME")) {
java = new File(new File(envVars.get("JAVA_HOME"), "bin"), java).getAbsolutePath();
}

String fitnesseJavaOpts = builder.getFitnesseJavaOpts();
String[] java_opts = ("".equals(fitnesseJavaOpts) ? new String[0] : fitnesseJavaOpts.split(" "));

Expand Down
27 changes: 27 additions & 0 deletions src/test/java/hudson/plugins/fitnesse/FitnesseBuilderTest.java
@@ -1,10 +1,19 @@
package hudson.plugins.fitnesse;

import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
import hudson.model.AbstractBuild;
import hudson.model.Node;
import hudson.slaves.EnvironmentVariablesNodeProperty;
import hudson.util.DescribableList;

import java.io.File;
import java.io.IOException;
import java.util.HashMap;

import org.junit.Assert;
import org.junit.Test;
import org.mockito.Mockito;

public class FitnesseBuilderTest {
@Test
Expand Down Expand Up @@ -120,4 +129,22 @@ public void getJavaWorkingDirShouldBeEmptyIfFitnessseJarUnspecified() throws Exc
Assert.assertEquals("",
builder.getFitnesseJavaWorkingDirectory());
}

@SuppressWarnings("unchecked")
@Test
public void getFitnesseHostShouldNotThrowANullPointerWhenNodePropertyIsNull() throws InterruptedException, IOException {
@SuppressWarnings("rawtypes")
AbstractBuild build = Mockito.mock(AbstractBuild.class);
Node node = Mockito.mock(Node.class);
when(build.getBuiltOn()).thenReturn(node);
@SuppressWarnings("rawtypes")
DescribableList describableList = Mockito.mock(DescribableList.class);
when(node.getNodeProperties()).thenReturn(describableList);
when(describableList.get(EnvironmentVariablesNodeProperty.class)).thenReturn(null);

HashMap<String, String> options = new HashMap<String, String>();
options.put(FitnesseBuilder.START_FITNESSE, Boolean.toString(true));
FitnesseBuilder builder = new FitnesseBuilder(options);
assertEquals(FitnesseBuilder._LOCALHOST, builder.getFitnesseHost(build));
}
}
Expand Up @@ -168,6 +168,6 @@ public void durationShouldBeDifferenceBetweenEarliestAndLatestResults() {
FitnesseResults summary = new FitnesseResults((Counts)null);
summary.addChild(first);
summary.addChild(second);
Assert.assertEquals(1.0f, summary.getDuration());
Assert.assertEquals(1.0f, summary.getDuration(), 0.0);
}
}

0 comments on commit eec2894

Please sign in to comment.