Post split cleanup

- change groupIds
- change packages
- update poms

Change-Id: I343c5a292a67de1dd50687870ca4ab5b7276e93e
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>

3 files changed, 257 insertions, 0 deletions

diff --git a/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/read/JvppDumpExecutorTest.java b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/read/JvppDumpExecutorTest.java
new file mode 100644
index 000000000..1259e89c8
--- /dev/null
+++ b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/read/JvppDumpExecutorTest.java
@@ -0,0 +1,91 @@
+/*
+ * 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.hc2vpp.common.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.hc2vpp.common.test.util.FutureProducer;
+import io.fd.vpp.jvpp.VppInvocationException;
+import io.fd.vpp.jvpp.core.future.FutureJVppCore;
+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;
+
+/**
+ * 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()).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);
+    }
+}
diff --git a/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/read/ListReaderCustomizerTest.java b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/read/ListReaderCustomizerTest.java
new file mode 100644
index 000000000..3c11b2d3c
--- /dev/null
+++ b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/read/ListReaderCustomizerTest.java
@@ -0,0 +1,60 @@
+/*
+ * 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.hc2vpp.common.test.read;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer;
+import java.lang.reflect.Method;
+import java.util.List;
+import org.opendaylight.yangtools.concepts.Builder;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.binding.Identifiable;
+import org.opendaylight.yangtools.yang.binding.Identifier;
+
+/**
+ * Generic test for classes implementing {@link ListReaderCustomizer} interface.
+ *
+ * @param <D> Specific DataObject derived type (Identifiable), that is handled by this customizer
+ * @param <K> Specific Identifier for handled type (D)
+ * @param <B> Specific Builder for handled type (D)
+ */
+public abstract class ListReaderCustomizerTest<D extends DataObject & Identifiable<K>, K extends Identifier<D>, B extends Builder<D>> extends
+    ReaderCustomizerTest<D, B> {
+
+    protected ListReaderCustomizerTest(
+        final Class<D> dataObjectClass,
+        final Class<? extends Builder<? extends DataObject>> parentBuilderClass) {
+        super(dataObjectClass, parentBuilderClass);
+    }
+
+    @Override
+    protected ListReaderCustomizer<D, K, B> getCustomizer() {
+        return ListReaderCustomizer.class.cast(super.getCustomizer());
+    }
+
+    @Override
+    public void testMerge() throws Exception {
+        final Builder<? extends DataObject> parentBuilder = mock(parentBuilderClass);
+        final List<D> value = (List<D>) mock(List.class);
+        getCustomizer().merge(parentBuilder, value);
+
+        final Method method = parentBuilderClass.getMethod("set" + dataObjectClass.getSimpleName(), List.class);
+        method.invoke(verify(parentBuilder), value);
+    }
+}
diff --git a/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/read/ReaderCustomizerTest.java b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/read/ReaderCustomizerTest.java
new file mode 100644
index 000000000..d403dce55
--- /dev/null
+++ b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/read/ReaderCustomizerTest.java
@@ -0,0 +1,106 @@
+/*
+ * 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.hc2vpp.common.test.read;
+
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import io.fd.honeycomb.translate.MappingContext;
+import io.fd.honeycomb.translate.ModificationCache;
+import io.fd.honeycomb.translate.read.ReadContext;
+import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
+import io.fd.honeycomb.translate.read.ReadContext;
+import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
+import io.fd.hc2vpp.common.test.util.FutureProducer;
+import io.fd.hc2vpp.common.test.util.NamingContextHelper;
+import java.lang.reflect.Method;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.opendaylight.yangtools.concepts.Builder;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import io.fd.vpp.jvpp.core.future.FutureJVppCore;
+
+/**
+ * Generic test for classes implementing {@link ReaderCustomizer} interface.
+ *
+ * @param <D> Specific DataObject derived type (Identifiable), that is handled by this customizer
+ * @param <B> Specific Builder for handled type (D)
+ */
+public abstract class ReaderCustomizerTest<D extends DataObject, B extends Builder<D>> implements FutureProducer,
+    NamingContextHelper {
+
+    @Mock
+    protected FutureJVppCore api;
+    @Mock
+    protected ReadContext ctx;
+    @Mock
+    protected MappingContext mappingContext;
+
+    protected final Class<? extends Builder<? extends DataObject>> parentBuilderClass;
+    protected final Class<D> dataObjectClass;
+    protected ModificationCache cache;
+    protected ReaderCustomizer<D, B> customizer;
+
+    public ReaderCustomizerTest(
+        final Class<D> dataObjectClass,
+        final Class<? extends Builder<? extends DataObject>> parentBuilderClass) {
+        this.dataObjectClass = dataObjectClass;
+        this.parentBuilderClass = parentBuilderClass;
+    }
+
+    @Before
+    public final void setUpParent() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        cache = new ModificationCache();
+        Mockito.doReturn(cache).when(ctx).getModificationCache();
+        Mockito.doReturn(mappingContext).when(ctx).getMappingContext();
+        setUp();
+        customizer = initCustomizer();
+    }
+
+    /**
+     * Optional setup for subclasses. Invoked before customizer is initialized.
+     */
+    protected void setUp() throws Exception {
+    }
+
+    protected abstract ReaderCustomizer<D, B> initCustomizer();
+
+    protected ReaderCustomizer<D, B> getCustomizer() {
+        return customizer;
+    }
+
+    @Test
+    public void testGetBuilder() throws Exception {
+        assertNotNull(customizer.getBuilder(InstanceIdentifier.create(dataObjectClass)));
+    }
+
+    @Test
+    public void testMerge() throws Exception {
+        final Builder<? extends DataObject> parentBuilder = mock(parentBuilderClass);
+        final D value = mock(dataObjectClass);
+        getCustomizer().merge(parentBuilder, value);
+
+        final Method method = parentBuilderClass.getMethod("set" + dataObjectClass.getSimpleName(), dataObjectClass);
+        method.invoke(verify(parentBuilder), value);
+    }
+}