提交 731c9777 编写于 作者: C Christoph Kutzinski

fixed compiler warnings

上级 7bc2f51d
......@@ -3,7 +3,6 @@ package hudson.maven;
import hudson.Launcher;
import hudson.model.BuildListener;
import hudson.model.Result;
import hudson.model.Run;
import org.jvnet.hudson.test.Bug;
import org.jvnet.hudson.test.ExtractResourceSCM;
import org.jvnet.hudson.test.HudsonTestCase;
......@@ -20,12 +19,14 @@ public class AbortedMavenBuildTest extends HudsonTestCase {
project.getReporters().add(new AbortingReporter());
project.setGoals("clean");
project.setScm(new ExtractResourceSCM(getClass().getResource("maven-empty-mod.zip")));
Run build = project.scheduleBuild2(0).get();
MavenModuleSetBuild build = project.scheduleBuild2(0).get();
assertEquals(Result.ABORTED, build.getResult());
assertEquals(Result.ABORTED, wrapper.buildResultInTearDown);
}
private static class AbortingReporter extends MavenReporter {
private static final long serialVersionUID = 1L;
@Override
public boolean end(MavenBuild build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException {
throw new InterruptedException();
......
......@@ -21,7 +21,6 @@ package hudson.maven;
*/
import hudson.Launcher;
import hudson.maven.reporters.SurefireReport;
import hudson.model.*;
import hudson.tasks.Maven.MavenInstallation;
......@@ -30,7 +29,6 @@ import java.io.FilenameFilter;
import java.io.IOException;
import hudson.tasks.test.AbstractTestResultAction;
import hudson.tasks.test.TestResult;
import hudson.tasks.test.TestResultProjectAction;
import org.apache.commons.io.FileUtils;
import org.jvnet.hudson.test.Bug;
......
......@@ -148,9 +148,10 @@ public class MavenBuildTest extends HudsonTestCase {
}
private static class TestReporter extends MavenReporter {
private static final long serialVersionUID = 1L;
@Override
public boolean end(MavenBuild build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException {
assertNotNull(build.getProject().getWorkspace());
assertNotNull(build.getWorkspace());
return true;
}
......
......@@ -27,9 +27,10 @@ public class MavenEmptyModuleTest extends HudsonTestCase {
}
private static class TestReporter extends MavenReporter {
private static final long serialVersionUID = 1L;
@Override
public boolean end(MavenBuild build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException {
assertNotNull(build.getProject().getWorkspace());
assertNotNull(build.getWorkspace());
return true;
}
......
......@@ -8,13 +8,11 @@ import org.jvnet.hudson.test.ExtractResourceWithChangesSCM;
import org.jvnet.hudson.test.ExtractChangeLogSet;
import hudson.Launcher;
import hudson.maven.reporters.MavenArtifact;
import hudson.maven.reporters.MavenArtifactRecord;
import hudson.maven.reporters.MavenFingerprinter;
import hudson.model.AbstractBuild;
import hudson.model.BuildListener;
import hudson.model.Result;
import hudson.model.Run.Artifact;
import hudson.tasks.Fingerprinter.FingerprintAction;
import hudson.tasks.Maven.MavenInstallation;
......
......@@ -59,9 +59,10 @@ public class MavenMultiModuleTestIncremental extends HudsonTestCase {
}
private static class TestReporter extends MavenReporter {
private static final long serialVersionUID = 1L;
@Override
public boolean end(MavenBuild build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException {
assertNotNull(build.getProject().getWorkspace());
assertNotNull(build.getWorkspace());
return true;
}
......
......@@ -43,7 +43,7 @@ public class MavenOptsTest extends HudsonTestCase {
MavenModuleSet m = createMavenProject();
m.setScm(new ExtractResourceSCM(getClass().getResource("maven-opts-echo.zip")));
m.setGoals("validate");
m.DESCRIPTOR.setGlobalMavenOpts("-Dhudson.mavenOpt.test=bar");
MavenModuleSet.DESCRIPTOR.setGlobalMavenOpts("-Dhudson.mavenOpt.test=bar");
m.setAssignedLabel(createSlave(new EnvVars("MAVEN_OPTS", "-Dhudson.mavenOpt.test=foo")).getSelfLabel());
m.setMavenOpts("-Dhudson.mavenOpt.test=baz");
......@@ -58,7 +58,7 @@ public class MavenOptsTest extends HudsonTestCase {
MavenModuleSet m = createMavenProject();
m.setScm(new ExtractResourceSCM(getClass().getResource("maven-opts-echo.zip")));
m.setGoals("validate");
m.DESCRIPTOR.setGlobalMavenOpts("-Dhudson.mavenOpt.test=bar");
MavenModuleSet.DESCRIPTOR.setGlobalMavenOpts("-Dhudson.mavenOpt.test=bar");
buildAndAssertSuccess(m);
......@@ -70,7 +70,7 @@ public class MavenOptsTest extends HudsonTestCase {
MavenModuleSet m = createMavenProject();
m.setScm(new ExtractResourceSCM(getClass().getResource("maven-opts-echo.zip")));
m.setGoals("validate");
m.DESCRIPTOR.setGlobalMavenOpts("-Dhudson.mavenOpt.test=bar");
MavenModuleSet.DESCRIPTOR.setGlobalMavenOpts("-Dhudson.mavenOpt.test=bar");
m.setMavenOpts("-Dhudson.mavenOpt.test=foo");
buildAndAssertSuccess(m);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册