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 2b421579a6..6e99b6b0ca 100644 --- a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java +++ b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java @@ -28,12 +28,8 @@ import com.gargoylesoftware.htmlunit.javascript.HtmlUnitContextFactory; import com.gargoylesoftware.htmlunit.javascript.host.xml.XMLHttpRequest; import hudson.*; import hudson.Util; -import hudson.model.AbstractBuild; -import hudson.model.Computer; -import hudson.model.Executor; import hudson.model.*; import hudson.model.Queue.Executable; -import hudson.security.ACL; import hudson.security.AbstractPasswordBasedSecurityRealm; import hudson.security.GroupDetails; import hudson.security.SecurityRealm; @@ -103,7 +99,6 @@ import net.sourceforge.htmlunit.corejs.javascript.ContextFactory.Listener; import org.acegisecurity.AuthenticationException; import org.acegisecurity.BadCredentialsException; import org.acegisecurity.GrantedAuthority; -import org.acegisecurity.context.SecurityContextHolder; import org.acegisecurity.userdetails.UserDetails; import org.acegisecurity.userdetails.UsernameNotFoundException; import org.apache.commons.httpclient.NameValuePair; @@ -147,6 +142,9 @@ import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.WebRequestSettings; import com.gargoylesoftware.htmlunit.xml.XmlPage; import com.gargoylesoftware.htmlunit.html.*; +import hudson.maven.MavenBuild; +import hudson.maven.MavenModule; +import hudson.maven.MavenModuleSetBuild; import hudson.slaves.ComputerListener; import java.util.concurrent.CountDownLatch; @@ -747,11 +745,17 @@ public abstract class HudsonTestCase extends TestCase implements RootAction { } /** - * Should be unnecessary, but otherwise IntelliJ complains. + * Avoids need for cumbersome {@code this.buildAndAssertSuccess(...)} type hints under JDK 7 javac (and supposedly also IntelliJ). */ public FreeStyleBuild buildAndAssertSuccess(FreeStyleProject job) throws Exception { return assertBuildStatusSuccess(job.scheduleBuild2(0)); } + public MavenModuleSetBuild buildAndAssertSuccess(MavenModuleSet job) throws Exception { + return assertBuildStatusSuccess(job.scheduleBuild2(0)); + } + public MavenBuild buildAndAssertSuccess(MavenModule job) throws Exception { + return assertBuildStatusSuccess(job.scheduleBuild2(0)); + } /** * Asserts that the console output of the build contains the given substring. diff --git a/test/src/test/java/hudson/ExtensionListTest.java b/test/src/test/java/hudson/ExtensionListTest.java index 7e755becdd..659df8bb14 100644 --- a/test/src/test/java/hudson/ExtensionListTest.java +++ b/test/src/test/java/hudson/ExtensionListTest.java @@ -100,7 +100,7 @@ public class ExtensionListTest extends HudsonTestCase { public void testDescriptorLookup() throws Exception { Descriptor d = new Sishamo().getDescriptor(); - DescriptorExtensionList> list = hudson.getDescriptorList(Fish.class); + DescriptorExtensionList> list = hudson.>getDescriptorList(Fish.class); assertSame(d,list.get(Sishamo.DescriptorImpl.class)); assertSame(d,hudson.getDescriptor(Sishamo.class)); @@ -110,7 +110,7 @@ public class ExtensionListTest extends HudsonTestCase { // imagine that this is a static instance, like it is in many LIST static field in Hudson. DescriptorList LIST = new DescriptorList(Fish.class); - DescriptorExtensionList> list = hudson.getDescriptorList(Fish.class); + DescriptorExtensionList> list = hudson.>getDescriptorList(Fish.class); assertEquals(2,list.size()); assertNotNull(list.get(Tai.DescriptorImpl.class)); assertNotNull(list.get(Saba.DescriptorImpl.class)); diff --git a/test/src/test/java/lib/form/RepeatableTest.java b/test/src/test/java/lib/form/RepeatableTest.java index 271d56248b..aa7b2b2166 100644 --- a/test/src/test/java/lib/form/RepeatableTest.java +++ b/test/src/test/java/lib/form/RepeatableTest.java @@ -239,7 +239,7 @@ public class RepeatableTest extends HudsonTestCase { } public DescriptorExtensionList> getFruitDescriptors() { - return hudson.getDescriptorList(Fruit.class); + return hudson.>getDescriptorList(Fruit.class); } public void testDropdownList() throws Exception {