From f505fcdbb9db9bf3ac4bc2abc6969d1b05a3bdd7 Mon Sep 17 00:00:00 2001 From: Rene Pfeuffer Date: Thu, 1 Nov 2018 11:16:18 +0100 Subject: [PATCH] Remove .java suffix from test file names Otherwise searching for the original class may present you multiple results --- scm-it/src/test/java/sonia/scm/it/DiffITCase.java | 6 +++--- ...nDiffGenerator_forTest.java => SvnDiffGenerator_forTest} | 0 ...nDiffGenerator_forTest.java => SvnDiffGenerator_forTest} | 0 ...nDiffGenerator_forTest.java => SvnDiffGenerator_forTest} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename scm-it/src/test/resources/diff/largefile/modified/v1/{SvnDiffGenerator_forTest.java => SvnDiffGenerator_forTest} (100%) rename scm-it/src/test/resources/diff/largefile/modified/v2/{SvnDiffGenerator_forTest.java => SvnDiffGenerator_forTest} (100%) rename scm-it/src/test/resources/diff/largefile/original/{SvnDiffGenerator_forTest.java => SvnDiffGenerator_forTest} (100%) diff --git a/scm-it/src/test/java/sonia/scm/it/DiffITCase.java b/scm-it/src/test/java/sonia/scm/it/DiffITCase.java index bf104ac852..6027652161 100644 --- a/scm-it/src/test/java/sonia/scm/it/DiffITCase.java +++ b/scm-it/src/test/java/sonia/scm/it/DiffITCase.java @@ -154,7 +154,7 @@ public class DiffITCase { @Test public void svnLargeChangesDiffShouldBeConvertedToGitDiff() throws IOException, URISyntaxException { - String fileName = "SvnDiffGenerator_forTest.java"; + String fileName = "SvnDiffGenerator_forTest"; RepositoryUtil.createAndCommitFile(svnRepositoryClient, ADMIN_USERNAME, fileName, ""); RepositoryUtil.createAndCommitFile(gitRepositoryClient, ADMIN_USERNAME, fileName, ""); @@ -164,13 +164,13 @@ public class DiffITCase { assertThat(svnDiff) .isEqualTo(getGitDiffWithoutIndexLine(gitDiff)); - fileContent = getFileContent("/diff/largefile/modified/v1/SvnDiffGenerator_forTest.java"); + fileContent = getFileContent("/diff/largefile/modified/v1/SvnDiffGenerator_forTest"); svnDiff = getDiff(RepositoryUtil.updateAndCommitFile(svnRepositoryClient, ADMIN_USERNAME, fileName, fileContent), svnRepositoryResponse); gitDiff = getDiff(RepositoryUtil.updateAndCommitFile(gitRepositoryClient, ADMIN_USERNAME, fileName, fileContent), gitRepositoryResponse); assertThat(svnDiff) .isEqualTo(getGitDiffWithoutIndexLine(gitDiff)); - fileContent = getFileContent("/diff/largefile/modified/v2/SvnDiffGenerator_forTest.java"); + fileContent = getFileContent("/diff/largefile/modified/v2/SvnDiffGenerator_forTest"); svnDiff = getDiff(RepositoryUtil.updateAndCommitFile(svnRepositoryClient, ADMIN_USERNAME, fileName, fileContent), svnRepositoryResponse); gitDiff = getDiff(RepositoryUtil.updateAndCommitFile(gitRepositoryClient, ADMIN_USERNAME, fileName, fileContent), gitRepositoryResponse); assertThat(svnDiff) diff --git a/scm-it/src/test/resources/diff/largefile/modified/v1/SvnDiffGenerator_forTest.java b/scm-it/src/test/resources/diff/largefile/modified/v1/SvnDiffGenerator_forTest similarity index 100% rename from scm-it/src/test/resources/diff/largefile/modified/v1/SvnDiffGenerator_forTest.java rename to scm-it/src/test/resources/diff/largefile/modified/v1/SvnDiffGenerator_forTest diff --git a/scm-it/src/test/resources/diff/largefile/modified/v2/SvnDiffGenerator_forTest.java b/scm-it/src/test/resources/diff/largefile/modified/v2/SvnDiffGenerator_forTest similarity index 100% rename from scm-it/src/test/resources/diff/largefile/modified/v2/SvnDiffGenerator_forTest.java rename to scm-it/src/test/resources/diff/largefile/modified/v2/SvnDiffGenerator_forTest diff --git a/scm-it/src/test/resources/diff/largefile/original/SvnDiffGenerator_forTest.java b/scm-it/src/test/resources/diff/largefile/original/SvnDiffGenerator_forTest similarity index 100% rename from scm-it/src/test/resources/diff/largefile/original/SvnDiffGenerator_forTest.java rename to scm-it/src/test/resources/diff/largefile/original/SvnDiffGenerator_forTest