Upgrade to PowerMock 2 16/80316/2
authorStephen Kitt <skitt@redhat.com>
Wed, 13 Feb 2019 15:36:38 +0000 (16:36 +0100)
committerStephen Kitt <skitt@redhat.com>
Wed, 13 Feb 2019 16:33:13 +0000 (17:33 +0100)
This fixes the build in Java 11. A number of ignored tests are removed
in the process.

Change-Id: If6b8f42aeb8d42631df16bd3d22953720e0cc05d
Signed-off-by: Stephen Kitt <skitt@redhat.com>
ipv6service/impl/pom.xml
natservice/impl/pom.xml
natservice/impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/NaptManagerTest.java [deleted file]

index 6636d48ab83d6661874b51d3eb7bbba66b5be16f..63bb25fbc334d0bbcd4671f4c08355b974a8c2e7 100644 (file)
@@ -85,48 +85,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito</artifactId>
-            <version>1.6.4</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.javassist</groupId>
-            <artifactId>javassist</artifactId>
-            <version>3.21.0-GA</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>1.10.19</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <version>1.6.4</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-support</artifactId>
-            <version>1.6.4</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-reflect</artifactId>
-            <version>1.6.4</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-core</artifactId>
-            <version>1.6.4</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
index ef8c87155a6d6e4343e95d71c54a71bf7196779c..ce419ab09eb7376f39e668f31c6376a4d9dbb9f5 100644 (file)
@@ -122,47 +122,34 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <artifactId>org.apache.karaf.shell.console</artifactId>
             <scope>provided</scope>
         </dependency>
-        <!-- FIXME: Upgrade to Mockito 2 -->
         <dependency>
             <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito</artifactId>
