summaryrefslogtreecommitdiffstats
path: root/vpp-common/vpp-translate-utils/src/test
diff options
context:
space:
mode:
authorMaros Marsalek <mmarsale@cisco.com>2016-11-10 13:31:25 +0100
committerMarek Gradzki <mgradzki@cisco.com>2016-11-19 21:29:39 +0100
commit175197da8ea43335df3daeba4c6296fcd83a057c (patch)
tree110298a990c6191933c2ad65d1a06333bab76cee /vpp-common/vpp-translate-utils/src/test
parent1813bf59fa53e8eb913d34b212d45b227dead799 (diff)
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>
Diffstat (limited to 'vpp-common/vpp-translate-utils/src/test')
-rw-r--r--vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/AddressTranslatorTest.java (renamed from vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/AddressTranslatorTest.java)2
-rw-r--r--vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/ByteDataTranslatorTest.java (renamed from vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/ByteDataTranslatorTest.java)3
-rw-r--r--vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/Ipv4AddressRangeTest.java (renamed from vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/Ipv4AddressRangeTest.java)3
-rw-r--r--vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/Ipv4TranslatorTest.java (renamed from vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/Ipv4TranslatorTest.java)3
-rw-r--r--vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/Ipv6TranslatorTest.java (renamed from vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/Ipv6TranslatorTest.java)3
-rw-r--r--vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/JvppReplyConsumerTest.java (renamed from vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/JvppReplyConsumerTest.java)5
-rw-r--r--vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/MacTranslatorTest.java (renamed from vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/MacTranslatorTest.java)3
-rw-r--r--vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/VppStatusListenerTest.java (renamed from vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/VppStatusListenerTest.java)3
-rw-r--r--vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/cache/DumpCacheManagerTest.java152
9 files changed, 17 insertions, 160 deletions
diff --git a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/AddressTranslatorTest.java b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/AddressTranslatorTest.java
index 71a41dd5e..97fb2747c 100644
--- a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/AddressTranslatorTest.java
+++ b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/AddressTranslatorTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package io.fd.honeycomb.translate.vpp.util;
+package io.fd.hc2vpp.common.translate.util;
import static org.junit.Assert.assertEquals;
diff --git a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/ByteDataTranslatorTest.java b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/ByteDataTranslatorTest.java
index 3462b4cf8..8494568ec 100644
--- a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/ByteDataTranslatorTest.java
+++ b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/ByteDataTranslatorTest.java
@@ -14,11 +14,12 @@
* limitations under the License.
*/
-package io.fd.honeycomb.translate.vpp.util;
+package io.fd.hc2vpp.common.translate.util;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
import org.junit.Test;
public class ByteDataTranslatorTest implements ByteDataTranslator {
diff --git a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/Ipv4AddressRangeTest.java b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/Ipv4AddressRangeTest.java
index aef81fce6..ebaa65f43 100644
--- a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/Ipv4AddressRangeTest.java
+++ b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/Ipv4AddressRangeTest.java
@@ -14,10 +14,11 @@
* limitations under the License.
*/
-package io.fd.honeycomb.translate.vpp.util;
+package io.fd.hc2vpp.common.translate.util;
import static org.junit.Assert.assertEquals;
+import io.fd.hc2vpp.common.translate.util.Ipv4AddressRange;
import java.util.Arrays;
import java.util.Collection;
import org.junit.Test;
diff --git a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/Ipv4TranslatorTest.java b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/Ipv4TranslatorTest.java
index 39fc620b2..722e2c62c 100644
--- a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/Ipv4TranslatorTest.java
+++ b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/Ipv4TranslatorTest.java
@@ -14,10 +14,11 @@
* limitations under the License.
*/
-package io.fd.honeycomb.translate.vpp.util;
+package io.fd.hc2vpp.common.translate.util;
import static org.junit.Assert.assertEquals;
+import io.fd.hc2vpp.common.translate.util.Ipv4Translator;
import org.junit.Test;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
diff --git a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/Ipv6TranslatorTest.java b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/Ipv6TranslatorTest.java
index 6a5d13613..073754a98 100644
--- a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/Ipv6TranslatorTest.java
+++ b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/Ipv6TranslatorTest.java
@@ -14,10 +14,11 @@
* limitations under the License.
*/
-package io.fd.honeycomb.translate.vpp.util;
+package io.fd.hc2vpp.common.translate.util;
import static org.junit.Assert.assertEquals;
+import io.fd.hc2vpp.common.translate.util.Ipv6Translator;
import org.junit.Test;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6AddressNoZone;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
diff --git a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/JvppReplyConsumerTest.java b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/JvppReplyConsumerTest.java
index 9b1cecf38..daf68d2b6 100644
--- a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/JvppReplyConsumerTest.java
+++ b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/JvppReplyConsumerTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package io.fd.honeycomb.translate.vpp.util;
+package io.fd.hc2vpp.common.translate.util;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -24,6 +24,9 @@ import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.ReadTimeoutException;
+import io.fd.hc2vpp.common.translate.util.WriteTimeoutException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
diff --git a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/MacTranslatorTest.java b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/MacTranslatorTest.java
index 2b5df66fd..f716b0f0a 100644
--- a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/MacTranslatorTest.java
+++ b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/MacTranslatorTest.java
@@ -14,10 +14,11 @@
* limitations under the License.
*/
-package io.fd.honeycomb.translate.vpp.util;
+package io.fd.hc2vpp.common.translate.util;
import static org.junit.Assert.assertEquals;
+import io.fd.hc2vpp.common.translate.util.MacTranslator;
import org.junit.Test;
public class MacTranslatorTest implements MacTranslator {
diff --git a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/VppStatusListenerTest.java b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/VppStatusListenerTest.java
index 93ee8ef06..39edd6091 100644
--- a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/VppStatusListenerTest.java
+++ b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/VppStatusListenerTest.java
@@ -14,10 +14,11 @@
* limitations under the License.
*/
-package io.fd.honeycomb.translate.vpp.util;
+package io.fd.hc2vpp.common.translate.util;
import static org.junit.Assert.assertTrue;
+import io.fd.hc2vpp.common.translate.util.VppStatusListener;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.ExpectedSystemExit;
diff --git a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/cache/DumpCacheManagerTest.java b/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/cache/DumpCacheManagerTest.java
deleted file mode 100644
index 81a47e8a2..000000000
--- a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/cache/DumpCacheManagerTest.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * 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.translate.vpp.util.cache;
-
-import static io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor.NO_PARAMS;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.when;
-
-import com.google.common.base.Optional;
-import io.fd.honeycomb.translate.ModificationCache;
-import io.fd.honeycomb.translate.read.ReadFailedException;
-import io.fd.honeycomb.translate.util.read.cache.CacheKeyFactory;
-import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager;
-import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor;
-import io.fd.honeycomb.translate.util.read.cache.EntityDumpPostProcessingFunction;
-import io.fd.honeycomb.translate.util.read.cache.IdentifierCacheKeyFactory;
-import io.fd.vpp.jvpp.core.dto.IpDetails;
-import io.fd.vpp.jvpp.core.dto.IpDetailsReplyDump;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public class DumpCacheManagerTest {
-
- private interface DataObj extends DataObject {}
-
- @Mock
- private EntityDumpExecutor<IpDetailsReplyDump, Void> executor;
-
- private InstanceIdentifier<DataObj> identifier;
-
- private DumpCacheManager<IpDetailsReplyDump, Void> managerPositive;
- private DumpCacheManager<IpDetailsReplyDump, Void> managerPositiveWithPostProcessing;
- private DumpCacheManager<IpDetailsReplyDump, Void> managerNegative;
- private ModificationCache cache;
- private CacheKeyFactory cacheKeyFactory;
-
- @Before
- public void init() {
- MockitoAnnotations.initMocks(this);
- managerPositive =
- new DumpCacheManager.DumpCacheManagerBuilder<IpDetailsReplyDump, Void>()
- .withExecutor(executor)
- .build();
-
- managerPositiveWithPostProcessing =
- new DumpCacheManager.DumpCacheManagerBuilder<IpDetailsReplyDump, Void>()
- .withExecutor(executor)
- .withPostProcessingFunction(createPostProcessor())
- .build();
-
- managerNegative =
- new DumpCacheManager.DumpCacheManagerBuilder<IpDetailsReplyDump, Void>()
- .withExecutor(executor)
- .build();
-
- cache = new ModificationCache();
- identifier = InstanceIdentifier.create(DataObj.class);
- //manager uses this implementation by default, so it can be used to test behaviour
- cacheKeyFactory = new IdentifierCacheKeyFactory();
-
- }
-
- /**
- * This test verify full dump-caching cycle
- */
- @Test
- public void testCaching() throws ReadFailedException {
- final IpDetailsReplyDump stage1Data = new IpDetailsReplyDump();
- final String key = cacheKeyFactory.createKey(identifier);
-
-
- // executor cant return null data
- when(executor.executeDump(identifier, NO_PARAMS)).thenReturn(new IpDetailsReplyDump());
-
- final Optional<IpDetailsReplyDump> stage1Optional = managerNegative.getDump(identifier, cache, NO_PARAMS);
-
- // this is first call so instance should be from executor
- // and it should be cached after calling executor
- assertEquals(true, stage1Optional.isPresent());
- assertEquals(stage1Data, stage1Optional.get());
- assertEquals(true, cache.containsKey(key));
- assertEquals(stage1Data, cache.get(key));
-
- //rebind executor with other data
- IpDetailsReplyDump stage2LoadedDump = new IpDetailsReplyDump();
- when(executor.executeDump(identifier, NO_PARAMS)).thenReturn(stage2LoadedDump);
-
- final Optional<IpDetailsReplyDump> stage2Optional = managerPositive.getDump(identifier, cache, NO_PARAMS);
-
- assertEquals(true, stage2Optional.isPresent());
- assertEquals(stage2LoadedDump, stage2Optional.get());
-
- //rebind executor with other data
- IpDetailsReplyDump stage3LoadedDump = new IpDetailsReplyDump();
- when(executor.executeDump(identifier, NO_PARAMS)).thenReturn(stage3LoadedDump);
-
- final Optional<IpDetailsReplyDump> stage3Optional = managerPositive.getDump(identifier, cache, NO_PARAMS);
- assertEquals(true, stage3Optional.isPresent());
- //check if it returns instance cached from previous stage
- assertEquals(stage2LoadedDump, stage3Optional.get());
- }
-
- @Test
- public void testPostprocessing() throws ReadFailedException {
- IpDetailsReplyDump dump = new IpDetailsReplyDump();
- IpDetails details = new IpDetails();
- details.swIfIndex = 2;
- dump.ipDetails.add(details);
-
- when(executor.executeDump(identifier, null)).thenReturn(dump);
-
- Optional<IpDetailsReplyDump> optionalDump =
- managerPositiveWithPostProcessing.getDump(identifier, cache, NO_PARAMS);
-
- assertEquals(true, optionalDump.isPresent());
- assertEquals(1, optionalDump.get().ipDetails.size());
- assertEquals(7, optionalDump.get().ipDetails.get(0).swIfIndex);
- }
-
- private EntityDumpPostProcessingFunction<IpDetailsReplyDump> createPostProcessor() {
- return ipDetailsReplyDump -> {
- IpDetailsReplyDump modified = new IpDetailsReplyDump();
-
- for (IpDetails detail : ipDetailsReplyDump.ipDetails) {
- IpDetails modifiedDetail = new IpDetails();
- modifiedDetail.swIfIndex = detail.swIfIndex + 5;
-
- modified.ipDetails.add(modifiedDetail);
- }
-
- return modified;
- };
- }
-} \ No newline at end of file