summaryrefslogtreecommitdiffstats
path: root/vpp-common
diff options
context:
space:
mode:
authorJan Srnicek <jsrnicek@cisco.com>2016-09-28 09:33:32 +0200
committerMarek Gradzki <mgradzki@cisco.com>2016-09-28 07:51:13 +0000
commit4afdbd544d82c4ed89a5a17812e114e54b2c82a2 (patch)
treec2741a55d4443efd566b4cff8febc264ef49b0fd /vpp-common
parent083a0439b72e4803ad713232a48c71d3dc9fbd42 (diff)
Lisp test coverage increased to ~80%
Change-Id: Id4e9072ebb8d66e532e30c1dc3bb6036bfdc9012 Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>
Diffstat (limited to 'vpp-common')
-rw-r--r--vpp-common/vpp-translate-test/pom.xml8
-rw-r--r--vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/read/DumpCheckTest.java81
-rw-r--r--vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/read/JvppDumpExecutorTest.java93
3 files changed, 181 insertions, 1 deletions
diff --git a/vpp-common/vpp-translate-test/pom.xml b/vpp-common/vpp-translate-test/pom.xml
index faa5b8b60..4dff6183d 100644
--- a/vpp-common/vpp-translate-test/pom.xml
+++ b/vpp-common/vpp-translate-test/pom.xml
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>io.fd.honeycomb.vpp</groupId>
@@ -64,5 +65,10 @@
<version>4.12</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>io.fd.honeycomb</groupId>
+ <artifactId>translate-utils</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</project>
diff --git a/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/read/DumpCheckTest.java b/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/read/DumpCheckTest.java
new file mode 100644
index 000000000..a21f49b6e
--- /dev/null
+++ b/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/read/DumpCheckTest.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2016 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.honeycomb.vpp.test.read;
+
+
+import io.fd.honeycomb.translate.util.read.cache.EntityDumpNonEmptyCheck;
+import io.fd.honeycomb.translate.util.read.cache.exceptions.check.DumpCheckFailedException;
+import io.fd.honeycomb.translate.util.read.cache.exceptions.check.i.DumpEmptyException;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Generic test for classes implementing {@link EntityDumpNonEmptyCheck}
+ *
+ * @param <T> implementations of {@link EntityDumpNonEmptyCheck}, that will be tested
+ * @param <U> data node handled by {@link EntityDumpNonEmptyCheck}
+ */
+public abstract class DumpCheckTest<T extends EntityDumpNonEmptyCheck<U>, U> {
+
+ private T check;
+ private U emptyData;
+ private U validData;
+
+ @Before
+ public void setupParent() {
+ this.check = initCheck();
+ this.emptyData = initEmptyData();
+ this.validData = initValidData();
+ }
+
+ @Test(expected = DumpEmptyException.class)
+ public void testWithNull() throws DumpCheckFailedException {
+ check.assertNotEmpty(null);
+ }
+
+ @Test(expected = DumpEmptyException.class)
+ public void testWithEmpty() throws DumpCheckFailedException {
+ check.assertNotEmpty(emptyData);
+ }
+
+ @Test
+ public void testWithValid() throws DumpCheckFailedException {
+ check.assertNotEmpty(validData);
+ }
+
+ /**
+ * Initialize new {@link EntityDumpNonEmptyCheck}.
+ */
+ protected abstract T initCheck();
+
+ /**
+ * Initialize data that should throw {@link DumpEmptyException} ,
+ * while beeing processed by {@link EntityDumpNonEmptyCheck}
+ */
+ protected abstract U initEmptyData();
+
+ /**
+ * Initialize data that should pass without exception ,
+ * while beeing processed by {@link EntityDumpNonEmptyCheck}
+ */
+ protected abstract U initValidData();
+
+
+ protected T getCheck() {
+ return this.check;
+ }
+}
diff --git a/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/read/JvppDumpExecutorTest.java b/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/read/JvppDumpExecutorTest.java
new file mode 100644
index 000000000..a3ab1fc3e
--- /dev/null
+++ b/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/read/JvppDumpExecutorTest.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2016 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.honeycomb.vpp.test.read;
+
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor;
+import io.fd.honeycomb.vpp.test.util.FutureProducer;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import org.junit.Before;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.openvpp.jvpp.VppInvocationException;
+import org.openvpp.jvpp.core.future.FutureJVppCore;
+
+/**
+ * Generic test for implementation of {@link EntityDumpExecutor}
+ *
+ * @param <T> implementation of {@link EntityDumpExecutor}
+ */
+public abstract class JvppDumpExecutorTest<T extends EntityDumpExecutor<?, ?>> implements FutureProducer {
+
+ @Mock
+ protected FutureJVppCore api;
+
+ private T executor;
+
+ @Before
+ public void setUpParent() {
+ MockitoAnnotations.initMocks(this);
+ this.executor = initExecutor();
+ }
+
+ protected abstract T initExecutor();
+
+ protected T getExecutor() {
+ return this.executor;
+ }
+
+ /**
+ * Return pre-stubed mock that will throw {@link TimeoutException},
+ * while performing desired method
+ */
+ protected FutureJVppCore doThrowTimeoutExceptionWhen()
+ throws InterruptedException, ExecutionException, TimeoutException {
+
+ CompletableFuture failedFuture = mock(CompletableFuture.class);
+ when(failedFuture.toCompletableFuture()).thenReturn(failedFuture);
+ when(failedFuture.get(anyLong(), eq(TimeUnit.SECONDS)))
+ .thenThrow(new TimeoutException("Exception invoked by " + JvppDumpExecutorTest.class.getName()));
+
+ return doReturn(failedFuture).when(api);
+ }
+
+ /**
+ * Return pre-stubed mock that will throw {@link VppInvocationException},
+ * while performing desired method
+ */
+ protected FutureJVppCore doThrowFailExceptionWhen() {
+ return doReturn(failedFuture(
+ new VppInvocationException("Exception invoked by " + JvppDumpExecutorTest.class.getName(), -1)))
+ .when(api);
+ }
+
+ /**
+ * Return pre-stubed mock that will return specified result
+ * while performing desired method
+ */
+ protected <U> FutureJVppCore doReturnResponseWhen(U replyDump) {
+ return doReturn(future(replyDump)).when(api);
+ }
+}