Skip to content

Commit d84bec4

Browse files
ctruedenctrueden
committed
Fix naming of test methods
We use the convention testFoo, not fooTest.
1 parent b127681 commit d84bec4

File tree

69 files changed

+223
-332
lines changed

Some content is hidden

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

69 files changed

+223
-332
lines changed

‎scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/OpCachingTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ private Map<MatchingConditions, OpInstance<?>> getOpCache(
103103
}
104104

105105
@Test
106-
public void cacheOp() throws SecurityException, IllegalArgumentException,
106+
public void testCacheOp() throws SecurityException, IllegalArgumentException,
107107
NoSuchFieldException, IllegalAccessException
108108
{
109109
// put the Op in the cache

‎scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/ServiceLoaderDiscoveryIntegrationTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
public class ServiceLoaderDiscoveryIntegrationTest {
4545

4646
@Test
47-
public void opDiscoveryRegressionIT() {
47+
public void testOpDiscoveryRegressionIT() {
4848
final Discoverer d = Discoverer.using(ServiceLoader::load);
4949
final List<Op> discoveries = d.discover(Op.class);
5050
Assertions.assertEquals(237, discoveries.size());
@@ -58,7 +58,7 @@ public void opDiscoveryRegressionIT() {
5858
}
5959

6060
@Test
61-
public void opCollectionDiscoveryRegressionIT() {
61+
public void testOpCollectionDiscoveryRegressionIT() {
6262
final Discoverer d = Discoverer.using(ServiceLoader::load);
6363
final List<OpCollection> discoveries = d.discover(OpCollection.class);
6464
Assertions.assertEquals(22, discoveries.size());

‎scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/MatchingUtilsTest.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ private void assertAll(Class<?> from, boolean condition, Type... tos) {
7171
}
7272

7373
@Test
74-
public <E, N extends Number> void genericAssignabilityVarToVar() {
74+
public <E, N extends Number> void testGenericAssignabilityVarToVar() {
7575
abstract class Single<I> implements Supplier<I> {}
7676
abstract class SingleBounded<I extends Number> implements Supplier<I> {}
7777
Nil<Supplier<E>> y1 = new Nil<>() {};
@@ -86,7 +86,7 @@ abstract class SingleBounded<I extends Number> implements Supplier<I> {}
8686
}
8787

8888
@Test
89-
public void genericAssignabilitySingleVar() {
89+
public void testGenericAssignabilitySingleVar() {
9090
abstract class Single<I> implements Supplier<I> {}
9191
Nil<Supplier<Double>> y1 = new Nil<>() {};
9292
Nil<Supplier<Number>> y2 = new Nil<>() {};
@@ -97,7 +97,7 @@ abstract class Single<I> implements Supplier<I> {}
9797
}
9898

9999
@Test
100-
public void genericAssignabilitySingleVarBounded() {
100+
public void testGenericAssignabilitySingleVarBounded() {
101101
abstract class SingleBounded<I extends Number> implements Supplier<I> {}
102102

103103
Nil<Supplier<Double>> y1 = new Nil<>() {};
@@ -109,7 +109,7 @@ abstract class SingleBounded<I extends Number> implements Supplier<I> {}
109109
}
110110

111111
@Test
112-
public void genericAssignabilitySingleVarBoundedUsedNested() {
112+
public void testGenericAssignabilitySingleVarBoundedUsedNested() {
113113
abstract class SingleVarBoundedUsedNested<I extends Number> implements
114114
Supplier<List<I>>
115115
{}
@@ -125,7 +125,7 @@ abstract class SingleVarBoundedUsedNested<I extends Number> implements
125125
}
126126

127127
@Test
128-
public void genericAssignabilitySingleVarBoundedUsedNestedAndOther() {
128+
public void testGenericAssignabilitySingleVarBoundedUsedNestedAndOther() {
129129
abstract class SingleVarBoundedUsedNestedAndOther<I extends Number>
130130
implements Function<List<I>, Double>
131131
{}
@@ -166,7 +166,7 @@ abstract class SingleVarBoundedUsedNestedAndOtherNestedWildcard<I extends Number
166166
}
167167

168168
@Test
169-
public void genericAssignabilitySingleVarNestedBoundNestedAndOther() {
169+
public void testGenericAssignabilitySingleVarNestedBoundNestedAndOther() {
170170
abstract class SingleVarBoundedNestedAndOther<I extends Iterable<String>>
171171
implements Function<I, Double>
172172
{}
@@ -198,7 +198,7 @@ abstract class SingleVarBoundedNestedWildcardAndOther<I extends Iterable<? exten
198198
}
199199

200200
@Test
201-
public void genericAssignabilitySingleVarMultipleOccurrence() {
201+
public void testGenericAssignabilitySingleVarMultipleOccurrence() {
202202
abstract class SingleVarBoundedNestedMultipleOccurrence<I extends Iterable<String>>
203203
implements Function<I, I>
204204
{}
@@ -246,7 +246,7 @@ abstract class SingleVarMultipleOccurrenceUsedNested<I> implements
246246
}
247247

248248
@Test
249-
public void genericAssignabilityDoubleVar() {
249+
public void testGenericAssignabilityDoubleVar() {
250250
abstract class DoubleVar<I, B> implements Function<I, B> {}
251251

252252
abstract class DoubleVarBounded<I extends List<String>, B extends Number>
@@ -271,7 +271,7 @@ abstract class DoubleVarBounded<I extends List<String>, B extends Number>
271271
}
272272

273273
@Test
274-
public void genericAssignabilityDoubleVarDepending() {
274+
public void testGenericAssignabilityDoubleVarDepending() {
275275
abstract class BExtendsI<I extends Iterable<? extends Number>, B extends I>
276276
implements Function<I, B>
277277
{}
@@ -310,7 +310,7 @@ abstract class IBoundedByN<N extends Number, I extends Iterable<N>>
310310
}
311311

312312
@Test
313-
public void genericAssignabilityDoubleVarDependingImplicitlyBounded() {
313+
public void testGenericAssignabilityDoubleVarDependingImplicitlyBounded() {
314314
abstract class IBoundedByNImplicitly<N extends Number, I extends Iterable<N>>
315315
implements BiFunction<I, I, List<String>>
316316
{}
@@ -323,7 +323,7 @@ abstract class IBoundedByNImplicitly<N extends Number, I extends Iterable<N>>
323323
}
324324

325325
@Test
326-
public void genericAssignabilityDoubleVarBoundedAndWildcard() {
326+
public void testGenericAssignabilityDoubleVarBoundedAndWildcard() {
327327
abstract class DoubleVarBoundedAndWildcard<M extends Number, I extends Iterable<? extends Number>>
328328
implements BiFunction<I, I, Iterable<M>>
329329
{}
@@ -358,7 +358,7 @@ abstract class DoubleVarBoundedAndWildcard<M extends Number, I extends Iterable<
358358
}
359359

360360
@Test
361-
public void genericAssignabilityWildcards() {
361+
public void testGenericAssignabilityWildcards() {
362362
abstract class Wildcards implements
363363
Function<List<? extends Number>, List<? extends Number>>
364364
{}
@@ -376,7 +376,7 @@ abstract class Wildcards implements
376376
}
377377

378378
@Test
379-
public void genericAssignabilityWildcardExtendingTypeVar() {
379+
public void testGenericAssignabilityWildcardExtendingTypeVar() {
380380
abstract class StrangeConsumer<T extends Number> implements
381381
BiConsumer<List<? extends T>, T>
382382
{}

‎scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/MatchingWithGCSTTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ static class YThing implements Thing {
9595
};
9696

9797
@Test
98-
public void OpMatchingIntegrationTest() {
98+
public void testAddOpMatchingIntegration() {
9999
List<Thing> things = new ArrayList<>();
100100
things.add(new NThing());
101101
things.add(new XThing());

‎scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/OpMatchingExceptionTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public static void addNeededOps() {
7676
* conflict for a given OpRef.
7777
*/
7878
@Test
79-
public void duplicateErrorRegressionTest() {
79+
public void testDuplicateErrorRegression() {
8080
try {
8181
ops.op("test.duplicateOp").inType(Double.class).outType(Double.class)
8282
.function();
@@ -93,7 +93,7 @@ public void duplicateErrorRegressionTest() {
9393
* Assert that a relevant error is thrown when a dependency is missing
9494
*/
9595
@Test
96-
public void missingDependencyRegressionTest() {
96+
public void testMissingDependencyRegression() {
9797
try {
9898
ops.op("test.missingDependencyOp").input(1.).outType(Double.class)
9999
.apply();
@@ -111,7 +111,7 @@ public void missingDependencyRegressionTest() {
111111
* chain
112112
*/
113113
@Test
114-
public void missingNestedDependencyRegressionTest() {
114+
public void testMissingNestedDependencyRegression() {
115115
try {
116116
ops.op("test.outsideOp").input(1.).outType(Double.class).apply();
117117
Assertions.fail("Expected DependencyMatchingException");
@@ -127,7 +127,7 @@ public void missingNestedDependencyRegressionTest() {
127127
* when an adaptation is involved.
128128
*/
129129
@Test
130-
public void missingDependencyViaAdaptationTest() {
130+
public void testMissingDependencyViaAdaptation() {
131131
Double[] d = new Double[0];
132132
try {
133133
ops.op("test.adaptMissingDep").input(d).outType(Double[].class).apply();

‎scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/RawTypeMatchingTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public static void addNeededOps() {
5353
public final Function<Number, List<Number>> func = (x) -> List.of(x);
5454

5555
@Test
56-
public void rawTypeAdaptationTest() {
56+
public void testRawTypeAdaptation() {
5757
Double d = 25.;
5858
var list = ops.op("test.match.raw").input(d).outType(List.class).apply();
5959
assertNotNull(list);

‎scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/convert/ConversionAdaptationTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public static void AddNeededOps() {
6767
};
6868

6969
@Test
70-
public void adaptAndConvertTest() {
70+
public void testAdaptAndConvert() {
7171
Double[] inArr = { 1., 4., 6. };
7272
Double modulus = 3.;
7373

‎scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/convert/ConversionIOTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public void testFunctionOutputConversion() {
9191
};
9292

9393
@Test
94-
public void basicComputerTest() {
94+
public void testBasicComputer() {
9595
Integer[] in = new Integer[] { 1, 2, 3 };
9696
Integer[] out = new Integer[] { 4, 5, 6 };
9797

@@ -100,7 +100,7 @@ public void basicComputerTest() {
100100
}
101101

102102
@Test
103-
public void basicInplace2_1Test() {
103+
public void testBasicInplace2_1() {
104104
Integer[] io = new Integer[] { 1, 2, 3 };
105105
Integer[] in1 = new Integer[] { 4, 5, 6 };
106106
Integer[] expected = new Integer[] { 5, 7, 9 };
@@ -110,7 +110,7 @@ public void basicInplace2_1Test() {
110110
}
111111

112112
@Test
113-
public void basicInplace2_2Test() {
113+
public void testBasicInplace2_2() {
114114
Integer[] in0 = new Integer[] { 4, 5, 6 };
115115
Integer[] io = new Integer[] { 1, 2, 3 };
116116
Integer[] expected = new Integer[] { 5, 7, 9 };

‎scijava-ops-engine/src/test/java/org/scijava/ops/engine/stats/MeanTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ public static void AddNeededOps() {
5454
}
5555

5656
@Test
57-
public void regressionTest() {
58-
57+
public void testMean() {
5958
Function<Iterable<Integer>, Double> goodFunc = OpBuilder.matchFunction(ops,
6059
"stats.mean", new Nil<Iterable<Integer>>()
6160
{}, new Nil<Double>() {});

‎scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/OpsAsParametersTest.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public static void addNeededOps() {
7070
};
7171

7272
@Test
73-
public void TestOpWithNonReifiableFunction() {
73+
public void testOpWithNonReifiableFunction() {
7474
var list = Arrays.asList(40L, 20.5, 4.0d);
7575
var actual = ops//
7676
.op("test.parameter.op") //
@@ -81,8 +81,7 @@ public void TestOpWithNonReifiableFunction() {
8181
}
8282

8383
@Test
84-
public void TestOpWithOpFieldWithoutRun() {
85-
84+
public void testOpWithOpFieldWithoutRun() {
8685
List<Number> list = new ArrayList<>();
8786
list.add(40l);
8887
list.add(20.5);
@@ -96,8 +95,7 @@ public void TestOpWithOpFieldWithoutRun() {
9695
}
9796

9897
@Test
99-
public void TestOpWithOpClass() {
100-
98+
public void testOpWithOpClass() {
10199
List<Number> list = new ArrayList<>();
102100
list.add(40l);
103101
list.add(20.5);

0 commit comments

Comments
 (0)