From 7960b4e09fb8807d897b5b913ab43b2c8e07219d Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Mon, 19 Mar 2018 21:13:53 +0900 Subject: [PATCH] Rename RecursiveMergerTest and ResolveMergerTest to reduce confusion The class names imply that RecursiveMergerTest tests the RecursiveMerger and ResolveMergerTest tests the ResolveMerger. In fact, both of them include coverage of both strategies; the difference is that RecursiveMergerTest is only testing criss-cross merges. The tests cannot be combined into a single class because the criss-cross test methods have additional data points. Instead, rename the classes to more meaningful names. Change-Id: I7ca8a03a3b7e351e2d4fcaca3b3186c098a3ca66 Signed-off-by: David Pursehouse --- .../{RecursiveMergerTest.java => CrissCrossMergeTest.java} | 2 +- .../jgit/merge/{ResolveMergerTest.java => MergerTest.java} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/{RecursiveMergerTest.java => CrissCrossMergeTest.java} (99%) rename org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/{ResolveMergerTest.java => MergerTest.java} (99%) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/RecursiveMergerTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/CrissCrossMergeTest.java similarity index 99% rename from org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/RecursiveMergerTest.java rename to org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/CrissCrossMergeTest.java index 190224a855..ee99aa1379 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/RecursiveMergerTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/CrissCrossMergeTest.java @@ -83,7 +83,7 @@ import org.junit.experimental.theories.Theory; import org.junit.runner.RunWith; @RunWith(Theories.class) -public class RecursiveMergerTest extends RepositoryTestCase { +public class CrissCrossMergeTest extends RepositoryTestCase { static int counter = 0; @DataPoints diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergerTest.java similarity index 99% rename from org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java rename to org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergerTest.java index 2f8d606e6c..58093a3729 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergerTest.java @@ -97,7 +97,7 @@ import org.junit.experimental.theories.Theory; import org.junit.runner.RunWith; @RunWith(Theories.class) -public class ResolveMergerTest extends RepositoryTestCase { +public class MergerTest extends RepositoryTestCase { @DataPoints public static MergeStrategy[] strategiesUnderTest = new MergeStrategy[] { -- 2.39.5