mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-16 21:42:27 +00:00
JDK 7 compilation errors.
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32043 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
1 parent
f70596e54f
commit
9256afec53
3 files changed
+13
-9
No files matched your search
@@ -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.<J,R>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.
|
||||
|
||||
Reference in new issue
Block a user