Update MRI projects for Aluminium

[openflowplugin.git] / applications / forwardingrules-sync / src / test / java / org / opendaylight / openflowplugin / applications / frsync / impl / strategy / TableForwarderTest.java

diff --git a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/TableForwarderTest.java b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/TableForwarderTest.java
index 9f6a292bb157ae603d6d7d1b36dc28b354c60f18..c8c85bf7420096ef19c42c67bece8de42dfc8424 100644 (file)
--- a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/TableForwarderTest.java
+++ b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/TableForwarderTest.java
@@ -20,7 +20,7 @@ import org.mockito.ArgumentMatchers;
 import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.Table;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.TableKey;
@@ -76,7 +76,7 @@ public class TableForwarderTest {
 
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         tableForwarder = new TableForwarder(salTableService);
         txId = new TransactionId(BigInteger.ONE);
     }
@@ -110,8 +110,10 @@ public class TableForwarderTest {
         Assert.assertEquals(nodePath, updateTableInput.getNode().getValue());
 
         Assert.assertEquals(1, updateTableInput.getOriginalTable().getTableFeatures().size());
-        Assert.assertEquals("test-table", updateTableInput.getOriginalTable().getTableFeatures().get(0).getName());
+        Assert.assertEquals("test-table", updateTableInput.getOriginalTable().nonnullTableFeatures().values()
+                .iterator().next().getName());
         Assert.assertEquals(1, updateTableInput.getUpdatedTable().getTableFeatures().size());
-        Assert.assertEquals("another-table", updateTableInput.getUpdatedTable().getTableFeatures().get(0).getName());
+        Assert.assertEquals("another-table", updateTableInput.getUpdatedTable().nonnullTableFeatures().values()
+                .iterator().next().getName());
     }
 }
\ No newline at end of file