-            <version>1.6.4</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.javassist</groupId>
-            <artifactId>javassist</artifactId>
-            <version>3.21.0-GA</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>1.10.19</version>
+            <artifactId>powermock-api-mockito2</artifactId>
+            <version>2.0.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>
-            <version>1.6.4</version>
+            <version>2.0.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-support</artifactId>
-            <version>1.6.4</version>
+            <version>2.0.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-reflect</artifactId>
-            <version>1.6.4</version>
+            <version>2.0.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-core</artifactId>
-            <version>1.6.4</version>
+            <version>2.0.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/natservice/impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/NaptManagerTest.java b/natservice/impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/NaptManagerTest.java
deleted file mode 100644 (file)
index 4a7577b..0000000
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright (c) 2016 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.netvirt.natservice.internal.test;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.when;
-
-import com.google.common.util.concurrent.Futures;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.genius.mdsalutil.MDSALUtil;
-import org.opendaylight.netvirt.natservice.internal.IPAddress;
-import org.opendaylight.netvirt.natservice.internal.NaptManager;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.CreateIdPoolInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.CreateIdPoolOutputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.IdManagerService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.IntextIpMap;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.intext.ip.map.IpMapping;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.intext.ip.map.IpMappingKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.intext.ip.map.ip.mapping.IpMap;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.intext.ip.map.ip.mapping.IpMapBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.intext.ip.map.ip.mapping.IpMapKey;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(MDSALUtil.class)
-public class NaptManagerTest {
-
-    @Mock
-    IdManagerService idMgr;
-    @Mock
-    DataBroker dataBroker;
-    InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111
-        .intext.ip.map.ip.mapping.IpMap> ipmapId = null;
-    org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.intext
-        .ip.map.ip.mapping.IpMap ipmap = null;
-
-    private NaptManager naptManager;
-
-    @Before
-    public void init() {
-        MockitoAnnotations.initMocks(this);
-        naptManager = new NaptManager(dataBroker, idMgr);
-        when(idMgr.createIdPool(any(CreateIdPoolInput.class))).thenReturn(
-                Futures.immediateFuture(RpcResultBuilder.success(new CreateIdPoolOutputBuilder().build()).build()));
-
-        PowerMockito.mockStatic(MDSALUtil.class);
-    }
-
-    @Ignore
-    @Test
-    // TODO Clean up the exception handling
-    @SuppressWarnings("checkstyle:IllegalCatch")
-    public void testRegisterMappingIpIP() {
-        // TODO : This needs to be modified to make it work
-        // TODO : Issue with Mockito.any() usage, so for now run registerMapping testcases as seperate Tests.
-        // This needs to be fixed properly.
-        ipmapId = InstanceIdentifier.builder(
-            IntextIpMap.class).child(IpMapping.class, new IpMappingKey(5L))
-            .child(IpMap.class, new IpMapKey("10.0.0.1")).build();
-        ipmap = new IpMapBuilder().withKey(new IpMapKey("10.0.0.1")).setInternalIp("10.0.0.1")
-            .setExternalIp("192.17.13.1").build();
-        try {
-            PowerMockito.doNothing()
-                .when(MDSALUtil.class, "syncWrite", dataBroker, LogicalDatastoreType.OPERATIONAL, ipmapId, ipmap);
-        } catch (Exception e) {
-            // Test failed anyways
-            assertEquals("true", "false");
-        }
-        IPAddress internal = new IPAddress("10.0.0.1", 0);
-        IPAddress external = new IPAddress("192.17.13.1", 0);
-        naptManager.registerMapping(5, internal, external);
-        PowerMockito.verifyStatic();
-
-    }
-
-    @Ignore
-    @Test
-    // TODO Clean up the exception handling
-    @SuppressWarnings("checkstyle:IllegalCatch")
-    public void testRegisterMappingIpSubnet() {
-        // TODO : This needs to be modified to make it work
-        ipmapId = InstanceIdentifier.builder(IntextIpMap.class)
-            .child(IpMapping.class, new IpMappingKey(5L)).child(IpMap.class, new IpMapKey("10.0.0.1")).build();
-        ipmap = new IpMapBuilder().withKey(new IpMapKey("10.0.0.1")).setInternalIp("10.0.0.1")
-            .setExternalIp("192.17.13.1/24").build();
-        try {
-            PowerMockito.doNothing()
-                .when(MDSALUtil.class, "syncWrite", dataBroker, LogicalDatastoreType.OPERATIONAL, ipmapId, ipmap);
-        } catch (Exception e) {
-            // Test failed anyways
-            assertEquals("true", "false");
-        }
-        IPAddress internal = new IPAddress("10.0.0.1", 0);
-        IPAddress external = new IPAddress("192.17.13.1", 24);
-        naptManager.registerMapping(5, internal, external);
-        PowerMockito.verifyStatic();
-    }
-
-    @Ignore
-    @Test
-    // TODO Clean up the exception handling
-    @SuppressWarnings("checkstyle:IllegalCatch")
-    public void testRegisterMappingSubnetIp() {
-        // TODO : This needs to be modified to make it work
-        ipmapId = InstanceIdentifier.builder(IntextIpMap.class)
-            .child(IpMapping.class, new IpMappingKey(6L)).child(IpMap.class, new IpMapKey("10.0.2.1/16")).build();
-        ipmap = new IpMapBuilder().withKey(new IpMapKey("10.0.0.1")).setInternalIp("10.0.0.1")
-            .setExternalIp("192.19.15.3").build();
-        try {
-            PowerMockito.doNothing()
-                .when(MDSALUtil.class, "syncWrite", dataBroker, LogicalDatastoreType.OPERATIONAL, ipmapId, ipmap);
-        } catch (Exception e) {
-            // Test failed anyways
-            assertEquals("true", "false");
-        }
-        IPAddress internal = new IPAddress("10.0.2.1", 16);
-        IPAddress external = new IPAddress("192.19.15.3", 0);
-        naptManager.registerMapping(6, internal, external);
-        PowerMockito.verifyStatic();
-    }
-
-    @Ignore
-    @Test
-    // TODO Clean up the exception handling
-    @SuppressWarnings("checkstyle:IllegalCatch")
-    public void testRegisterMappingSubnetSubnet() {
-        // TODO : This needs to be modified to make it work
-        ipmapId = InstanceIdentifier.builder(IntextIpMap.class)
-            .child(IpMapping.class, new IpMappingKey(6L)).child(IpMap.class, new IpMapKey("10.2.0.2/24")).build();
-        ipmap = new IpMapBuilder().withKey(new IpMapKey("10.2.0.2/24")).setInternalIp("10.2.0.2/24")
-            .setExternalIp("192.21.16.1/16").build();
-        try {
-            PowerMockito.doNothing()
-                .when(MDSALUtil.class, "syncWrite", dataBroker, LogicalDatastoreType.OPERATIONAL, ipmapId, ipmap);
-        } catch (Exception e) {
-            // Test failed anyways
-            assertEquals("true", "false");
-        }
-        IPAddress internal = new IPAddress("10.2.0.2", 24);
-        IPAddress external = new IPAddress("192.21.16.1", 16);
-        naptManager.registerMapping(6, internal, external);
-        PowerMockito.verifyStatic();
-    }
-
-
-    @Test
-    public void testgetExternalAddressMapping() {
-        // TODO : This needs to be modified to make it work
-        // Testcase to test when no entry exists in ip-pot-map
-        /*SessionAddress internalIpPort = new SessionAddress("10.0.0.1", 2);
-        InstanceIdentifierBuilder<IpPortMapping> idBuilder =
-                InstanceIdentifier.builder(IntextIpPortMap.class).child(IpPortMapping.class, new IpPortMappingKey(5L));
-        InstanceIdentifier<IpPortMapping> id = idBuilder.build();
-        try {
-             PowerMockito.when(MDSALUtil.class, "read", dataBroker, LogicalDatastoreType.CONFIGURATION, id)
-             .thenReturn(null);
-        } catch (Exception e) {
-            // Test failed anyways
-            assertEquals("true", "false");
-        }
-        naptManager.getExternalAddressMapping(5, internalIpPort);
-        PowerMockito.verifyStatic(); */
-    }
-
-    @Test
-    public void testReleaseAddressMapping() {
-        // TODO : Below needs to be modified to make it work
-      /*  InstanceIdentifierBuilder<IpMapping> idBuilder =
-                InstanceIdentifier.builder(IntextIpMap.class).child(IpMapping.class, new IpMappingKey(5L));
-        InstanceIdentifier<IpMapping> id = idBuilder.build();
-        try {
-            PowerMockito.doNothing().when(MDSALUtil.class, "read", dataBroker, LogicalDatastoreType.OPERATIONAL, id);
-        } catch (Exception e) {
-            // Test failed anyways
-            assertEquals("true", "false");
-        }
-        IPAddress internal = new IPAddress("10.0.0.1",0);
-        IPAddress external = new IPAddress("192.17.13.1", 0);
-        naptManager.registerMapping(5, internal, external);
-        SessionAddress internalSession = new SessionAddress("10.0.0.1", 0);
-        naptManager.releaseAddressMapping(5L, internalSession);*/
-    }
-
-
-}