From c8fbc6767203c5dc71f116a2fdf350e78564280d Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sun, 19 Dec 2010 15:04:54 +0100 Subject: [PATCH] add a simple test case with a maven 3 build --- core/src/main/java/hudson/tasks/Maven.java | 1 + .../org/jvnet/hudson/test/HudsonTestCase.java | 6 ++- .../java/hudson/maven/Maven3BuildTest.java | 38 ++++++++++++++++++ .../resources/hudson/maven/maven3-project.zip | Bin 0 -> 7395 bytes 4 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 test/src/test/java/hudson/maven/Maven3BuildTest.java create mode 100644 test/src/test/resources/hudson/maven/maven3-project.zip diff --git a/core/src/main/java/hudson/tasks/Maven.java b/core/src/main/java/hudson/tasks/Maven.java index dc5b5fc3ee..aeb19f7d48 100644 --- a/core/src/main/java/hudson/tasks/Maven.java +++ b/core/src/main/java/hudson/tasks/Maven.java @@ -362,6 +362,7 @@ public class Maven extends Builder { */ public static final int MAVEN_20 = 0; public static final int MAVEN_21 = 1; + public static final int MAVEN_30 = 2; /** diff --git a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java index 5a580cac39..e8b7b225fb 100644 --- a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java +++ b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java @@ -394,9 +394,13 @@ public abstract class HudsonTestCase extends TestCase implements RootAction { * Returns the older default Maven, while still allowing specification of other bundled Mavens. */ protected MavenInstallation configureDefaultMaven() throws Exception { - return configureDefaultMaven("apache-maven-2.2.1", MavenInstallation.MAVEN_20); + return configureDefaultMaven("apache-maven-2.2.1", MavenInstallation.MAVEN_20); } + protected MavenInstallation configureMaven3() throws Exception { + return configureDefaultMaven("apache-maven-3.0.1", MavenInstallation.MAVEN_30); + } + /** * Locates Maven2 and configure that as the only Maven in the system. */ diff --git a/test/src/test/java/hudson/maven/Maven3BuildTest.java b/test/src/test/java/hudson/maven/Maven3BuildTest.java new file mode 100644 index 0000000000..f9d5f5c0b2 --- /dev/null +++ b/test/src/test/java/hudson/maven/Maven3BuildTest.java @@ -0,0 +1,38 @@ +package hudson.maven; + +import hudson.Launcher; +import hudson.model.BuildListener; + +import java.io.IOException; + +import org.jvnet.hudson.test.ExtractResourceSCM; +import org.jvnet.hudson.test.HudsonTestCase; + +/** + * @author Olivier Lamy + */ +public class Maven3BuildTest extends HudsonTestCase { + + /** + * NPE in {@code build.getProject().getWorkspace()} for {@link MavenBuild}. + */ + public void testSimpleMaven3Build() throws Exception { + configureMaven3(); + MavenModuleSet m = createMavenProject(); + m.getReporters().add(new TestReporter()); + m.setScm(new ExtractResourceSCM(getClass().getResource("maven3-project.zip"))); + buildAndAssertSuccess(m); + } + + + + private static class TestReporter extends MavenReporter { + @Override + public boolean end(MavenBuild build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException { + assertNotNull(build.getProject().getWorkspace()); + assertNotNull(build.getWorkspace()); + return true; + } + } + +} diff --git a/test/src/test/resources/hudson/maven/maven3-project.zip b/test/src/test/resources/hudson/maven/maven3-project.zip new file mode 100644 index 0000000000000000000000000000000000000000..2701bb5b428c6468a261b4141e3310817532ff64 GIT binary patch literal 7395 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