Movatterモバイル変換

Skip to content

BackendJava/java-design-patternsPublic

forked fromiluwatar/java-design-patterns

NotificationsYou must be signed in to change notification settings
Fork0
Star1

Commite01d640

iluwatar

authored

Merge pull requestiluwatar#713 from baislsl/master

Use the@testinstance annotation

2 parents7fef5e4 +36f5947 commite01d640Copy full SHA for e01d640

File tree

11 files changed

+36

-8

lines changed

interpreter/src/test/java/com/iluwatar/interpreter
observer/src/test/java/com/iluwatar/observer

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 number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`packagecom.iluwatar.interpreter;`
`24`	`24`
`25`	`25`	`importorg.junit.jupiter.api.Disabled;`
	`26`	`+importorg.junit.jupiter.api.TestInstance;`
`26`	`27`	`importorg.junit.jupiter.params.ParameterizedTest;`
`27`	`28`	`importorg.junit.jupiter.params.provider.Arguments;`
`28`	`29`	`importorg.junit.jupiter.params.provider.MethodSource;`
`@@ -43,6 +44,7 @@`
`43`	`44`	`* @param <E> Type of Expression`
`44`	`45`	`* @author Jeroen Meulemeester`
`45`	`46`	`*/`
	`47`	`+@TestInstance(TestInstance.Lifecycle.PER_CLASS)`
`46`	`48`	`publicabstractclassExpressionTest<EextendsExpression> {`
`47`	`49`
`48`	`50`	`/**`
`@@ -88,6 +90,13 @@ static Stream<Arguments> prepareParameters(final IntBinaryOperator resultCalc) {`
`88`	`90`	`this.factory =factory;`
`89`	`91`	`}`
`90`	`92`
	`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`	`+`
