Skip to content

Commit c896df1

Browse files
committed
Add new tests for JUnit3 migration commit
1 parent b2ec30c commit c896df1

File tree

134 files changed

+45717
-7
lines changed

Some content is hidden

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

134 files changed

+45717
-7
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2873,6 +2873,8 @@ else if(invocationCoveringTheEntireStatement2.getExpression() != null && invocat
28732873
invocationCoveringTheEntireStatement1.arguments().size() > 0 && invocationCoveringTheEntireStatement1.arguments().get(0).startsWith("0")) ||
28742874
(invocationCoveringTheEntireStatement1.getName().equals("assertEquals") && invocationCoveringTheEntireStatement2.getName().equals("isOne") &&
28752875
invocationCoveringTheEntireStatement1.arguments().size() > 0 && invocationCoveringTheEntireStatement1.arguments().get(0).startsWith("1")) ||
2876+
(invocationCoveringTheEntireStatement1.getName().equals("assertEquals") && (invocationCoveringTheEntireStatement2.getName().equals("containsExactly") || invocationCoveringTheEntireStatement2.getName().equals("containsOnly")) &&
2877+
invocationCoveringTheEntireStatement1.arguments().size() > 1 && invocationCoveringTheEntireStatement1.arguments().get(1).contains(".of(")) ||
28762878
(invocationCoveringTheEntireStatement1.getName().equals("assertThat") && invocationCoveringTheEntireStatement2.getName().equals("isEmpty") &&
28772879
invocationCoveringTheEntireStatement1.arguments().size() > 1 && invocationCoveringTheEntireStatement1.arguments().get(1).contains("empty()")) ||
28782880
(invocationCoveringTheEntireStatement1.getName().equals("assertThat") && invocationCoveringTheEntireStatement2.getName().equals("isFalse") &&
@@ -2999,6 +3001,8 @@ else if((invocationCoveringTheEntireStatement1.getName().equals("isTrue") && inv
29993001
invocationCoveringTheEntireStatement2.arguments().size() > 0 && invocationCoveringTheEntireStatement2.arguments().get(0).startsWith("0")) ||
30003002
(invocationCoveringTheEntireStatement2.getName().equals("assertEquals") && invocationCoveringTheEntireStatement1.getName().equals("isOne") &&
30013003
invocationCoveringTheEntireStatement2.arguments().size() > 0 && invocationCoveringTheEntireStatement2.arguments().get(0).startsWith("1")) ||
3004+
(invocationCoveringTheEntireStatement2.getName().equals("assertEquals") && (invocationCoveringTheEntireStatement1.getName().equals("containsExactly") || invocationCoveringTheEntireStatement1.getName().equals("containsOnly")) &&
3005+
invocationCoveringTheEntireStatement2.arguments().size() > 1 && invocationCoveringTheEntireStatement2.arguments().get(1).contains(".of(")) ||
30023006
(invocationCoveringTheEntireStatement2.getName().equals("assertThat") && invocationCoveringTheEntireStatement1.getName().equals("isEmpty") &&
30033007
invocationCoveringTheEntireStatement2.arguments().size() > 1 && invocationCoveringTheEntireStatement2.arguments().get(1).contains("empty()")) ||
30043008
(invocationCoveringTheEntireStatement2.getName().equals("assertThat") && invocationCoveringTheEntireStatement1.getName().equals("isFalse") &&

src/test/java/org/refactoringminer/test/TestRelatedStatementMappingsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ else if (ref instanceof RenameClassRefactoring renameTestRefactoring)
437437
"https://github.com/apache/iceberg.git, fac03ea3c0d8555d85b1e85c8e9f6ce178bc4e9b, iceberg-fac03ea3c0d8555d85b1e85c8e9f6ce178bc4e9b-migrate-param.txt",
438438
////TestNG to JUnit 5
439439
"https://github.com/OpenGamma/Strata.git, 1dd64e965041a1e3fb81adf8ce9156c451d8252b, Strata-1dd64e965041a1e3fb81adf8ce9156c451d8252b-migrate-param.txt",
440-
//"https://github.com/OpenGamma/Strata.git, b2b9b629685ebc7e89e9a1667de88f2e878d5fc4, Strata-b2b9b629685ebc7e89e9a1667de88f2e878d5fc4.txt", //TODO: Too slow and fails without any error message
440+
"https://github.com/OpenGamma/Strata.git, b2b9b629685ebc7e89e9a1667de88f2e878d5fc4, Strata-b2b9b629685ebc7e89e9a1667de88f2e878d5fc4.txt", //TODO: Too slow and fails without any error message
441441
"https://github.com/OpenGamma/Strata.git, e007f826c49075500def8638de8367960c054c19, Strata-e007f826c49075500def8638de8367960c054c19-migrate-param.txt",
442442
"https://github.com/zanata/zanata-platform.git, 0297e0513ac1f487f1570b1cc38979a73ac97da8, zanata-platform-0297e0513ac1f487f1570b1cc38979a73ac97da8-migrate-param.txt",
443443
})

src/test/java/org/refactoringminer/test/TestStatementMappings.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.refactoringminer.test;
22

3-
import static org.refactoringminer.astDiff.utils.URLHelper.nthIndexOf;
43
import static org.refactoringminer.test.TestJavadocDiff.generateClassDiff;
54

65
import java.io.File;
@@ -20,7 +19,6 @@
2019
import org.junit.jupiter.params.provider.CsvSource;
2120
import org.refactoringminer.api.ModelDiffRefactoringHandler;
2221
import org.refactoringminer.api.Refactoring;
23-
import org.refactoringminer.api.RefactoringHandler;
2422
import org.refactoringminer.api.RefactoringType;
2523
import org.refactoringminer.rm1.GitHistoryRefactoringMinerImpl;
2624

@@ -977,18 +975,22 @@ public void testAssertStatementMappings4() throws Exception {
977975
Assertions.assertTrue(expected.size() == actual.size() && expected.containsAll(actual) && actual.containsAll(expected));
978976
}
979977

980-
@Test
981-
public void testJUnit3MigrationMappings() throws Exception {
978+
@ParameterizedTest
979+
@CsvSource({
980+
"https://github.com/MrSorrow/spring-framework.git, d5ee787e1e6653257720afe31ee3f8819cd4605c, spring-framework-d5ee787e1e6653257720afe31ee3f8819cd4605c.txt",
981+
"https://github.com/OpenGamma/Strata.git, b2b9b629685ebc7e89e9a1667de88f2e878d5fc4, Strata-b2b9b629685ebc7e89e9a1667de88f2e878d5fc4-migration.txt"
982+
})
983+
public void testJUnit3MigrationMappings(String url, String commitId, String testResultFileName) throws Exception {
982984
GitHistoryRefactoringMinerImpl miner = new GitHistoryRefactoringMinerImpl();
983985
final List<String> actual = new ArrayList<>();
984-
UMLModelDiff modelDiff = miner.detectAtCommitWithGitHubAPI("https://github.com/MrSorrow/spring-framework.git", "d5ee787e1e6653257720afe31ee3f8819cd4605c", new File(REPOS));
986+
UMLModelDiff modelDiff = miner.detectAtCommitWithGitHubAPI(url, commitId, new File(REPOS));
985987
List<UMLClassDiff> commonClassDiff = modelDiff.getCommonClassDiffList();
986988
for(UMLClassDiff classDiff : commonClassDiff) {
987989
for(UMLOperationBodyMapper mapper : classDiff.getOperationBodyMapperList()) {
988990
mapperInfo(mapper, actual);
989991
}
990992
}
991-
List<String> expected = IOUtils.readLines(new FileReader(EXPECTED_PATH + "spring-framework-d5ee787e1e6653257720afe31ee3f8819cd4605c.txt"));
993+
List<String> expected = IOUtils.readLines(new FileReader(EXPECTED_PATH + testResultFileName));
992994
Assertions.assertTrue(expected.size() == actual.size() && expected.containsAll(actual) && actual.containsAll(expected));
993995
}
994996

0 commit comments

Comments
 (0)