Skip to content

Commit b2ec30c

Browse files
committed
Fix JUnit4 to JUnit5 parameterized test migration
apache/flink@9b61b13
1 parent 532d0c8 commit b2ec30c

File tree

3 files changed

+16
-3
lines changed

3 files changed

+16
-3
lines changed

src/main/java/gr/uom/java/xmi/decomposition/ReplacementAlgorithm.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2880,7 +2880,7 @@ else if(invocationCoveringTheEntireStatement2.getExpression() != null && invocat
28802880
(invocationCoveringTheEntireStatement1.getName().equals("assertThat") && invocationCoveringTheEntireStatement2.getName().equals("isTrue") &&
28812881
invocationCoveringTheEntireStatement1.arguments().size() > 1 && invocationCoveringTheEntireStatement1.arguments().get(1).contains("equalTo(true)")) ||
28822882
(invocationCoveringTheEntireStatement1.getName().equals("assertThat") && invocationCoveringTheEntireStatement2.getName().equals("isEqualTo") &&
2883-
invocationCoveringTheEntireStatement1.arguments().size() > 1 && invocationCoveringTheEntireStatement1.arguments().get(1).contains("equalTo(")) ||
2883+
invocationCoveringTheEntireStatement1.arguments().size() > 1 && (invocationCoveringTheEntireStatement1.arguments().get(1).contains("equalTo(") || invocationCoveringTheEntireStatement1.arguments().get(1).contains("is("))) ||
28842884
(invocationCoveringTheEntireStatement1.getName().equals("assertThat") && (invocationCoveringTheEntireStatement2.getName().equals("containsExactlyInAnyOrder") || invocationCoveringTheEntireStatement2.getName().equals("containsExactly")) &&
28852885
invocationCoveringTheEntireStatement1.arguments().size() > 1 && invocationCoveringTheEntireStatement1.arguments().get(1).contains("containsInAnyOrder(")) ||
28862886
(invocationCoveringTheEntireStatement1.getName().equals("assertThat") && invocationCoveringTheEntireStatement2.getName().equals("containsExactly") &&
@@ -3006,7 +3006,7 @@ else if((invocationCoveringTheEntireStatement1.getName().equals("isTrue") && inv
30063006
(invocationCoveringTheEntireStatement2.getName().equals("assertThat") && invocationCoveringTheEntireStatement1.getName().equals("isTrue") &&
30073007
invocationCoveringTheEntireStatement2.arguments().size() > 1 && invocationCoveringTheEntireStatement2.arguments().get(1).contains("equalTo(true)")) ||
30083008
(invocationCoveringTheEntireStatement2.getName().equals("assertThat") && invocationCoveringTheEntireStatement1.getName().equals("isEqualTo") &&
3009-
invocationCoveringTheEntireStatement2.arguments().size() > 1 && invocationCoveringTheEntireStatement2.arguments().get(1).contains("equalTo(")) ||
3009+
invocationCoveringTheEntireStatement2.arguments().size() > 1 && (invocationCoveringTheEntireStatement2.arguments().get(1).contains("equalTo(") || invocationCoveringTheEntireStatement2.arguments().get(1).contains("is("))) ||
30103010
(invocationCoveringTheEntireStatement2.getName().equals("assertThat") && (invocationCoveringTheEntireStatement1.getName().equals("containsExactlyInAnyOrder") || invocationCoveringTheEntireStatement1.getName().equals("containsExactly")) &&
30113011
invocationCoveringTheEntireStatement2.arguments().size() > 1 && invocationCoveringTheEntireStatement2.arguments().get(1).contains("containsInAnyOrder(")) ||
30123012
(invocationCoveringTheEntireStatement2.getName().equals("assertThat") && invocationCoveringTheEntireStatement1.getName().equals("containsExactly") &&

src/test/resources/mappings/flink-62f44e0118539c1ed0dedf47099326f97c9d0427.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3157,6 +3157,7 @@ line range:224-224==line range:229-229
31573157
line range:225-225==line range:230-230
31583158
line range:227-227==line range:232-232
31593159
line range:230-230==line range:235-235
3160+
line range:234-234==line range:239-239
31603161
line range:229-231==line range:234-236
31613162
line range:233-235==line range:238-240
31623163
line range:229-231==line range:234-236
@@ -14813,9 +14814,14 @@ line range:99-99==line range:95-95
1481314814
line range:102-102==line range:98-98
1481414815
line range:109-114==line range:105-110
1481514816
line range:120-120==line range:116-116
14817+
line range:104-104==line range:100-100
1481614818
line range:105-105==line range:101-101
1481714819
line range:107-107==line range:103-103
14820+
line range:116-116==line range:112-112
14821+
line range:117-117==line range:113-113
1481814822
line range:118-118==line range:114-114
14823+
line range:122-122==line range:118-118
14824+
line range:123-123==line range:119-119
1481914825
line range:124-124==line range:120-120
1482014826
line range:126-126==line range:122-122
1482114827
line range:101-127==line range:97-123
@@ -14885,6 +14891,7 @@ line range:64-71==line range:63-70
1488514891
line range:67-69==line range:66-68
1488614892
line range:69-71==line range:68-70
1488714893
line range:63-72==line range:62-71
14894+
line range:76-76==line range:75-75
1488814895
public cancelShouldAlsoCancelPendingSynchronousCheckpoint() : void -> package cancelShouldAlsoCancelPendingSynchronousCheckpoint() : void
1488914896
line range:81-81==line range:81-81
1489014897
line range:84-84==line range:84-84
Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
11
org.apache.flink.util.TimeUtilsPrettyPrintingTest -> org.apache.flink.util.TimeUtilsPrettyPrintingTest
2-
@RunWith(Parameterized.class)==null
2+
@RunWith(Parameterized.class)==null
3+
public testFormatting() : void -> package testFormatting(duration Duration, expectedString String) : void
4+
null==@ParameterizedTest
5+
public testFormatting() : void -> package testFormatting(duration Duration, expectedString String) : void
6+
null==@MethodSource("testDurationAndExpectedString")
7+
public testFormatting() : void -> package testFormatting(duration Duration, expectedString String) : void
8+
@Test==null

0 commit comments

Comments
 (0)