Bump upstreams to 2022.09

[bgpcep.git] / bgp / cli / src / test / java / org / opendaylight / protocol / bgp / cli / utils / BGPOperationalStateUtilsTest.java

diff --git a/bgp/cli/src/test/java/org/opendaylight/protocol/bgp/cli/utils/BGPOperationalStateUtilsTest.java b/bgp/cli/src/test/java/org/opendaylight/protocol/bgp/cli/utils/BGPOperationalStateUtilsTest.java
index 4bfd225ccdcf2b8cc86cb6abf8ff8a5af9c63222..521234dd3900cb472b251b9ea61aedf5edf95af8 100644 (file)
--- a/bgp/cli/src/test/java/org/opendaylight/protocol/bgp/cli/utils/BGPOperationalStateUtilsTest.java
+++ b/bgp/cli/src/test/java/org/opendaylight/protocol/bgp/cli/utils/BGPOperationalStateUtilsTest.java
@@ -10,14 +10,13 @@ package org.opendaylight.protocol.bgp.cli.utils;
 import static org.junit.Assert.assertEquals;
 import static org.opendaylight.protocol.bgp.cli.utils.BGPOperationalStateUtils.PROTOCOLS_IID;
 import static org.opendaylight.protocol.bgp.cli.utils.NeighborStateCliUtilsTest.NEIGHBOR_ADDRESS;
-import static org.opendaylight.protocol.bgp.cli.utils.PeerGroupStateCliUtilsTest.UTF8;
 
+import com.google.common.io.Resources;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
-import java.util.Collections;
+import java.nio.charset.StandardCharsets;
 import java.util.concurrent.ExecutionException;
-import org.apache.commons.io.IOUtils;
 import org.junit.Test;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractConcurrentDataBrokerTest;
@@ -30,26 +29,27 @@ import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.re
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.policy.types.rev151009.BGP;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.NetworkInstanceProtocol;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 
 public class BGPOperationalStateUtilsTest extends AbstractConcurrentDataBrokerTest {
     static final String RIB_ID = "test-rib";
     private static final String RIB_NOT_FOUND = "RIB not found for [test-rib]\n";
     private final ByteArrayOutputStream output = new ByteArrayOutputStream();
-    private final PrintStream stream = new PrintStream(this.output);
+    private final PrintStream stream = new PrintStream(output);
 
     @Test
     public void testDisplayBgpOperationalStateNotFound() {
-        BGPOperationalStateUtils.displayBgpOperationalState(getDataBroker(), this.stream, RIB_ID, null, null);
-        assertEquals(RIB_NOT_FOUND, this.output.toString());
+        BGPOperationalStateUtils.displayBgpOperationalState(getDataBroker(), stream, RIB_ID, null, null);
+        assertEquals(RIB_NOT_FOUND, output.toString());
     }
 
     @Test
     public void testDisplayBgpOperationalStateFound() throws IOException, ExecutionException, InterruptedException {
         createDefaultProtocol();
-        BGPOperationalStateUtils.displayBgpOperationalState(getDataBroker(), this.stream, RIB_ID, null, null);
-        final String expected = IOUtils.toString(
-                getClass().getClassLoader().getResourceAsStream("global.txt"), UTF8);
-        assertEquals(expected, this.output.toString());
+        BGPOperationalStateUtils.displayBgpOperationalState(getDataBroker(), stream, RIB_ID, null, null);
+        final String expected = Resources.toString(getClass().getClassLoader().getResource("global.txt"),
+            StandardCharsets.UTF_8);
+        assertEquals(expected, output.toString());
     }
 
     private void createDefaultProtocol() throws ExecutionException, InterruptedException {
@@ -57,11 +57,11 @@ public class BGPOperationalStateUtilsTest extends AbstractConcurrentDataBrokerTe
         final Bgp bgp = new BgpBuilder()
                 .setGlobal(GlobalStateCliUtilsTest.buildGlobal(true).build())
                 .setNeighbors(new NeighborsBuilder().setNeighbor(
-                        Collections.singletonList(NeighborStateCliUtilsTest.createBasicNeighbor())).build())
+                        BindingMap.of(NeighborStateCliUtilsTest.createBasicNeighbor())).build())
                 .build();
         GlobalStateCliUtilsTest.buildGlobal(true);
         final InstanceIdentifier<Bgp> bgpIID = PROTOCOLS_IID
-                .child(Protocol.class, new ProtocolKey(BGP.class, RIB_ID))
+                .child(Protocol.class, new ProtocolKey(BGP.VALUE, RIB_ID))
                 .augmentation(NetworkInstanceProtocol.class).child(Bgp.class);
         wt.mergeParentStructurePut(LogicalDatastoreType.OPERATIONAL, bgpIID, bgp);
         wt.commit().get();
@@ -70,10 +70,10 @@ public class BGPOperationalStateUtilsTest extends AbstractConcurrentDataBrokerTe
     @Test
     public void testDisplayNeighborOperationalState() throws IOException, ExecutionException, InterruptedException {
         createDefaultProtocol();
-        BGPOperationalStateUtils.displayBgpOperationalState(getDataBroker(), this.stream, RIB_ID, null,
+        BGPOperationalStateUtils.displayBgpOperationalState(getDataBroker(), stream, RIB_ID, null,
                 NEIGHBOR_ADDRESS);
-        final String expected = IOUtils.toString(
-                getClass().getClassLoader().getResourceAsStream("empty-neighbor.txt"), UTF8);
-        assertEquals(expected, this.output.toString());
+        final String expected = Resources.toString(getClass().getClassLoader().getResource("empty-neighbor.txt"),
+            StandardCharsets.UTF_8);
+        assertEquals(expected, output.toString());
     }
 }
\ No newline at end of file