`91`	`100`	`/**`
`92`	`101`	`* Verify if the expression calculates the correct result when calling {@link E#interpret()}`
`93`	`102`	`*/`

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

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,8 @@ public class MinusExpressionTest extends ExpressionTest<MinusExpression> {`
`38`	`38`	`*`
`39`	`39`	`* @return The list of parameters used during this test`
`40`	`40`	`*/`
`41`		`-publicstaticStream<Arguments>expressionProvider() {`
	`41`	`+@Override`
	`42`	`+publicStream<Arguments>expressionProvider() {`
`42`	`43`	`returnprepareParameters((f,s) ->f -s);`
`43`	`44`	`}`
`44`	`45`

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

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,8 @@ public class MultiplyExpressionTest extends ExpressionTest<MultiplyExpression> {`
`38`	`38`	`*`
`39`	`39`	`* @return The list of parameters used during this test`
`40`	`40`	`*/`
`41`		`-publicstaticStream<Arguments>expressionProvider() {`
	`41`	`+@Override`
	`42`	`+publicStream<Arguments>expressionProvider() {`
`42`	`43`	`returnprepareParameters((f,s) ->f *s);`
`43`	`44`	`}`
`44`	`45`

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

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,8 @@ public class NumberExpressionTest extends ExpressionTest<NumberExpression> {`
`42`	`42`	`*`
`43`	`43`	`* @return The list of parameters used during this test`
`44`	`44`	`*/`
`45`		`-publicstaticStream<Arguments>expressionProvider() {`
	`45`	`+@Override`
	`46`	`+publicStream<Arguments>expressionProvider() {`
`46`	`47`	`returnprepareParameters((f,s) ->f);`
`47`	`48`	`}`
`48`	`49`

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

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,8 @@ public class PlusExpressionTest extends ExpressionTest<PlusExpression> {`
`38`	`38`	`*`
`39`	`39`	`* @return The list of parameters used during this test`
`40`	`40`	`*/`
`41`		`-publicstaticStream<Arguments>expressionProvider() {`
	`41`	`+@Override`
	`42`	`+publicStream<Arguments>expressionProvider() {`
`42`	`43`	`returnprepareParameters((f,s) ->f +s);`
`43`	`44`	`}`
`44`	`45`

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

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,8 @@`
`33`	`33`	`*/`
`34`	`34`	`publicclassHobbitsTestextendsWeatherObserverTest<Hobbits> {`
`35`	`35`
`36`		`-staticCollection<Object[]>dataProvider() {`
	`36`	`+@Override`
	`37`	`+publicCollection<Object[]>dataProvider() {`
`37`	`38`	`finalList<Object[]>testData =newArrayList<>();`
`38`	`39`	`testData.add(newObject[]{WeatherType.SUNNY,"The happy hobbits bade in the warm sun."});`
`39`	`40`	`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 number	Diff line number	Diff line change
`@@ -33,7 +33,8 @@`
`33`	`33`	`*/`
`34`	`34`	`publicclassOrcsTestextendsWeatherObserverTest<Orcs> {`
`35`	`35`
`36`		`-staticCollection<Object[]>dataProvider() {`
	`36`	`+@Override`
	`37`	`+publicCollection<Object[]>dataProvider() {`
`37`	`38`	`finalList<Object[]>testData =newArrayList<>();`
`38`	`39`	`testData.add(newObject[]{WeatherType.SUNNY,"The sun hurts the orcs' eyes."});`
`39`	`40`	`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 number	Diff line number	Diff line change
`@@ -23,11 +23,14 @@`
`23`	`23`	`packagecom.iluwatar.observer;`
`24`	`24`
`25`	`25`	`importcom.iluwatar.observer.utils.InMemoryAppender;`
	`26`	`+`
	`27`	`+importjava.util.Collection;`
`26`	`28`	`importjava.util.function.Supplier;`
`27`	`29`
`28`	`30`	`importorg.junit.jupiter.api.AfterEach;`
`29`	`31`	`importorg.junit.jupiter.api.BeforeEach;`
`30`	`32`	`importorg.junit.jupiter.api.Disabled;`
	`33`	`+importorg.junit.jupiter.api.TestInstance;`
`31`	`34`	`importorg.junit.jupiter.params.ParameterizedTest;`
`32`	`35`	`importorg.junit.jupiter.params.provider.MethodSource;`
`33`	`36`
`@@ -39,6 +42,7 @@`
`39`	`42`	`* @param <O> Type of WeatherObserver`
`40`	`43`	`* @author Jeroen Meulemeester`
`41`	`44`	`*/`
	`45`	`+@TestInstance(TestInstance.Lifecycle.PER_CLASS)`
`42`	`46`	`publicabstractclassWeatherObserverTest<OextendsWeatherObserver> {`
`43`	`47`
`44`	`48`	`privateInMemoryAppenderappender;`
`@@ -67,6 +71,8 @@ public void tearDown() {`
`67`	`71`	`this.factory =factory;`
`68`	`72`	`}`
`69`	`73`
	`74`	`+publicabstractCollection<Object[]>dataProvider();`
	`75`	`+`
`70`	`76`	`/**`
`71`	`77`	`* Verify if the weather has the expected influence on the observer`
`72`	`78`	`*/`

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

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,8 @@`
`35`	`35`	`*/`
`36`	`36`	`publicclassGHobbitsTestextendsObserverTest<GHobbits> {`
`37`	`37`
`38`		`-staticCollection<Object[]>dataProvider() {`
	`38`	`+@Override`
	`39`	`+publicCollection<Object[]>dataProvider() {`
`39`	`40`	`finalList<Object[]>testData =newArrayList<>();`
`40`	`41`	`testData.add(newObject[]{WeatherType.SUNNY,"The happy hobbits bade in the warm sun."});`
`41`	`42`	`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 number	Diff line number	Diff line change
`@@ -26,9 +26,11 @@`
`26`	`26`	`importcom.iluwatar.observer.utils.InMemoryAppender;`
`27`	`27`	`importorg.junit.jupiter.api.AfterEach;`
`28`	`28`	`importorg.junit.jupiter.api.BeforeEach;`
	`29`	`+importorg.junit.jupiter.api.TestInstance;`
`29`	`30`	`importorg.junit.jupiter.params.ParameterizedTest;`
`30`	`31`	`importorg.junit.jupiter.params.provider.MethodSource;`
`31`	`32`
	`33`	`+importjava.util.Collection;`
`32`	`34`	`importjava.util.function.Supplier;`
`33`	`35`
`34`	`36`	`importstaticorg.junit.jupiter.api.Assertions.assertEquals;`
`@@ -39,6 +41,7 @@`
`39`	`41`	`* @param <O> Type of Observer`
`40`	`42`	`* @author Jeroen Meulemeester`
`41`	`43`	`*/`
	`44`	`+@TestInstance(TestInstance.Lifecycle.PER_CLASS)`
`42`	`45`	`publicabstractclassObserverTest<OextendsObserver> {`
`43`	`46`
`44`	`47`	`privateInMemoryAppenderappender;`
`@@ -67,6 +70,8 @@ public void tearDown() {`
`67`	`70`	`this.factory =factory;`
`68`	`71`	`}`
`69`	`72`
	`73`	`+publicabstractCollection<Object[]>dataProvider();`
	`74`	`+`
`70`	`75`	`/**`
`71`	`76`	`* Verify if the weather has the expected influence on the observer`
`72`	`77`	`*/`

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

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,8 @@`
`35`	`35`	`*/`
`36`	`36`	`publicclassOrcsTestextendsObserverTest<GOrcs> {`
`37`	`37`
`38`		`-staticCollection<Object[]>dataProvider() {`
	`38`	`+@Override`
	`39`	`+publicCollection<Object[]>dataProvider() {`
`39`	`40`	`finalList<Object[]>testData =newArrayList<>();`
`40`	`41`	`testData.add(newObject[]{WeatherType.SUNNY,"The sun hurts the orcs' eyes."});`
`41`	`42`	`testData.add(newObject[]{WeatherType.RAINY,"The orcs are dripping wet."});`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp