#38: Removed code duplication. Introduced new asserts.

exasol · Mar 5, 2019 · 4ab6c77 · 4ab6c77
1 parent 4dc9fb1
commit 4ab6c77
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 9 deletions.
diff --git a/src/test/java/com/exasol/adapter/capabilities/CapabilitiesTest.java b/src/test/java/com/exasol/adapter/capabilities/CapabilitiesTest.java
@@ -1,8 +1,6 @@
 package com.exasol.adapter.capabilities;
 
 import static com.exasol.adapter.capabilities.CapabilityAssertions.*;
-import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
-import static org.junit.Assert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertAll;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -31,7 +29,7 @@ void buildWithMainCapabilities() {
         final MainCapability[] expectedCapabilities = { MainCapability.AGGREGATE_GROUP_BY_COLUMN,
                 MainCapability.AGGREGATE_GROUP_BY_EXPRESSION };
         final Capabilities capabilities = this.builder.addMain(expectedCapabilities).build();
-        assertAll(() -> assertThat(capabilities.getMainCapabilities(), containsInAnyOrder(expectedCapabilities)), //
+        assertAll(() -> assertCapabilitesContainAllOf(capabilities, expectedCapabilities), //
                 () -> assertEmptyLiteralCapabilities(capabilities), //
                 () -> assertEmptyPredicateCapabilities(capabilities), //
                 () -> assertEmptyScalarFunctionCapabilities(capabilities), //
@@ -43,7 +41,7 @@ void buildWithLiteralCapabilities() {
         final LiteralCapability[] expectedCapabilities = { LiteralCapability.BOOL, LiteralCapability.DATE };
         final Capabilities capabilities = this.builder.addLiteral(expectedCapabilities).build();
         assertAll(() -> assertEmptyMainCapabilities(capabilities), //
-                () -> assertThat(capabilities.getLiteralCapabilities(), containsInAnyOrder(expectedCapabilities)), //
+                () -> assertCapabilitesContainAllOf(capabilities, expectedCapabilities), //
                 () -> assertEmptyPredicateCapabilities(capabilities), //
                 () -> assertEmptyScalarFunctionCapabilities(capabilities), //
                 () -> assertEmptyAggregateFunctionCapatilities(capabilities));
@@ -55,7 +53,7 @@ void buildWithPredicateCapabilities() {
         final Capabilities capabilities = this.builder.addPredicate(expectedCapabilities).build();
         assertAll(() -> assertEmptyMainCapabilities(capabilities), //
                 () -> assertEmptyLiteralCapabilities(capabilities), //
-                () -> assertThat(capabilities.getPredicateCapabilities(), containsInAnyOrder(expectedCapabilities)), //
+                () -> assertCapabilitesContainAllOf(capabilities, expectedCapabilities), //
                 () -> assertEmptyScalarFunctionCapabilities(capabilities), //
                 () -> assertEmptyAggregateFunctionCapatilities(capabilities));
     }
@@ -68,8 +66,7 @@ void buildWithScalarFunctionCapabilities() {
         assertAll(() -> assertEmptyMainCapabilities(capabilities), //
                 () -> assertEmptyLiteralCapabilities(capabilities), //
                 () -> assertEmptyPredicateCapabilities(capabilities), //
-                () -> assertThat(capabilities.getScalarFunctionCapabilities(),
-                        containsInAnyOrder(expectedCapabilities)), //
+                () -> assertCapabilitesContainAllOf(capabilities, expectedCapabilities), //
                 () -> assertEmptyAggregateFunctionCapatilities(capabilities));
     }
 
@@ -82,7 +79,6 @@ void buildWithAggregateFunctionCapabilities() {
                 () -> assertEmptyLiteralCapabilities(capabilities), //
                 () -> assertEmptyPredicateCapabilities(capabilities), //
                 () -> assertEmptyScalarFunctionCapabilities(capabilities), //
-                () -> assertThat(capabilities.getAggregateFunctionCapabilities(),
-                        containsInAnyOrder(expectedCapabilities)));
+                () -> assertCapabilitesContainAllOf(capabilities, expectedCapabilities));
     }
 }
diff --git a/src/test/java/com/exasol/adapter/capabilities/CapabilityAssertions.java b/src/test/java/com/exasol/adapter/capabilities/CapabilityAssertions.java
@@ -1,6 +1,7 @@
 package com.exasol.adapter.capabilities;
 
 import static org.hamcrest.collection.IsEmptyIterable.emptyIterableOf;
+import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
 import static org.junit.Assert.assertThat;
 
 public final class CapabilityAssertions {
@@ -27,4 +28,30 @@ public static void assertEmptyScalarFunctionCapabilities(final Capabilities capa
     public static void assertEmptyAggregateFunctionCapatilities(final Capabilities capabilities) {
         assertThat(capabilities.getAggregateFunctionCapabilities(), emptyIterableOf(AggregateFunctionCapability.class));
     }
+
+    public static void assertCapabilitesContainAllOf(final Capabilities capabilities,
+            final MainCapability... expectedCapabilities) {
+        assertThat(capabilities.getMainCapabilities(), containsInAnyOrder(expectedCapabilities));
+    }
+
+    public static void assertCapabilitesContainAllOf(final Capabilities capabilities,
+            final LiteralCapability... expectedCapabilities) {
+        assertThat(capabilities.getLiteralCapabilities(), containsInAnyOrder(expectedCapabilities));
+    }
+
+    public static void assertCapabilitesContainAllOf(final Capabilities capabilities,
+            final PredicateCapability... expectedCapabilities) {
+        assertThat(capabilities.getPredicateCapabilities(), containsInAnyOrder(expectedCapabilities));
+    }
+
+    public static void assertCapabilitesContainAllOf(final Capabilities capabilities,
+            final ScalarFunctionCapability... expectedCapabilities) {
+        assertThat(capabilities.getScalarFunctionCapabilities(), containsInAnyOrder(expectedCapabilities));
+    }
+
+    public static void assertCapabilitesContainAllOf(final Capabilities capabilities,
+            final AggregateFunctionCapability... expectedCapabilities) {
+        assertThat(capabilities.getAggregateFunctionCapabilities(), containsInAnyOrder(expectedCapabilities));
+    }
+
 }