Add prefab values for java.nio.charset.Charset

jqno · Feb 8, 2021 · c23335c · c23335c
1 parent a7673b7
commit c23335c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/project/checkstyle-config.xml b/project/checkstyle-config.xml
@@ -43,7 +43,9 @@
         <module name="EmptyCatchBlock"/>
         <module name="EmptyStatement"/>
         <module name="EqualsAvoidNull"/>
-        <module name="ExecutableStatementCount"/>
+        <module name="ExecutableStatementCount">
+            <property name="max" value="31"/>
+        </module>
         <module name="FallThrough"/>
         <module name="FinalClass"/>
         <module name="HiddenField">

diff --git a/src/main/java/nl/jqno/equalsverifier/internal/prefabvalues/JavaApiPrefabValues.java b/src/main/java/nl/jqno/equalsverifier/internal/prefabvalues/JavaApiPrefabValues.java
@@ -14,6 +14,8 @@
 import java.net.*;
 import java.net.InetSocketAddress;
 import java.nio.*;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.text.DateFormat;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
@@ -156,6 +158,12 @@ private void addPrimitiveClasses() {
     private void addCommonClasses() {
         addValues(BigDecimal.class, BigDecimal.ZERO, BigDecimal.ONE, BigDecimal.ZERO);
         addValues(BigInteger.class, BigInteger.ZERO, BigInteger.ONE, BigInteger.ZERO);
+        addValues(
+            Charset.class,
+            StandardCharsets.UTF_8,
+            StandardCharsets.US_ASCII,
+            StandardCharsets.UTF_8
+        );
         addValues(File.class, new File(""), new File("/"), new File(""));
         addValues(Formatter.class, new Formatter(), new Formatter(), new Formatter());
         addValues(Locale.class, new Locale("nl"), new Locale("hu"), new Locale("nl"));

diff --git a/src/test/java/nl/jqno/equalsverifier/integration/extended_contract/JavaApiClassesTest.java b/src/test/java/nl/jqno/equalsverifier/integration/extended_contract/JavaApiClassesTest.java
@@ -10,6 +10,7 @@
 import java.lang.reflect.Method;
 import java.net.*;
 import java.nio.*;
+import java.nio.charset.Charset;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
@@ -441,6 +442,7 @@ static final class CommonClassesContainer {
         private final java.sql.Timestamp sqlTimestamp;
         private final Currency currency;
         private final EventObject eventObject;
+        private final Charset charset;
 
         public CommonClassesContainer(
             String string,
@@ -466,7 +468,8 @@ public CommonClassesContainer(
             java.sql.Time sqlTime,
             java.sql.Timestamp sqlTimestamp,
             Currency currency,
-            EventObject eventObject
+            EventObject eventObject,
+            Charset charset
         ) {
             this.string = string;
             this.integer = integer;
@@ -492,6 +495,7 @@ public CommonClassesContainer(
             this.sqlTimestamp = sqlTimestamp;
             this.currency = currency;
             this.eventObject = eventObject;
+            this.charset = charset;
         }
 
         @Override