diff options
| author | David Pursehouse <david.pursehouse@gmail.com> | 2018-03-19 21:10:04 +0900 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2018-03-24 22:15:44 +0100 |
| commit | 6d3a29d25ffe00bff7b666efd16617f6d29038ce (patch) | |
| tree | 39e5fedb7b0d57ef2e186d5600a974754c9e3432 | |
| parent | a77ffdf0802a623a739c388d648eb66e50df6c8e (diff) | |
| download | jgit-6d3a29d25ffe00bff7b666efd16617f6d29038ce.tar.gz jgit-6d3a29d25ffe00bff7b666efd16617f6d29038ce.zip | |
ResolveMergerTest: Use @DataPoints instead of @DataPoint
Define strategiesUnderTest as an array of MergeStrategy using the
@DataPoints annotation, rather than two separate variables each
annotated as @DataPoint.
This makes the implementation consistent with RecursiveMergerTest.
Change-Id: I9f1d525b38cb59634ba054c7779dc4af1fc46e25
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java index 75b87447d4..2f8d606e6c 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java @@ -91,7 +91,7 @@ import org.eclipse.jgit.treewalk.FileTreeIterator; import org.eclipse.jgit.util.FS; import org.eclipse.jgit.util.FileUtils; import org.junit.Assert; -import org.junit.experimental.theories.DataPoint; +import org.junit.experimental.theories.DataPoints; import org.junit.experimental.theories.Theories; import org.junit.experimental.theories.Theory; import org.junit.runner.RunWith; @@ -99,11 +99,9 @@ import org.junit.runner.RunWith; @RunWith(Theories.class) public class ResolveMergerTest extends RepositoryTestCase { - @DataPoint - public static MergeStrategy resolve = MergeStrategy.RESOLVE; - - @DataPoint - public static MergeStrategy recursive = MergeStrategy.RECURSIVE; + @DataPoints + public static MergeStrategy[] strategiesUnderTest = new MergeStrategy[] { + MergeStrategy.RECURSIVE, MergeStrategy.RESOLVE }; @Theory public void failingDeleteOfDirectoryWithUntrackedContent( |