using the newly introduced convenience method.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@14068 71c3de6d-444a-0410-be80-ed276b4c234a

test/src/test/java/hudson/PluginManagerTest.java

 package hudson;
 
+import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.apache.commons.io.FileUtils;
 import org.jvnet.hudson.test.HudsonTestCase;
 import org.jvnet.hudson.test.recipes.WithPlugin;
-import org.apache.commons.io.FileUtils;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlButton;
 
 import java.io.File;
 
@@ -23,7 +22,7 @@ public class PluginManagerTest extends HudsonTestCase {
         File plugin = new File(dir, "tasks.hpi");
         FileUtils.copyURLToFile(getClass().getClassLoader().getResource("plugins/tasks.hpi"),plugin);
         f.getInputByName("name").setValueAttribute(plugin.getAbsolutePath());
-        f.submit((HtmlButton)last(f.getHtmlElementsByTagName("button")));
+        submit(f);
 
         assertTrue( new File(hudson.getRootDir(),"plugins/tasks.hpi").exists() );
     }

test/src/test/java/hudson/bugs/DateConversionTest.java

 package hudson.bugs;
 
-import junit.framework.TestCase;
 import com.thoughtworks.xstream.converters.basic.DateConverter;
+import junit.framework.TestCase;
+import org.jvnet.hudson.test.Email;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
-import java.util.List;
-import java.util.ArrayList;
-
-import org.jvnet.hudson.test.Email;
 
 /**
  * Testing date conversion.

test/src/test/java/hudson/bugs/JnlpAccessWithSecuredHudsonTest.java

 package hudson.bugs;
 
+import com.gargoylesoftware.htmlunit.Page;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.xml.XmlPage;
-import com.gargoylesoftware.htmlunit.Page;
 import hudson.model.Node.Mode;
 import hudson.model.Slave;
 import hudson.slaves.JNLPLauncher;
@@ -10,8 +10,8 @@ import hudson.slaves.RetentionStrategy;
 import org.dom4j.Document;
 import org.dom4j.Element;
 import org.dom4j.io.DOMReader;
-import org.jvnet.hudson.test.HudsonTestCase;
 import org.jvnet.hudson.test.Email;
+import org.jvnet.hudson.test.HudsonTestCase;
 import org.jvnet.hudson.test.recipes.PresetData;
 import org.jvnet.hudson.test.recipes.PresetData.DataSet;
 

test/src/test/java/hudson/bugs/seasar/Operation2174Test.java

 package hudson.bugs.seasar;
 
-import com.gargoylesoftware.htmlunit.html.HtmlButton;
 import com.gargoylesoftware.htmlunit.html.HtmlForm;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import hudson.maven.MavenModuleSet;
@@ -32,8 +31,7 @@ public class Operation2174Test extends HudsonTestCase {
         // configure downstream build
         form.getInputByName(BuildTrigger.DESCRIPTOR.getJsonSafeClassName()).click();
         form.getInputByName("buildTrigger.childProjects").setValueAttribute("dp");
-
-        form.submit((HtmlButton)last(form.getHtmlElementsByTagName("button")));
+        submit(form);
 
         // verify that the relationship is set up
         BuildTrigger trigger = (BuildTrigger) up.getPublishersList().get(BuildTrigger.DESCRIPTOR);
@@ -42,7 +40,7 @@ public class Operation2174Test extends HudsonTestCase {
         // now go ahead and edit the downstream
         page = webClient.getPage(dp,"configure");
         form = page.getFormByName("config");
-        form.submit((HtmlButton)last(form.getHtmlElementsByTagName("button")));
+        submit(form);
 
         // verify that the relationship is set up
         trigger = (BuildTrigger) up.getPublishersList().get(BuildTrigger.DESCRIPTOR);

test/src/test/java/hudson/matrix/MatrixProjectTest.java

@@ -6,8 +6,8 @@ import hudson.tasks.Maven;
 import org.jvnet.hudson.test.HudsonTestCase;
 import org.jvnet.hudson.test.SingleFileSCM;
 
-import java.util.List;
 import java.io.IOException;
+import java.util.List;
 
 /**
  * @author Kohsuke Kawaguchi

test/src/test/java/hudson/maven/ModuleDependencyLocator.java

@@ -4,9 +4,9 @@ import hudson.ExtensionPoint;
 import org.apache.maven.project.MavenProject;
 
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.HashSet;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 /**

test/src/test/java/hudson/model/FreeStyleProjectTest.java

 package hudson.model;
 
-import org.jvnet.hudson.test.HudsonTestCase;
-import hudson.tasks.Shell;
-import hudson.tasks.Builder;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlButton;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import hudson.tasks.Builder;
+import hudson.tasks.Shell;
+import org.jvnet.hudson.test.HudsonTestCase;
 
 import java.util.List;
 
@@ -28,7 +27,7 @@ public class FreeStyleProjectTest extends HudsonTestCase {
         HtmlPage page = webClient.getPage(project,"configure");
 
         HtmlForm form = page.getFormByName("config");
-        form.submit((HtmlButton)last(form.getHtmlElementsByTagName("button")));
+        submit(form);
 
         List<Builder> builders = project.getBuilders();
         assertEquals(1,builders.size());

test/src/test/java/hudson/model/HudsonTest.java

 package hudson.model;
 
 import com.gargoylesoftware.htmlunit.Page;
-import com.gargoylesoftware.htmlunit.html.HtmlButton;
 import com.gargoylesoftware.htmlunit.html.HtmlElement;
 import com.gargoylesoftware.htmlunit.html.HtmlForm;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
@@ -32,7 +31,7 @@ public class HudsonTest extends HudsonTestCase {
         // just load the page and resubmit
         HtmlPage configPage = new WebClient().goTo("configure");
         HtmlForm form = configPage.getFormByName("config");
-        form.submit((HtmlButton)last(form.getHtmlElementsByTagName("button")));
+        submit(form);
 
         // make sure all the pieces are intact
         assertEquals(2,hudson.getNumExecutors());

test/src/test/java/hudson/model/JobPropertyTest.java

 package hudson.model;
 
+import com.gargoylesoftware.htmlunit.WebAssert;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import hudson.matrix.MatrixProject;
 import hudson.maven.MavenModuleSet;
-
 import org.jvnet.hudson.test.HudsonTestCase;
 
-import com.gargoylesoftware.htmlunit.WebAssert;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-
 public class JobPropertyTest extends HudsonTestCase {
 
     /**

test/src/test/java/hudson/model/QueueTest.java

 package hudson.model;
 
-import org.jvnet.hudson.test.HudsonTestCase;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.fileupload.FileItemFactory;
-import org.apache.commons.fileupload.FileUpload;
+import com.gargoylesoftware.htmlunit.html.HtmlFileInput;
+import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import hudson.util.XStream2;
 import org.apache.commons.fileupload.FileUploadException;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import org.apache.commons.io.FileUtils;
+import org.jvnet.hudson.test.HudsonTestCase;
 import org.mortbay.jetty.Server;
+import org.mortbay.jetty.bio.SocketConnector;
 import org.mortbay.jetty.servlet.ServletHandler;
 import org.mortbay.jetty.servlet.ServletHolder;
-import org.mortbay.jetty.bio.SocketConnector;
 
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
-import com.gargoylesoftware.htmlunit.Page;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlInput;
-import com.gargoylesoftware.htmlunit.html.HtmlFileInput;
-import hudson.util.XStream2;
-
 /**
  * @author Kohsuke Kawaguchi
  */

