Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit36f5947

Browse files
committed
Use the@testinstance annotation
1 parente7b119c commit36f5947

File tree

11 files changed

+36
-8
lines changed

11 files changed

+36
-8
lines changed

‎interpreter/src/test/java/com/iluwatar/interpreter/ExpressionTest.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
packagecom.iluwatar.interpreter;
2424

2525
importorg.junit.jupiter.api.Disabled;
26+
importorg.junit.jupiter.api.TestInstance;
2627
importorg.junit.jupiter.params.ParameterizedTest;
2728
importorg.junit.jupiter.params.provider.Arguments;
2829
importorg.junit.jupiter.params.provider.MethodSource;
@@ -43,6 +44,7 @@
4344
* @param <E> Type of Expression
4445
* @author Jeroen Meulemeester
4546
*/
47+
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
4648
publicabstractclassExpressionTest<EextendsExpression> {
4749

4850
/**
@@ -88,6 +90,13 @@ static Stream<Arguments> prepareParameters(final IntBinaryOperator resultCalc) {
8890
this.factory =factory;
8991
}
9092

93+
/**
94+
* Create a new set of test entries with the expected result
95+
*
96+
* @return The list of parameters used during this test
97+
*/
98+
publicabstractStream<Arguments>expressionProvider();
99+
91100
/**
92101
* Verify if the expression calculates the correct result when calling {@link E#interpret()}
93102
*/

‎interpreter/src/test/java/com/iluwatar/interpreter/MinusExpressionTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ public class MinusExpressionTest extends ExpressionTest<MinusExpression> {
3838
*
3939
* @return The list of parameters used during this test
4040
*/
41-
publicstaticStream<Arguments>expressionProvider() {
41+
@Override
42+
publicStream<Arguments>expressionProvider() {
4243
returnprepareParameters((f,s) ->f -s);
4344
}
4445

‎interpreter/src/test/java/com/iluwatar/interpreter/MultiplyExpressionTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ public class MultiplyExpressionTest extends ExpressionTest<MultiplyExpression> {
3838
*
3939
* @return The list of parameters used during this test
4040
*/
41-
publicstaticStream<Arguments>expressionProvider() {
41+
@Override
42+
publicStream<Arguments>expressionProvider() {
4243
returnprepareParameters((f,s) ->f *s);
4344
}
4445

‎interpreter/src/test/java/com/iluwatar/interpreter/NumberExpressionTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ public class NumberExpressionTest extends ExpressionTest<NumberExpression> {
4242
*
4343
* @return The list of parameters used during this test
4444
*/
45-
publicstaticStream<Arguments>expressionProvider() {
45+
@Override
46+
publicStream<Arguments>expressionProvider() {
4647
returnprepareParameters((f,s) ->f);
4748
}
4849

‎interpreter/src/test/java/com/iluwatar/interpreter/PlusExpressionTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ public class PlusExpressionTest extends ExpressionTest<PlusExpression> {
3838
*
3939
* @return The list of parameters used during this test
4040
*/
41-
publicstaticStream<Arguments>expressionProvider() {
41+
@Override
42+
publicStream<Arguments>expressionProvider() {
4243
returnprepareParameters((f,s) ->f +s);
4344
}
4445

‎observer/src/test/java/com/iluwatar/observer/HobbitsTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@
3333
*/
3434
publicclassHobbitsTestextendsWeatherObserverTest<Hobbits> {
3535

36-
staticCollection<Object[]>dataProvider() {
36+
@Override
37+
publicCollection<Object[]>dataProvider() {
3738
finalList<Object[]>testData =newArrayList<>();
3839
testData.add(newObject[]{WeatherType.SUNNY,"The happy hobbits bade in the warm sun."});
3940
testData.add(newObject[]{WeatherType.RAINY,"The hobbits look for cover from the rain."});

‎observer/src/test/java/com/iluwatar/observer/OrcsTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@
3333
*/
3434
publicclassOrcsTestextendsWeatherObserverTest<Orcs> {
3535

36-
staticCollection<Object[]>dataProvider() {
36+
@Override
37+
publicCollection<Object[]>dataProvider() {
3738
finalList<Object[]>testData =newArrayList<>();
3839
testData.add(newObject[]{WeatherType.SUNNY,"The sun hurts the orcs' eyes."});
3940
testData.add(newObject[]{WeatherType.RAINY,"The orcs are dripping wet."});

‎observer/src/test/java/com/iluwatar/observer/WeatherObserverTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,14 @@
2323
packagecom.iluwatar.observer;
2424

2525
importcom.iluwatar.observer.utils.InMemoryAppender;
26+
27+
importjava.util.Collection;
2628
importjava.util.function.Supplier;
2729

2830
importorg.junit.jupiter.api.AfterEach;
2931
importorg.junit.jupiter.api.BeforeEach;
3032
importorg.junit.jupiter.api.Disabled;
33+
importorg.junit.jupiter.api.TestInstance;
3134
importorg.junit.jupiter.params.ParameterizedTest;
3235
importorg.junit.jupiter.params.provider.MethodSource;
3336

@@ -39,6 +42,7 @@
3942
* @param <O> Type of WeatherObserver
4043
* @author Jeroen Meulemeester
4144
*/
45+
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
4246
publicabstractclassWeatherObserverTest<OextendsWeatherObserver> {
4347

4448
privateInMemoryAppenderappender;
@@ -67,6 +71,8 @@ public void tearDown() {
6771
this.factory =factory;
6872
}
6973

74+
publicabstractCollection<Object[]>dataProvider();
75+
7076
/**
7177
* Verify if the weather has the expected influence on the observer
7278
*/

‎observer/src/test/java/com/iluwatar/observer/generic/GHobbitsTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@
3535
*/
3636
publicclassGHobbitsTestextendsObserverTest<GHobbits> {
3737

38-
staticCollection<Object[]>dataProvider() {
38+
@Override
39+
publicCollection<Object[]>dataProvider() {
3940
finalList<Object[]>testData =newArrayList<>();
4041
testData.add(newObject[]{WeatherType.SUNNY,"The happy hobbits bade in the warm sun."});
4142
testData.add(newObject[]{WeatherType.RAINY,"The hobbits look for cover from the rain."});

‎observer/src/test/java/com/iluwatar/observer/generic/ObserverTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@
2626
importcom.iluwatar.observer.utils.InMemoryAppender;
2727
importorg.junit.jupiter.api.AfterEach;
2828
importorg.junit.jupiter.api.BeforeEach;
29+
importorg.junit.jupiter.api.TestInstance;
2930
importorg.junit.jupiter.params.ParameterizedTest;
3031
importorg.junit.jupiter.params.provider.MethodSource;
3132

33+
importjava.util.Collection;
3234
importjava.util.function.Supplier;
3335

3436
importstaticorg.junit.jupiter.api.Assertions.assertEquals;
@@ -39,6 +41,7 @@
3941
* @param <O> Type of Observer
4042
* @author Jeroen Meulemeester
4143
*/
44+
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
4245
publicabstractclassObserverTest<OextendsObserver> {
4346

4447
privateInMemoryAppenderappender;
@@ -67,6 +70,8 @@ public void tearDown() {
6770
this.factory =factory;
6871
}
6972

73+
publicabstractCollection<Object[]>dataProvider();
74+
7075
/**
7176
* Verify if the weather has the expected influence on the observer
7277
*/

‎observer/src/test/java/com/iluwatar/observer/generic/OrcsTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@
3535
*/
3636
publicclassOrcsTestextendsObserverTest<GOrcs> {
3737

38-
staticCollection<Object[]>dataProvider() {
38+
@Override
39+
publicCollection<Object[]>dataProvider() {
3940
finalList<Object[]>testData =newArrayList<>();
4041
testData.add(newObject[]{WeatherType.SUNNY,"The sun hurts the orcs' eyes."});
4142
testData.add(newObject[]{WeatherType.RAINY,"The orcs are dripping wet."});

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp