From 856861ad8949f6be6be0af162bea5e4a4067e020 Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Mon, 21 Sep 2020 10:02:31 +0200 Subject: [PATCH] Remove dead code from Junit tests JIRA: TRNSPRTPCE-305 Signed-off-by: guillaume.lambert Change-Id: I8c584686a80bf4daf6eefd09c3250240bba39e1e --- .../device/DeviceTransactionManagerTest.java | 68 ++---------- .../olm/service/OlmPowerServiceImplTest.java | 105 ------------------ .../pce/impl/PceServiceRPCImplTest.java | 1 - .../pce/networkanalyzer/PceLinkTest.java | 1 - .../PathComputationServiceImplTest.java | 1 - 5 files changed, 9 insertions(+), 167 deletions(-) diff --git a/common/src/test/java/org/opendaylight/transportpce/common/device/DeviceTransactionManagerTest.java b/common/src/test/java/org/opendaylight/transportpce/common/device/DeviceTransactionManagerTest.java index f08e6f498..c54646eae 100644 --- a/common/src/test/java/org/opendaylight/transportpce/common/device/DeviceTransactionManagerTest.java +++ b/common/src/test/java/org/opendaylight/transportpce/common/device/DeviceTransactionManagerTest.java @@ -10,18 +10,13 @@ package org.opendaylight.transportpce.common.device; import static org.mockito.ArgumentMatchers.any; -import com.google.common.util.concurrent.FluentFuture; -import com.google.common.util.concurrent.ListeningExecutorService; -import com.google.common.util.concurrent.MoreExecutors; import java.util.LinkedList; import java.util.List; import java.util.Optional; import java.util.concurrent.ExecutionException; -import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.eclipse.jdt.annotation.NonNull; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -35,7 +30,6 @@ import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.MountPoint; import org.opendaylight.mdsal.binding.api.MountPointService; import org.opendaylight.mdsal.binding.api.ReadWriteTransaction; -import org.opendaylight.mdsal.common.api.CommitInfo; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.NetworkBuilder; @@ -47,10 +41,15 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; @RunWith(MockitoJUnitRunner.class) public class DeviceTransactionManagerTest { - @Mock private MountPointService mountPointServiceMock; - @Mock private MountPoint mountPointMock; - @Mock private DataBroker dataBrokerMock; - @Mock private ReadWriteTransaction rwTransactionMock; + @Mock + private MountPointService mountPointServiceMock; + @Mock + private MountPoint mountPointMock; + @Mock + private DataBroker dataBrokerMock; + @Mock + private ReadWriteTransaction rwTransactionMock; + private DeviceTransactionManagerImpl transactionManager; private String defaultDeviceId = "device-id"; @@ -296,55 +295,6 @@ public class DeviceTransactionManagerTest { Mockito.verify(rwTransactionMock, Mockito.times(1)).commit(); } - @Test - @Ignore - public void submitTxTimeoutTransactionTest() { - Future> deviceTxFuture = - transactionManager.getDeviceTransaction(defaultDeviceId); - DeviceTransaction deviceTx; - try { - deviceTx = deviceTxFuture.get().get(); - } catch (InterruptedException | ExecutionException e) { - Assert.fail("Exception catched! " + e); - return; - } - - deviceTx.put(defaultDatastore, defaultIid, defaultData); - - Exception throwedException = null; - - FluentFuture submitFuture = deviceTx.commit(200, defaultTimeUnit); - try { - submitFuture.get(); - } catch (InterruptedException e) { - Assert.fail("Exception catched! " + e); - } catch (ExecutionException e) { - throwedException = e; - } - - if (throwedException == null - || !throwedException.getMessage().contains(TimeoutException.class.getName())) { - Assert.fail("TimeoutException inside of should be thrown!"); - return; - } - - - Mockito.doReturn(FluentFutures.immediateNullFluentFuture()).when(rwTransactionMock.commit()); - - try { - putAndSubmit(transactionManager, defaultDeviceId, defaultDatastore, defaultIid, defaultData); - } catch (InterruptedException | ExecutionException e) { - Assert.fail("Exception catched! " + e); - return; - } - - Mockito.verify(rwTransactionMock, Mockito.times(2)).put(defaultDatastore, defaultIid, defaultData); - Mockito.verify(rwTransactionMock, Mockito.times(2)).commit(); - ListeningExecutorService executor = MoreExecutors - .listeningDecorator(Executors.newSingleThreadExecutor()); - executor.shutdown(); - } - private void putAndSubmit(DeviceTransactionManagerImpl deviceTxManager, String deviceId, LogicalDatastoreType store, InstanceIdentifier path, T data) throws ExecutionException, InterruptedException { diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplTest.java b/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplTest.java index c44679926..c4b7c254a 100644 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplTest.java +++ b/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplTest.java @@ -195,57 +195,6 @@ public class OlmPowerServiceImplTest extends AbstractTest { Assert.assertEquals("Failed", output.getResult()); } - /* - @Test - public void testCalculateSpanlossBase() { - CalculateSpanlossBaseInput input = OlmPowerServiceRpcImplUtil.getCalculateSpanlossBaseInput(); - //TODO - Mockito.when(this.olmPowerServiceMock.calculateSpanlossBase(Mockito.any())) - .thenReturn(new CalculateSpanlossBaseOutputBuilder().setResult("Failed").build()); - CalculateSpanlossBaseOutput output = this.olmPowerServiceMock.calculateSpanlossBase(input); - Assert.assertEquals("Failed", output.getResult()); - - } - */ - - /* - @Test - public void testCalculateSpanlossBase2() { - NetworkKey overlayTopologyKey = new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)); -<<<<<<< HEAD - InstanceIdentifier networkIID = InstanceIdentifier.builder(Networks.class) - .child(Network.class, overlayTopologyKey) -======= - InstanceIdentifier networkTopoIID = InstanceIdentifier.builder(Networks.class) - .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang - .ietf.network.rev180226.networks.Network.class, - overlayTopologyKey) ->>>>>>> 87d8bf0... Retrieve OLM modifs from change 80051 - .augmentation(Network1.class) - .build(); - InstanceIdentifier networkIID = InstanceIdentifier.builder(Networks.class) - .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang - .ietf.network.rev180226.networks.Network.class, - overlayTopologyKey) - .build(); - Network1 network = TransactionUtils.getNetwork(); - Network ietfNetwork = TransactionUtils.getOverLayNetwork(); - TransactionUtils.writeTransaction(this.getDataBroker(), networkIID, ietfNetwork); - TransactionUtils.writeTransaction(this.getDataBroker(), networkTopoIID, network); - try { - Thread.sleep(1000); - } catch (InterruptedException e) { - LOG.error("Write transaction failed !",e); - } - CalculateSpanlossBaseInput input = OlmPowerServiceRpcImplUtil.getCalculateSpanlossBaseInput(); - //TODO - Mockito.when(this.olmPowerServiceMock.calculateSpanlossBase(Mockito.any())) - .thenReturn(new CalculateSpanlossBaseOutputBuilder().setResult("Failed").build()); - CalculateSpanlossBaseOutput output = this.olmPowerServiceMock.calculateSpanlossBase(input); - Assert.assertEquals("Failed", output.getResult()); - - } - */ @Ignore @Test public void testCalculateSpanlossBase3() { @@ -313,60 +262,6 @@ public class OlmPowerServiceImplTest extends AbstractTest { } -// @Test -// public void testCalculateSpanlossBase4() throws InterruptedException { -// NetworkKey overlayTopologyKey = new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)); -// InstanceIdentifier networkIID = InstanceIdentifier.builder(Network.class, overlayTopologyKey) -// .augmentation(Network1.class) -// .build(); -// Network1 network = TransactionUtils.getNetwork2(); -// TransactionUtils.writeTransaction(this.getDataBroker(), networkIID, network); -// -// Thread.sleep(500); -// -// List nodes = TransactionUtils.getNodes(); -// Node n; -// SupportingNode sn; -// -// List snl; -// NodeId n5 = new NodeId("node 5"); -// KeyedInstanceIdentifier mappedNodeII2 = -// InstanceIdentifiers.UNDERLAY_NETWORK_II.child(Node.class, new NodeKey(n5)); -// -// sn = new SupportingNodeBuilder().setNetworkRef(new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID)) -// .setNodeRef(n5).build(); -// snl = new ArrayList<>(); -// snl.add(sn); -// n = new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608 -// .network.NodeBuilder().setNodeId(n5).build(); -// TransactionUtils.writeTransaction(this.getDataBroker(), mappedNodeII2, n); -// Thread.sleep(500); -// -// for(int i=0; i < nodes.size(); i++) { -// KeyedInstanceIdentifier mappedNodeII = -// InstanceIdentifiers.OVERLAY_NETWORK_II.child(Node.class, new NodeKey(nodes.get(i))); -// if (i != 0){ -// sn = new SupportingNodeBuilder().setNetworkRef(new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID)) -// .setNodeRef(nodes.get(i-1)).build(); -// }else { -// sn = new SupportingNodeBuilder().setNodeRef(n5).build(); -// } -// snl = new ArrayList<>(); -// snl.add(sn); -// n = new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608 -// .network.NodeBuilder().setNodeId(nodes.get(i)).setSupportingNode(snl).build(); -// TransactionUtils.writeTransaction(this.getDataBroker(), mappedNodeII, n); -// Thread.sleep(500); -// } -// -// Thread.sleep(1000); -// -// CalculateSpanlossBaseInput input = OlmPowerServiceRpcImplUtil.getCalculateSpanlossBaseInput2(); -// CalculateSpanlossBaseOutput output = this.olmPowerService.calculateSpanlossBase(input); -// Assert.assertEquals("Failed", output.getResult()); -// -// } - @Test public void testCalculateSpanlossCurrent1() { CalculateSpanlossCurrentInput input = OlmPowerServiceRpcImplUtil.getCalculateSpanlossCurrentInput(); diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImplTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImplTest.java index 9e785ad57..06251d40c 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImplTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImplTest.java @@ -27,7 +27,6 @@ import org.opendaylight.transportpce.test.AbstractTest; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.CancelResourceReserveInputBuilder; - @Ignore public class PceServiceRPCImplTest extends AbstractTest { diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLinkTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLinkTest.java index f5ce3c6e0..5f5b45de9 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLinkTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLinkTest.java @@ -49,7 +49,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.top import org.opendaylight.yangtools.yang.common.Uint32; - @Ignore public class PceLinkTest extends AbstractTest { diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/service/PathComputationServiceImplTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/service/PathComputationServiceImplTest.java index bae865b44..9553a741a 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/service/PathComputationServiceImplTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/service/PathComputationServiceImplTest.java @@ -36,7 +36,6 @@ import org.opendaylight.yang.gen.v1.gnpy.path.rev200909.result.ResponseBuilder; import org.opendaylight.yang.gen.v1.gnpy.path.rev200909.result.response.response.type.NoPathCaseBuilder; import org.opendaylight.yang.gen.v1.gnpy.path.rev200909.result.response.response.type.PathCaseBuilder; - @Ignore public class PathComputationServiceImplTest extends AbstractTest { -- 2.36.6