Resolve merge conflicts

rdblue · Feb 4, 2015 · 0187376 · 0187376
2 parents 25aa716 + 51952f8
commit 0187376
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/parquet-column/src/test/java/parquet/filter2/predicate/TestFilterApiMethods.java b/parquet-column/src/test/java/parquet/filter2/predicate/TestFilterApiMethods.java
@@ -87,7 +87,7 @@ public void testUdp() {
     FilterPredicate predicate = or(eq(doubleColumn, 12.0), userDefined(intColumn, DummyUdp.class));
     assertTrue(predicate instanceof Or);
     FilterPredicate ud = ((Or) predicate).getRight();
-    assertTrue(ud instanceof UserDefined);
+    assertTrue(ud instanceof UserDefinedByClass);
     assertEquals(DummyUdp.class, ((UserDefinedByClass) ud).getUserDefinedPredicateClass());
     assertTrue(((UserDefined) ud).getUserDefinedPredicate() instanceof DummyUdp);
   }