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>

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 75b87447d4908c35abe6c59e636cae9d1c40b461..2f8d606e6c7bf4fdd8e10fcc96e76d48211a4b53 100644 (file)
--- 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(