From abb9141547923710a2a945d755b7ff9cc787f148 Mon Sep 17 00:00:00 2001
From: Tim Jacomb <timjacomb1@gmail.com>
Date: Sun, 4 Jun 2023 23:36:19 +0100
Subject: [PATCH] Upgrade HtmlUnit from 2.x to 3.x

---
 pom.xml                                       |  2 +-
 ...MantisProjectPropertyConfigSubmitTest.java | 26 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index f8dfca6..c987af7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>1.580.3</version>
+        <version>4.66</version>
     </parent>
 
     <artifactId>mantis</artifactId>
diff --git a/src/test/java/hudson/plugins/mantis/MantisProjectPropertyConfigSubmitTest.java b/src/test/java/hudson/plugins/mantis/MantisProjectPropertyConfigSubmitTest.java
index 0824019..348448c 100644
--- a/src/test/java/hudson/plugins/mantis/MantisProjectPropertyConfigSubmitTest.java
+++ b/src/test/java/hudson/plugins/mantis/MantisProjectPropertyConfigSubmitTest.java
@@ -1,7 +1,7 @@
 package hudson.plugins.mantis;
 
-import com.gargoylesoftware.htmlunit.html.HtmlButton;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import org.htmlunit.html.HtmlButton;
+import org.htmlunit.html.HtmlForm;
 import hudson.model.JobProperty;
 import java.net.URL;
 import jenkins.model.Jenkins;
@@ -43,12 +43,12 @@ public void testConfigSubmit_001() throws Exception {
         
         HtmlForm form = webClient.goTo("configure").getFormByName("config");
         
-        assertEquals("http://localhost/mantis/", form.getInputByName("m.url").getValueAttribute());
-        assertEquals("V110", form.getSelectByName("m.version").getSelectedOptions().get(0).getValueAttribute());
-        assertEquals(s.getUserName(), form.getInputByName("m.userName").getValueAttribute());
-        assertEquals(s.getSecretPassword().getEncryptedValue(), form.getInputByName("m.password").getValueAttribute());
-        assertEquals(s.getBasicUserName(), form.getInputByName("m.basicUserName").getValueAttribute());
-        assertEquals(s.getSecretBasicPassword().getEncryptedValue(), form.getInputByName("m.basicPassword").getValueAttribute());
+        assertEquals("http://localhost/mantis/", form.getInputByName("m.url").getValue());
+        assertEquals("V110", form.getSelectByName("m.version").getSelectedOptions().get(0).getValue());
+        assertEquals(s.getUserName(), form.getInputByName("m.userName").getValue());
+        assertEquals(s.getSecretPassword().getEncryptedValue(), form.getInputByName("m.password").getValue());
+        assertEquals(s.getBasicUserName(), form.getInputByName("m.basicUserName").getValue());
+        assertEquals(s.getSecretBasicPassword().getEncryptedValue(), form.getInputByName("m.basicPassword").getValue());
         
     }
 
@@ -63,12 +63,12 @@ public void testConfigSubmit_002() throws Exception {
         
         HtmlForm form = webClient.goTo("configure").getFormByName("config");
         
-        form.getInputByName("m.url").setValueAttribute("http://bacons.ddo.jp/mantis/");
+        form.getInputByName("m.url").setValue("http://bacons.ddo.jp/mantis/");
         form.getSelectByName("m.version").setSelectedAttribute("V120", true);
-        form.getInputByName("m.userName").setValueAttribute("mantis");
-        form.getInputByName("m.password").setValueAttribute("mantis");
-        form.getInputByName("m.basicUserName").setValueAttribute("mantis");
-        form.getInputByName("m.basicPassword").setValueAttribute("mantis");
+        form.getInputByName("m.userName").setValue("mantis");
+        form.getInputByName("m.password").setValue("mantis");
+        form.getInputByName("m.basicUserName").setValue("mantis");
+        form.getInputByName("m.basicPassword").setValue("mantis");
         
         form.submit((HtmlButton)last(form.getHtmlElementsByTagName("button")));