use hierarchy

Author: rbri

src/main/java/org/htmlunit/html/HtmlButtonInput.java

@@ -83,4 +83,13 @@ protected boolean isRequiredSupported() {
     public boolean willValidate() {
         return false;
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected boolean isCustomValidityValid() {
+        return true;
+    }
+
 }

src/main/java/org/htmlunit/html/HtmlHiddenInput.java

@@ -89,4 +89,12 @@ protected boolean isRequiredSupported() {
     public boolean willValidate() {
         return false;
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected boolean isCustomValidityValid() {
+        return true;
+    }
 }

src/main/java/org/htmlunit/html/HtmlImageInput.java

@@ -14,6 +14,8 @@
  */
 package org.htmlunit.html;
 
+import static org.htmlunit.BrowserVersionFeatures.HTMLINPUT_TYPE_IMAGE_IGNORES_CUSTOM_VALIDITY;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -191,7 +193,22 @@ public void setDefaultValue(final String defaultValue) {
      */
     @Override
     public boolean willValidate() {
-        return false;
+        if (hasFeature(HTMLINPUT_TYPE_IMAGE_IGNORES_CUSTOM_VALIDITY)) {
+            return false;
+        }
+        return super.willValidate();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected boolean isCustomValidityValid() {
+        if (hasFeature(HTMLINPUT_TYPE_IMAGE_IGNORES_CUSTOM_VALIDITY)) {
+            return true;
+        }
+
+        return super.isCustomValidityValid();
     }
 
     /**

src/main/java/org/htmlunit/html/HtmlInput.java

@@ -14,13 +14,11 @@
  */
 package org.htmlunit.html;
 
-import static org.htmlunit.BrowserVersionFeatures.HTMLINPUT_TYPE_IMAGE_IGNORES_CUSTOM_VALIDITY;
 import static org.htmlunit.BrowserVersionFeatures.HTMLINPUT_TYPE_MONTH_SUPPORTED;
 import static org.htmlunit.BrowserVersionFeatures.HTMLINPUT_TYPE_WEEK_SUPPORTED;
 import static org.htmlunit.html.HtmlForm.ATTRIBUTE_FORMNOVALIDATE;
 
 import java.net.MalformedURLException;
-import java.util.Locale;
 import java.util.Map;
 
 import org.apache.commons.logging.Log;
@@ -865,16 +863,7 @@ && isMaxLengthValid() && isMinLengthValid()
     }
 
     protected boolean isCustomValidityValid() {
-        if (isCustomErrorValidityState()) {
-            final String type = getAttributeDirect(TYPE_ATTRIBUTE).toLowerCase(Locale.ROOT);
-            if (!"button".equals(type)
-                    && !"hidden".equals(type)
-                    && !"reset".equals(type)
-                    && !("image".equals(type) && hasFeature(HTMLINPUT_TYPE_IMAGE_IGNORES_CUSTOM_VALIDITY))) {
-                return false;
-            }
-        }
-        return true;
+        return !isCustomErrorValidityState();
     }
 
     @Override

src/main/java/org/htmlunit/html/HtmlResetInput.java

@@ -106,4 +106,12 @@ protected boolean isRequiredSupported() {
     public boolean willValidate() {
         return false;
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected boolean isCustomValidityValid() {
+        return true;
+    }
 }

src/test/java/org/htmlunit/javascript/host/html/HTMLInputElementTest.java

@@ -3549,9 +3549,8 @@ public void clearCustomValidity_restoresValid() throws Exception {
 //
 //        loadPageVerifyTitle2(html);
 //    }
-
     /**
-     * reportValidity() is untested anywhere in this file -- basic coverage that
+     * The reportValidity() is untested anywhere in this file -- basic coverage that
      * it returns the same boolean as checkValidity() for an input with a custom
      * validity message set.
      * @throws Exception if the test fails

src/test/java/org/htmlunit/javascript/host/html/HTMLObjectElement2Test.java

@@ -211,7 +211,7 @@ public void setCustomValidityDoesNotAffectCheckValidity() throws Exception {
 
         loadPageVerifyTitle2(html);
     }
-//
+
 //    /**
 //     * The validationMessage must always be empty on an <object>, even with a
 //     * custom validity message set and even when additionally barred via an