From a187772e776167805dfb8747931128ef45296e3b Mon Sep 17 00:00:00 2001
From: Robert Munteanu <rombert@apache.org>
Date: Wed, 26 Aug 2015 17:09:58 +0300
Subject: [PATCH] OAK-3300 - Include parameter descriptions in test output when
 running parameterised tests

---
 oak-core/src/test/java/org/apache/jackrabbit/oak/OakBaseTest.java       | 2 +-
 .../java/org/apache/jackrabbit/oak/plugins/segment/HeavyWriteIT.java    | 2 +-
 .../test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java | 2 +-
 oak-parent/pom.xml                                                      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/OakBaseTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/OakBaseTest.java
index f0f401a..0e380c8 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/OakBaseTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/OakBaseTest.java
@@ -44,7 +44,7 @@ public abstract class OakBaseTest {
      */
     private static final Set<Fixture> FIXTURES = FixturesHelper.getFixtures();
 
-    @Parameterized.Parameters
+    @Parameterized.Parameters(name="{0}")
     public static Collection<Object[]> fixtures() {
         Collection<Object[]> result = new ArrayList<Object[]>();
         if (FIXTURES.contains(DOCUMENT_NS)) {
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/HeavyWriteIT.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/HeavyWriteIT.java
index 190ac78..5c259b9 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/HeavyWriteIT.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/HeavyWriteIT.java
@@ -62,7 +62,7 @@ public class HeavyWriteIT {
 
     private File directory;
 
-    @Parameterized.Parameters
+    @Parameterized.Parameters(name="usePersistedMap: {0}")
     public static List<Boolean[]> fixtures() {
         return ImmutableList.of(new Boolean[] {true}, new Boolean[] {false});
     }
diff --git a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java
index 759f8bc..a000579 100644
--- a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java
+++ b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java
@@ -68,7 +68,7 @@ public abstract class AbstractRepositoryTest {
         this.fixture = fixture;
     }
 
-    @Parameterized.Parameters
+    @Parameterized.Parameters(name="{0}")
     public static Collection<Object[]> fixtures() {
         Collection<Object[]> result = new ArrayList<Object[]>();
         if (FIXTURES.contains(Fixture.DOCUMENT_NS)) {
diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml
index ef06c71..f28932b 100644
--- a/oak-parent/pom.xml
+++ b/oak-parent/pom.xml
@@ -381,7 +381,7 @@
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>4.10</version>
+        <version>4.12</version>
       </dependency>
       <dependency>
         <groupId>org.mongodb</groupId>
-- 
2.5.0