Skip to content

Commit 0211ac6

Browse files
garydgregorygarydgregory
committed
Sort members
1 parent 9280e35 commit 0211ac6

File tree

4 files changed

+55
-55
lines changed

4 files changed

+55
-55
lines changed

‎src/test/java/org/apache/commons/text/StringSubstitutorTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,13 @@ void testConstructorStringSubstitutor() {
228228
assertTrue(target.getVariableSuffixMatcher().toString().endsWith("['s']"), target.getValueDelimiterMatcher().toString());
229229
}
230230

231+
@Test
232+
void testDetectsCyclicSubstitution() {
233+
final Map<String, String> map = new HashMap<>();
234+
map.put("name", "<name>");
235+
assertThrows(IllegalStateException.class, () -> StringSubstitutor.replace("Hi <name>!", map, "<", ">"));
236+
}
237+
231238
/**
232239
* Tests get set.
233240
*/
@@ -1078,11 +1085,4 @@ void testSubstitutePreserveEscape() throws IOException {
10781085
assertEqualsCharSeq("value $${escaped}", replace(sub, org));
10791086
}
10801087

1081-
@Test
1082-
void testDetectsCyclicSubstitution() {
1083-
final Map<String, String> map = new HashMap<>();
1084-
map.put("name", "<name>");
1085-
assertThrows(IllegalStateException.class, () -> StringSubstitutor.replace("Hi <name>!", map, "<", ">"));
1086-
}
1087-
10881088
}

‎src/test/java/org/apache/commons/text/similarity/HammingDistanceTest.java‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -36,42 +36,42 @@ public static void setUp() {
3636
distance = new HammingDistance();
3737
}
3838

