Browse Source

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>
stable-5.0
David Pursehouse 7 years ago committed by Matthias Sohn
parent
commit
6d3a29d25f
  1. 10
      org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java

10
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.FS;
import org.eclipse.jgit.util.FileUtils; import org.eclipse.jgit.util.FileUtils;
import org.junit.Assert; 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.Theories;
import org.junit.experimental.theories.Theory; import org.junit.experimental.theories.Theory;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@ -99,11 +99,9 @@ import org.junit.runner.RunWith;
@RunWith(Theories.class) @RunWith(Theories.class)
public class ResolveMergerTest extends RepositoryTestCase { public class ResolveMergerTest extends RepositoryTestCase {
@DataPoint @DataPoints
public static MergeStrategy resolve = MergeStrategy.RESOLVE; public static MergeStrategy[] strategiesUnderTest = new MergeStrategy[] {
MergeStrategy.RECURSIVE, MergeStrategy.RESOLVE };
@DataPoint
public static MergeStrategy recursive = MergeStrategy.RECURSIVE;
@Theory @Theory
public void failingDeleteOfDirectoryWithUntrackedContent( public void failingDeleteOfDirectoryWithUntrackedContent(

Loading…
Cancel
Save