]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a77ffdf) | patch
ResolveMergerTest: Use @DataPoints instead of @DataPoint 59/119659/3
authorDavid Pursehouse <david.pursehouse@gmail.com>
Mon, 19 Mar 2018 12:10:04 +0000 (21:10 +0900)
committerMatthias Sohn <matthias.sohn@sap.com>
Sat, 24 Mar 2018 21:15:44 +0000 (22:15 +0100)
commit6d3a29d25ffe00bff7b666efd16617f6d29038ce
tree39e5fedb7b0d57ef2e186d5600a974754c9e3432tree | snapshot
parenta77ffdf0802a623a739c388d648eb66e50df6c8ecommit | diff
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>
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit