HC2VPP-38 / HONEYCOMB-336 - removed mandatory from ace-ip-version

Removed mandatory statements
Fixed multiple NPE

Change-Id: I30af417b0594d9634a9352f7721285257fbcee1e
Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>

1 files changed, 44 insertions, 0 deletions

diff --git a/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/util/CommonTests.java b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/util/CommonTests.java
new file mode 100644
index 000000000..53d84f5f8
--- /dev/null
+++ b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/util/CommonTests.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.hc2vpp.common.test.util;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import javax.annotation.Nonnull;
+
+public interface CommonTests {
+
+    default void verifyExceptionalCase(@Nonnull final Performer negativeCase,
+                                       @Nonnull final Class<? extends Exception> expectedExceptionType) {
+        try {
+            negativeCase.perform();
+        } catch (Exception e) {
+            assertEquals(e.getLocalizedMessage(), e.getClass(), expectedExceptionType);
+            return;
+        }
+        fail("Test should have thrown exception");
+    }
+
+    /**
+     * Used to just perform test, without consuming or supplying anything
+     */
+    @FunctionalInterface
+    interface Performer {
+        void perform();
+    }
+}