39-
@ParameterizedTest
40-
@MethodSource("org.apache.commons.text.similarity.SimilarityInputTest#similarityInputsEquals()")
41-
void testHammingDistance(final Class<?> cls) {
42-
assertEquals(0, distance.apply(SimilarityInputTest.build(cls, ""), SimilarityInputTest.build(cls, "")));
43-
assertEquals(0, distance.apply(SimilarityInputTest.build(cls, "pappa"), SimilarityInputTest.build(cls, "pappa")));
44-
assertEquals(1, distance.apply(SimilarityInputTest.build(cls, "papaa"), SimilarityInputTest.build(cls, "pappa")));
45-
assertEquals(3, distance.apply(SimilarityInputTest.build(cls, "karolin"), SimilarityInputTest.build(cls, "kathrin")));
46-
assertEquals(3, distance.apply(SimilarityInputTest.build(cls, "karolin"), SimilarityInputTest.build(cls, "kerstin")));
47-
assertEquals(2, distance.apply(SimilarityInputTest.build(cls, "1011101"), SimilarityInputTest.build(cls, "1001001")));
48-
assertEquals(3, distance.apply(SimilarityInputTest.build(cls, "2173896"), SimilarityInputTest.build(cls, "2233796")));
49-
assertEquals(2, distance.apply(SimilarityInputTest.build(cls, "ATCG"), SimilarityInputTest.build(cls, "ACCC")));
39+
@Test
40+
void testApply_DifferentSimilarityInputLength() {
41+
assertThrows(IllegalArgumentException.class, () -> distance.apply(new SimilarityCharacterInput("a"), new SimilarityCharacterInput("ab")));
5042
}
5143

5244
@Test
53-
void testHammingDistance_nullLeftValue() {
54-
assertThrows(IllegalArgumentException.class, () -> distance.apply(null, ""));
55-
}
45+
void testApply_NullSimilarityInput() {
46+
assertThrows(IllegalArgumentException.class, () -> distance.apply(null, new SimilarityCharacterInput("a")));
47+
}
5648

5749
@Test
58-
void testHammingDistance_nullRightValue() {
59-
assertThrows(IllegalArgumentException.class, () -> distance.apply("", null));
50+
void testApply_SimilarityInputNull() {
51+
assertThrows(IllegalArgumentException.class, () -> distance.apply(new SimilarityCharacterInput("a"), null));
6052
}
6153

62-
@Test
63-
void testApply_NullSimilarityInput() {
64-
assertThrows(IllegalArgumentException.class, () -> distance.apply(null, new SimilarityCharacterInput("a")));
65-
}
54+
@ParameterizedTest
55+
@MethodSource("org.apache.commons.text.similarity.SimilarityInputTest#similarityInputsEquals()")
56+
void testHammingDistance(final Class<?> cls) {
57+
assertEquals(0, distance.apply(SimilarityInputTest.build(cls, ""), SimilarityInputTest.build(cls, "")));
58+
assertEquals(0, distance.apply(SimilarityInputTest.build(cls, "pappa"), SimilarityInputTest.build(cls, "pappa")));
59+
assertEquals(1, distance.apply(SimilarityInputTest.build(cls, "papaa"), SimilarityInputTest.build(cls, "pappa")));
60+
assertEquals(3, distance.apply(SimilarityInputTest.build(cls, "karolin"), SimilarityInputTest.build(cls, "kathrin")));
61+
assertEquals(3, distance.apply(SimilarityInputTest.build(cls, "karolin"), SimilarityInputTest.build(cls, "kerstin")));
62+
assertEquals(2, distance.apply(SimilarityInputTest.build(cls, "1011101"), SimilarityInputTest.build(cls, "1001001")));
63+
assertEquals(3, distance.apply(SimilarityInputTest.build(cls, "2173896"), SimilarityInputTest.build(cls, "2233796")));
64+
assertEquals(2, distance.apply(SimilarityInputTest.build(cls, "ATCG"), SimilarityInputTest.build(cls, "ACCC")));
65+
}
6666

6767
@Test
68-
void testApply_SimilarityInputNull() {
69-
assertThrows(IllegalArgumentException.class, () -> distance.apply(new SimilarityCharacterInput("a"), null));
68+
void testHammingDistance_nullLeftValue() {
69+
assertThrows(IllegalArgumentException.class, () -> distance.apply(null, ""));
7070
}
7171

7272
@Test
73-
void testApply_DifferentSimilarityInputLength() {
74-
assertThrows(IllegalArgumentException.class, () -> distance.apply(new SimilarityCharacterInput("a"), new SimilarityCharacterInput("ab")));
73+
void testHammingDistance_nullRightValue() {
74+
assertThrows(IllegalArgumentException.class, () -> distance.apply("", null));
7575
}
7676

7777
@Test

‎src/test/java/org/apache/commons/text/similarity/JaroWinklerDistanceTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,16 @@ public static void setUp() {
3636
distance = new JaroWinklerDistance();
3737
}
3838

39+
@Test
40+
void testApply_NullSimilarityInput() {
41+
assertThrows(IllegalArgumentException.class, () -> distance.apply(null, new SimilarityCharacterInput("a")));
42+
}
43+
44+
@Test
45+
void testApply_SimilarityInputNull() {
46+
assertThrows(IllegalArgumentException.class, () -> distance.apply(new SimilarityCharacterInput("a"), null));
47+
}
48+
3949
@ParameterizedTest
4050
@MethodSource("org.apache.commons.text.similarity.SimilarityInputTest#similarityInputsEquals()")
4151
void testGetJaroWinklerDistance(final Class<?> cls) {
@@ -95,14 +105,4 @@ void testGetJaroWinklerDistance_StringString() {
95105
assertEquals(1 - 0.51111d, distance.apply("foo", " foo"), 0.00001d);
96106
}
97107

98-
@Test
99-
void testApply_NullSimilarityInput() {
100-
assertThrows(IllegalArgumentException.class, () -> distance.apply(null, new SimilarityCharacterInput("a")));
101-
}
102-
103-
@Test
104-
void testApply_SimilarityInputNull() {
105-
assertThrows(IllegalArgumentException.class, () -> distance.apply(new SimilarityCharacterInput("a"), null));
106-
}
107-
108108
}

‎src/test/java/org/apache/commons/text/similarity/JaroWinklerSimilarityTest.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,16 @@ public String toString() {
7878
};
7979
}
8080

81+
@Test
82+
void testApply_NullSimilarityInput() {
83+
assertThrows(IllegalArgumentException.class, () -> similarity.apply(null, new SimilarityCharacterInput("a")));
84+
}
85+
86+
@Test
87+
void testApply_SimilarityInputNull() {
88+
assertThrows(IllegalArgumentException.class, () -> similarity.apply(new SimilarityCharacterInput("a"), null));
89+
}
90+
8191
@ParameterizedTest
8292
@MethodSource("org.apache.commons.text.similarity.SimilarityInputTest#similarityInputsEquals()")
8393
void testGetJaroWinklerSimilarity(final Class<?> cls) {
@@ -111,10 +121,10 @@ void testGetJaroWinklerSimilarity_NullString() {
111121
assertThrows(IllegalArgumentException.class, () -> similarity.apply(null, "clear"));
112122
}
113123

114-
@Test
115-
void testGetJaroWinklerSimilarity_StringNull() {
116-
assertThrows(IllegalArgumentException.class, () -> similarity.apply(" ", null));
117-
}
124+
@Test
125+
void testGetJaroWinklerSimilarity_StringNull() {
126+
assertThrows(IllegalArgumentException.class, () -> similarity.apply(" ", null));
127+
}
118128

119129
@Test
120130
void testGetJaroWinklerSimilarity_StringString() {
@@ -136,14 +146,4 @@ void testGetJaroWinklerSimilarity_StringString() {
136146
assertEquals(0.911111d, similarity.apply(wrap("John Horn"), "John Hopkins"), 0.00001d);
137147
}
138148

139-
@Test
140-
void testApply_NullSimilarityInput() {
141-
assertThrows(IllegalArgumentException.class, () -> similarity.apply(null, new SimilarityCharacterInput("a")));
142-
}
143-
144-
@Test
145-
void testApply_SimilarityInputNull() {
146-
assertThrows(IllegalArgumentException.class, () -> similarity.apply(new SimilarityCharacterInput("a"), null));
147-
}
148-
149149
}

0 commit comments

Comments
 (0)