svn commit: r1750465 - /jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FixturesHelper.java

[ch...@apache.org]

Author: chetanm
Date: Tue Jun 28 10:40:12 2016
New Revision: 1750465

URL: http://svn.apache.org/viewvc?rev=1750465&view=rev
Log:
OAK-4475 - CI failing on branches due to unknown fixture SEGMENT_TAR

Handle specific case of SEGMENT_TAR which on branches is not part of enum and hence should be ignored

Modified:
    jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FixturesHelper.java

Modified: jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FixturesHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FixturesHelper.java?rev=1750465&r1=1750464&r2=1750465&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FixturesHelper.java (original)
+++ jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FixturesHelper.java Tue Jun 28 10:40:12 2016
@@ -54,10 +54,16 @@ public final class FixturesHelper {
         } else {
             Set<Fixture> tmp = EnumSet.noneOf(Fixture.class);
             for (String f : raw.split(SPLIT_ON)) {
-                String x = f.trim();
-                Fixture fx = Fixture.valueOf(x.toUpperCase());
-                if (fx != null) {
+                String x = f.trim().toUpperCase();
+                try {
+                    Fixture fx = Fixture.valueOf(x);
                     tmp.add(fx);
+                } catch (IllegalArgumentException e){
+                    //This fixture is not present in branches
+                    //so would need to be ignored
+                    if (!"SEGMENT_TAR".equals(x)){
+                        throw e;
+                    }
                 }
             }