Skip to content

Commit 01a7351

Browse files
blackwinterblackwinter
committed
Enable Checkstyle runs against test sources. (#577)
1 parent 9ed5d4e commit 01a7351

File tree

157 files changed

+2655
-2316
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+2655
-2316
lines changed

‎build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ subprojects {
166166

167167
checkstyle {
168168
toolVersion '10.21.2'
169-
checkstyleTest.enabled = false
170169
}
171170

172171
test {

‎config/checkstyle/checkstyle.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@
8686
<module name="MagicNumber"/>
8787
<module name="MemberName"/>
8888
<module name="MethodLength"/>
89-
<module name="MethodName"/>
89+
<module name="MethodName">
90+
<property name="format" value="^(?:issue[0-9]+_)*[a-z][a-zA-Z0-9]*$"/>
91+
</module>
9092
<module name="MethodParamPad"/>
9193
<module name="MethodTypeParameterName"/>
9294
<module name="MissingCtor"/>

‎metafacture-biblio/src/test/java/org/metafacture/biblio/AlephMabXmlHandlerTest.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616

1717
package org.metafacture.biblio;
1818

19+
import org.metafacture.framework.StreamReceiver;
20+
1921
import org.junit.Before;
2022
import org.junit.Rule;
2123
import org.junit.Test;
22-
import org.metafacture.framework.StreamReceiver;
2324
import org.mockito.InOrder;
2425
import org.mockito.Mock;
2526
import org.mockito.Mockito;
@@ -44,6 +45,9 @@ public final class AlephMabXmlHandlerTest {
4445

4546
private AlephMabXmlHandler mabXmlHandler;
4647

48+
public AlephMabXmlHandlerTest() {
49+
}
50+
4751
@Before
4852
public void setup() {
4953
mabXmlHandler = new AlephMabXmlHandler();

‎metafacture-biblio/src/test/java/org/metafacture/biblio/AseqDecoderTest.java‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@
1616

1717
package org.metafacture.biblio;
1818

19-
import static org.mockito.Mockito.inOrder;
20-
import static org.mockito.Mockito.never;
19+
import org.metafacture.framework.StreamReceiver;
2120

2221
import org.junit.After;
2322
import org.junit.Before;
2423
import org.junit.Test;
25-
import org.metafacture.framework.StreamReceiver;
2624
import org.mockito.InOrder;
2725
import org.mockito.Mock;
26+
import org.mockito.Mockito;
2827
import org.mockito.MockitoAnnotations;
2928

3029
/**
@@ -41,7 +40,7 @@ public final class AseqDecoderTest {
4140

4241
private static final String FIELD_LDR = " LDR L 00235nM2.01000024------h";
4342

44-
private static final String FIELD_001_a_TEST = " 001 L $$atest";
43+
private static final String FIELD_001_A_TEST = " 001 L $$atest";
4544

4645
private static final String FIELD_200_TEST = "001304760 200 L $$kAckermann-Gemeinde$$9(DE-588)39042-2";
4746

@@ -52,6 +51,9 @@ public final class AseqDecoderTest {
5251
@Mock
5352
private StreamReceiver receiver;
5453

54+
public AseqDecoderTest() {
55+
}
56+
5557
@Before
5658
public void setup() {
5759
MockitoAnnotations.initMocks(this);
@@ -68,42 +70,42 @@ public void cleanup() {
6870
public void shouldReturnRecordId() {
6971
this.aseqDecoder.process(RECORD_ID + FIELD_LDR);
7072

71-
final InOrder ordered = inOrder(this.receiver);
73+
final InOrder ordered = Mockito.inOrder(this.receiver);
7274
ordered.verify(this.receiver).startRecord(RECORD_ID);
7375
}
7476

7577
@Test
7678
public void testShouldParseRecordStartingWithRecordMarker() {
7779
this.aseqDecoder.process(RECORD_ID + FIELD_LDR);
7880

79-
final InOrder ordered = inOrder(this.receiver);
81+
final InOrder ordered = Mockito.inOrder(this.receiver);
8082
ordered.verify(this.receiver).startRecord(RECORD_ID);
8183
verifyLdrTest(ordered);
8284
ordered.verify(this.receiver).endRecord();
8385
}
8486

8587
@Test
8688
public void testShouldParseRecordWithTwoFields() {
87-
this.aseqDecoder.process(RECORD_ID + FIELD_LDR + FIELD_MARKER
88-
+ RECORD_ID + FIELD_001_a_TEST + FIELD_MARKER + FIELD_200_TEST);
89-
final InOrder ordered = inOrder(this.receiver);
89+
this.aseqDecoder.process(RECORD_ID + FIELD_LDR + FIELD_MARKER +
90+
RECORD_ID + FIELD_001_A_TEST + FIELD_MARKER + FIELD_200_TEST);
91+
final InOrder ordered = Mockito.inOrder(this.receiver);
9092
ordered.verify(this.receiver).startRecord(RECORD_ID);
9193
verifyLdrTest(ordered);
92-
verify001_a_Test(ordered);
94+
verify001aTest(ordered);
9395
verify200(ordered);
9496
ordered.verify(this.receiver).endRecord();
9597
}
9698

9799
private void verify200(final InOrder ordered) {
98100
ordered.verify(this.receiver).startEntity("200");
99-
ordered.verify(this.receiver, never())
101+
ordered.verify(this.receiver, Mockito.never())
100102
.literal("0", "01304760 200 L ");
101103
ordered.verify(this.receiver).literal("k", "Ackermann-Gemeinde");
102104
ordered.verify(this.receiver).literal("9", "(DE-588)39042-2");
103105
ordered.verify(this.receiver).endEntity();
104106
}
105107

106-
private void verify001_a_Test(final InOrder ordered) {
108+
private void verify001aTest(final InOrder ordered) {
107109
ordered.verify(this.receiver).startEntity("001");
108110
ordered.verify(this.receiver).literal("a", "test");
109111
ordered.verify(this.receiver).endEntity();

‎metafacture-biblio/src/test/java/org/metafacture/biblio/ComarcXmlHandlerTest.java‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616

1717
package org.metafacture.biblio;
1818

19-
import static org.mockito.Mockito.verify;
20-
2119
import org.metafacture.framework.StreamReceiver;
20+
2221
import org.junit.After;
2322
import org.junit.Before;
2423
import org.junit.Test;
2524
import org.mockito.Mock;
25+
import org.mockito.Mockito;
2626
import org.mockito.MockitoAnnotations;
2727
import org.xml.sax.SAXException;
2828
import org.xml.sax.helpers.AttributesImpl;
@@ -45,6 +45,9 @@ public final class ComarcXmlHandlerTest {
4545
@Mock
4646
private StreamReceiver receiver;
4747

48+
public ComarcXmlHandlerTest() {
49+
}
50+
4851
@Before
4952
public void setup() {
5053
MockitoAnnotations.initMocks(this);
@@ -80,9 +83,9 @@ public void shouldSetIdFrom000SubfieldX() throws SAXException {
8083
this.comarcXmlHandler.endElement(NAMESPACE, DATAFIELD, "");
8184
this.comarcXmlHandler.endElement(NAMESPACE, RECORD, "");
8285

83-
verify(this.receiver).literal("x", fieldValue);
84-
verify(this.receiver).startRecord(fieldValue);
85-
verify(this.receiver).endRecord();
86+
Mockito.verify(this.receiver).literal("x", fieldValue);
87+
Mockito.verify(this.receiver).startRecord(fieldValue);
88+
Mockito.verify(this.receiver).endRecord();
8689
}
8790

8891
@Test
@@ -114,10 +117,10 @@ public void shouldAcceptRepeatableSubfields() throws SAXException {
114117
this.comarcXmlHandler.endElement(NAMESPACE, DATAFIELD, "");
115118
this.comarcXmlHandler.endElement(NAMESPACE, RECORD, "");
116119

117-
verify(this.receiver).literal("x", fieldValue1);
118-
verify(this.receiver).literal("x", fieldValue2);
119-
verify(this.receiver).startRecord(fieldValue1);
120-
verify(this.receiver).endRecord();
120+
Mockito.verify(this.receiver).literal("x", fieldValue1);
121+
Mockito.verify(this.receiver).literal("x", fieldValue2);
122+
Mockito.verify(this.receiver).startRecord(fieldValue1);
123+
Mockito.verify(this.receiver).endRecord();
121124
}
122125

123126
@Test
@@ -170,13 +173,13 @@ public void shouldReadTwoFields() throws SAXException {
170173

171174
this.comarcXmlHandler.endElement(NAMESPACE, RECORD, "");
172175

173-
verify(this.receiver).literal("x", fieldValue1);
174-
verify(this.receiver).literal("x", fieldValue2);
175-
verify(this.receiver).startRecord(fieldValue1);
176-
verify(this.receiver).endRecord();
177-
verify(this.receiver).startEntity("000 ");
178-
verify(this.receiver).startEntity("001 2");
179-
verify(this.receiver).literal("a", fieldValue1);
176+
Mockito.verify(this.receiver).literal("x", fieldValue1);
177+
Mockito.verify(this.receiver).literal("x", fieldValue2);
178+
Mockito.verify(this.receiver).startRecord(fieldValue1);
179+
Mockito.verify(this.receiver).endRecord();
180+
Mockito.verify(this.receiver).startEntity("000 ");
181+
Mockito.verify(this.receiver).startEntity("001 2");
182+
Mockito.verify(this.receiver).literal("a", fieldValue1);
180183
}
181184

182185
}

‎metafacture-biblio/src/test/java/org/metafacture/biblio/MabDecoderTest.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,13 @@
1616

1717
package org.metafacture.biblio;
1818

19-
import static org.mockito.Mockito.inOrder;
20-
import static org.mockito.Mockito.verify;
21-
import static org.mockito.Mockito.verifyNoMoreInteractions;
19+
import org.metafacture.framework.StreamReceiver;
2220

2321
import org.junit.Before;
2422
import org.junit.Test;
25-
import org.metafacture.framework.StreamReceiver;
2623
import org.mockito.InOrder;
2724
import org.mockito.Mock;
25+
import org.mockito.Mockito;
2826
import org.mockito.MockitoAnnotations;
2927

3028
/**
@@ -41,6 +39,9 @@ public final class MabDecoderTest {
4139

4240
private MabDecoder mabDecoder;
4341

42+
public MabDecoderTest() {
43+
}
44+
4445
@Before
4546
public void setup() {
4647
MockitoAnnotations.initMocks(this);
@@ -56,7 +57,7 @@ public void shouldParseMabRecord() {
5657
"705b\u001FcSubfield 3\u001FdSubfield 4\u001E" +
5758
"\u001D");
5859

59-
final InOrder ordered = inOrder(receiver);
60+
final InOrder ordered = Mockito.inOrder(receiver);
6061
ordered.verify(receiver).startRecord("1234");
6162
ordered.verify(receiver).literal("001", "1234");
6263
ordered.verify(receiver).startEntity("705a");
@@ -75,8 +76,8 @@ public void shouldSkipWhitespaceOnlyInput() {
7576
mabDecoder.process(" ");
7677
mabDecoder.closeStream();
7778

78-
verify(receiver).closeStream();
79-
verifyNoMoreInteractions(receiver);
79+
Mockito.verify(receiver).closeStream();
80+
Mockito.verifyNoMoreInteractions(receiver);
8081
}
8182

8283
}

0 commit comments

Comments
 (0)