test/src/test/java/hudson/model/UserTestCase.java

 package hudson.model;
 
-import org.jvnet.hudson.test.HudsonTestCase;
-
 import com.gargoylesoftware.htmlunit.WebAssert;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.jvnet.hudson.test.HudsonTestCase;
 
 public class UserTestCase extends HudsonTestCase {
 

test/src/test/java/hudson/model/ViewTest.java

 package hudson.model;
 
+import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
+import com.gargoylesoftware.htmlunit.html.HtmlForm;
 import org.jvnet.hudson.test.Email;
 import org.jvnet.hudson.test.HudsonTestCase;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
 
 /**
  * @author Kohsuke Kawaguchi

test/src/test/java/hudson/pages/SystemConfigurationTestCase.java

 package hudson.pages;
 
-import static com.gargoylesoftware.htmlunit.WebAssert.*;
+import static com.gargoylesoftware.htmlunit.WebAssert.assertElementPresent;
+import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import hudson.model.PageDecorator;
-
 import net.sf.json.JSONObject;
-
 import org.jvnet.hudson.test.HudsonTestCase;
 import org.kohsuke.stapler.StaplerRequest;
 
-import com.gargoylesoftware.htmlunit.html.HtmlButton;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-
 public class SystemConfigurationTestCase extends HudsonTestCase {
 
     private PageDecoratorImpl pageDecoratorImpl;
@@ -35,7 +31,7 @@ public class SystemConfigurationTestCase extends HudsonTestCase {
         
         HtmlForm form = page.getFormByName("config");
         form.getInputByName("_.decoratorId").setValueAttribute("this_is_a_profile");
-        form.submit((HtmlButton)last(form.getHtmlElementsByTagName("button")));
+        submit(form);
         assertEquals("The decorator field was incorrect", "this_is_a_profile", pageDecoratorImpl.getDecoratorId());
     }
 

test/src/test/java/hudson/scm/SubversionSCMTest.java

@@ -3,7 +3,6 @@ package hudson.scm;
 import com.gargoylesoftware.htmlunit.ElementNotFoundException;
 import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
 import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
-import com.gargoylesoftware.htmlunit.html.HtmlButton;
 import com.gargoylesoftware.htmlunit.html.HtmlForm;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import hudson.model.FreeStyleBuild;
@@ -12,9 +11,9 @@ import hudson.model.Result;
 import org.dom4j.Document;
 import org.dom4j.io.DOMReader;
 import org.jvnet.hudson.test.Bug;
+import org.jvnet.hudson.test.Email;
 import org.jvnet.hudson.test.HudsonHomeLoader.CopyExisting;
 import org.jvnet.hudson.test.HudsonTestCase;
-import org.jvnet.hudson.test.Email;
 import org.jvnet.hudson.test.recipes.PresetData;
 import static org.jvnet.hudson.test.recipes.PresetData.DataSet.ANONYMOUS_READONLY;
 
@@ -73,7 +72,7 @@ public class SubversionSCMTest extends HudsonTestCase {
         wc.login("alice","alice");
         html = wc.getPage(b,"tagBuild/");
         HtmlForm form = html.getFormByName("tag");
-        form.submit((HtmlButton)last(form.getHtmlElementsByTagName("button")));
+        submit(form);
     }
 
     @Email("http://www.nabble.com/Hudson-1.266-and-1.267%3A-Subversion-authentication-broken--td21156950.html")

test/src/test/java/hudson/search/SearchTest.java

 package hudson.search;
 
-import org.jvnet.hudson.test.HudsonTestCase;
 import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
+import org.jvnet.hudson.test.HudsonTestCase;
 
 /**
  * @author Kohsuke Kawaguchi

test/src/test/java/hudson/tasks/AntTest.java

 package hudson.tasks;
 
-import org.jvnet.hudson.test.HudsonTestCase;
-import hudson.model.FreeStyleProject;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlButton;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import hudson.model.FreeStyleProject;
+import org.jvnet.hudson.test.HudsonTestCase;
 
 /**
  * @author Kohsuke Kawaguchi
@@ -21,7 +20,7 @@ public class AntTest extends HudsonTestCase {
         HtmlPage page = webClient.getPage(p,"configure");
 
         HtmlForm form = page.getFormByName("config");
-        form.submit((HtmlButton)last(form.getHtmlElementsByTagName("button")));
+        submit(form);
 
         Ant a = (Ant)p.getBuildersList().get(Ant.DESCRIPTOR);
         assertNotNull(a);

test/src/test/java/hudson/tasks/MavenTest.java

 package hudson.tasks;
 
-import com.gargoylesoftware.htmlunit.html.HtmlButton;
 import com.gargoylesoftware.htmlunit.html.HtmlForm;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import hudson.model.FreeStyleProject;
-import hudson.tasks.Maven.MavenInstallation;
 import org.jvnet.hudson.test.HudsonTestCase;
 
-import java.io.File;
-
 /**
  * @author Kohsuke Kawaguchi
  */
@@ -26,7 +22,7 @@ public class MavenTest extends HudsonTestCase {
         HtmlPage page = webClient.getPage(p,"configure");
 
         HtmlForm form = page.getFormByName("config");
-        form.submit((HtmlButton)last(form.getHtmlElementsByTagName("button")));
+        submit(form);
 
         Maven m = (Maven)p.getBuildersList().get(Maven.DESCRIPTOR);
         assertNotNull(m);

test/src/test/java/hudson/util/FormFieldValidatorTest.java

 package hudson.util;
 
-import org.jvnet.hudson.test.HudsonTestCase;
+import hudson.model.FreeStyleProject;
 import org.jvnet.hudson.test.Bug;
+import org.jvnet.hudson.test.HudsonTestCase;
 import org.jvnet.hudson.test.recipes.WithPlugin;
-import hudson.model.FreeStyleProject;
 
 /**
  * @author Kohsuke Kawaguchi