Enable Checkstyle runs against test sources. (#577)

metafacture · Jan 29, 2025 · 01a7351 · 01a7351
1 parent 9ed5d4e
commit 01a7351
Show file tree

Hide file tree

Showing 157 changed files with 2,655 additions and 2,316 deletions.
diff --git a/build.gradle b/build.gradle
@@ -166,7 +166,6 @@ subprojects {
 
   checkstyle {
     toolVersion '10.21.2'
-    checkstyleTest.enabled = false
   }
 
   test {

diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
@@ -86,7 +86,9 @@
         <module name="MagicNumber"/>
         <module name="MemberName"/>
         <module name="MethodLength"/>
-        <module name="MethodName"/>
+        <module name="MethodName">
+            <property name="format" value="^(?:issue[0-9]+_)*[a-z][a-zA-Z0-9]*$"/>
+        </module>
         <module name="MethodParamPad"/>
         <module name="MethodTypeParameterName"/>
         <module name="MissingCtor"/>

diff --git a/metafacture-biblio/src/test/java/org/metafacture/biblio/AlephMabXmlHandlerTest.java b/metafacture-biblio/src/test/java/org/metafacture/biblio/AlephMabXmlHandlerTest.java
@@ -16,10 +16,11 @@
 
 package org.metafacture.biblio;
 
+import org.metafacture.framework.StreamReceiver;
+
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import org.metafacture.framework.StreamReceiver;
 import org.mockito.InOrder;
 import org.mockito.Mock;
 import org.mockito.Mockito;
@@ -44,6 +45,9 @@ public final class AlephMabXmlHandlerTest {
 
     private AlephMabXmlHandler mabXmlHandler;
 
+    public AlephMabXmlHandlerTest() {
+    }
+
     @Before
     public void setup() {
         mabXmlHandler = new AlephMabXmlHandler();

diff --git a/metafacture-biblio/src/test/java/org/metafacture/biblio/AseqDecoderTest.java b/metafacture-biblio/src/test/java/org/metafacture/biblio/AseqDecoderTest.java
@@ -16,15 +16,14 @@
 
 package org.metafacture.biblio;
 
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.never;
+import org.metafacture.framework.StreamReceiver;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.metafacture.framework.StreamReceiver;
 import org.mockito.InOrder;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 
 /**
@@ -41,7 +40,7 @@ public final class AseqDecoderTest {
 
     private static final String FIELD_LDR = " LDR   L 00235nM2.01000024------h";
 
-    private static final String FIELD_001_a_TEST = " 001   L $$atest";
+    private static final String FIELD_001_A_TEST = " 001   L $$atest";
 
     private static final String FIELD_200_TEST = "001304760 200   L $$kAckermann-Gemeinde$$9(DE-588)39042-2";
 
@@ -52,6 +51,9 @@ public final class AseqDecoderTest {
     @Mock
     private StreamReceiver receiver;
 
+    public AseqDecoderTest() {
+    }
+
     @Before
     public void setup() {
         MockitoAnnotations.initMocks(this);
@@ -68,42 +70,42 @@ public void cleanup() {
     public void shouldReturnRecordId() {
         this.aseqDecoder.process(RECORD_ID + FIELD_LDR);
 
-        final InOrder ordered = inOrder(this.receiver);
+        final InOrder ordered = Mockito.inOrder(this.receiver);
         ordered.verify(this.receiver).startRecord(RECORD_ID);
     }
 
     @Test
     public void testShouldParseRecordStartingWithRecordMarker() {
         this.aseqDecoder.process(RECORD_ID + FIELD_LDR);
 
-        final InOrder ordered = inOrder(this.receiver);
+        final InOrder ordered = Mockito.inOrder(this.receiver);
         ordered.verify(this.receiver).startRecord(RECORD_ID);
         verifyLdrTest(ordered);
         ordered.verify(this.receiver).endRecord();
     }
 
     @Test
     public void testShouldParseRecordWithTwoFields() {
-        this.aseqDecoder.process(RECORD_ID + FIELD_LDR + FIELD_MARKER
-                + RECORD_ID + FIELD_001_a_TEST + FIELD_MARKER + FIELD_200_TEST);
-        final InOrder ordered = inOrder(this.receiver);
+        this.aseqDecoder.process(RECORD_ID + FIELD_LDR + FIELD_MARKER +
+                RECORD_ID + FIELD_001_A_TEST + FIELD_MARKER + FIELD_200_TEST);
+        final InOrder ordered = Mockito.inOrder(this.receiver);
         ordered.verify(this.receiver).startRecord(RECORD_ID);
         verifyLdrTest(ordered);
-        verify001_a_Test(ordered);
+        verify001aTest(ordered);
         verify200(ordered);
         ordered.verify(this.receiver).endRecord();
     }
 
     private void verify200(final InOrder ordered) {
         ordered.verify(this.receiver).startEntity("200");
-        ordered.verify(this.receiver, never())
+        ordered.verify(this.receiver, Mockito.never())
                 .literal("0", "01304760 200   L ");
         ordered.verify(this.receiver).literal("k", "Ackermann-Gemeinde");
         ordered.verify(this.receiver).literal("9", "(DE-588)39042-2");
         ordered.verify(this.receiver).endEntity();
     }
 
-    private void verify001_a_Test(final InOrder ordered) {
+    private void verify001aTest(final InOrder ordered) {
         ordered.verify(this.receiver).startEntity("001");
         ordered.verify(this.receiver).literal("a", "test");
         ordered.verify(this.receiver).endEntity();

diff --git a/metafacture-biblio/src/test/java/org/metafacture/biblio/ComarcXmlHandlerTest.java b/metafacture-biblio/src/test/java/org/metafacture/biblio/ComarcXmlHandlerTest.java
@@ -16,13 +16,13 @@
 
 package org.metafacture.biblio;
 
-import static org.mockito.Mockito.verify;
-
 import org.metafacture.framework.StreamReceiver;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.AttributesImpl;
@@ -45,6 +45,9 @@ public final class ComarcXmlHandlerTest {
     @Mock
     private StreamReceiver receiver;
 
+    public ComarcXmlHandlerTest() {
+    }
+
     @Before
     public void setup() {
         MockitoAnnotations.initMocks(this);
@@ -80,9 +83,9 @@ public void shouldSetIdFrom000SubfieldX() throws SAXException {
         this.comarcXmlHandler.endElement(NAMESPACE, DATAFIELD, "");
         this.comarcXmlHandler.endElement(NAMESPACE, RECORD, "");
 
-        verify(this.receiver).literal("x", fieldValue);
-        verify(this.receiver).startRecord(fieldValue);
-        verify(this.receiver).endRecord();
+        Mockito.verify(this.receiver).literal("x", fieldValue);
+        Mockito.verify(this.receiver).startRecord(fieldValue);
+        Mockito.verify(this.receiver).endRecord();
     }
 
     @Test
@@ -114,10 +117,10 @@ public void shouldAcceptRepeatableSubfields() throws SAXException {
         this.comarcXmlHandler.endElement(NAMESPACE, DATAFIELD, "");
         this.comarcXmlHandler.endElement(NAMESPACE, RECORD, "");
 
-        verify(this.receiver).literal("x", fieldValue1);
-        verify(this.receiver).literal("x", fieldValue2);
-        verify(this.receiver).startRecord(fieldValue1);
-        verify(this.receiver).endRecord();
+        Mockito.verify(this.receiver).literal("x", fieldValue1);
+        Mockito.verify(this.receiver).literal("x", fieldValue2);
+        Mockito.verify(this.receiver).startRecord(fieldValue1);
+        Mockito.verify(this.receiver).endRecord();
     }
 
     @Test
@@ -170,13 +173,13 @@ public void shouldReadTwoFields() throws SAXException {
 
         this.comarcXmlHandler.endElement(NAMESPACE, RECORD, "");
 
-        verify(this.receiver).literal("x", fieldValue1);
-        verify(this.receiver).literal("x", fieldValue2);
-        verify(this.receiver).startRecord(fieldValue1);
-        verify(this.receiver).endRecord();
-        verify(this.receiver).startEntity("000  ");
-        verify(this.receiver).startEntity("001 2");
-        verify(this.receiver).literal("a", fieldValue1);
+        Mockito.verify(this.receiver).literal("x", fieldValue1);
+        Mockito.verify(this.receiver).literal("x", fieldValue2);
+        Mockito.verify(this.receiver).startRecord(fieldValue1);
+        Mockito.verify(this.receiver).endRecord();
+        Mockito.verify(this.receiver).startEntity("000  ");
+        Mockito.verify(this.receiver).startEntity("001 2");
+        Mockito.verify(this.receiver).literal("a", fieldValue1);
     }
 
 }
diff --git a/metafacture-biblio/src/test/java/org/metafacture/biblio/MabDecoderTest.java b/metafacture-biblio/src/test/java/org/metafacture/biblio/MabDecoderTest.java
@@ -16,15 +16,13 @@
 
 package org.metafacture.biblio;
 
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
+import org.metafacture.framework.StreamReceiver;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.metafacture.framework.StreamReceiver;
 import org.mockito.InOrder;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 
 /**
@@ -41,6 +39,9 @@ public final class MabDecoderTest {
 
     private MabDecoder mabDecoder;
 
+    public MabDecoderTest() {
+    }
+
     @Before
     public void setup() {
         MockitoAnnotations.initMocks(this);
@@ -56,7 +57,7 @@ public void shouldParseMabRecord() {
                 "705b\u001FcSubfield 3\u001FdSubfield 4\u001E" +
                 "\u001D");
 
-        final InOrder ordered = inOrder(receiver);
+        final InOrder ordered = Mockito.inOrder(receiver);
         ordered.verify(receiver).startRecord("1234");
         ordered.verify(receiver).literal("001", "1234");
         ordered.verify(receiver).startEntity("705a");
@@ -75,8 +76,8 @@ public void shouldSkipWhitespaceOnlyInput() {
         mabDecoder.process("   ");
         mabDecoder.closeStream();
 
-        verify(receiver).closeStream();
-        verifyNoMoreInteractions(receiver);
+        Mockito.verify(receiver).closeStream();
+        Mockito.verifyNoMoreInteractions(receiver);
     }
 
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -166,7 +166,6 @@ subprojects { @@
       checkstyle {
         toolVersion '10.21.2'
-        checkstyleTest.enabled = false
       }
       test {
@@ Expand Down @@