From 6d3a29d25ffe00bff7b666efd16617f6d29038ce Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Mon, 19 Mar 2018 21:10:04 +0900 Subject: [PATCH] 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 --- .../tst/org/eclipse/jgit/merge/ResolveMergerTest.java | 10 ++++------ 1 file 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( -- 2.39.5