Final cleanup.

Change-Id: I40c0ae3b197924134eba5f78659867d0e7470f75
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>

diff --git a/bgp/rib-mock/src/test/resources/OpenMessage b/bgp/rib-mock/src/test/resources/OpenMessage
deleted file mode 100644 (file)
index 9975c32..0000000
Binary files a/bgp/rib-mock/src/test/resources/OpenMessage and /dev/null differ

diff --git a/bgp/rib-mock/src/test/resources/bgp_hex.txt b/bgp/rib-mock/src/test/resources/bgp_hex.txt
deleted file mode 100644 (file)
index f0920be..0000000
--- a/bgp/rib-mock/src/test/resources/bgp_hex.txt
+++ /dev/null
@@ -1,86 +0,0 @@
-Receive BGP Update message for 0x804b6a0: Length = 61
-   
-ff ff ff ff ff ff ff ff    ff ff ff ff ff ff ff ff    
-00 3d 01 04 00 14 00 b4    14 14 14 14 20 02 06 01    
-04 00 01 00 01 02 06 01    04 00 1b 00 01 02 02 80    
-00 02 02 02 00 02 06 41    04 00 00 00 14 
-
-Receive BGP Update message for 0x804b6a0: Length = 151
-   
-ff ff ff ff ff ff ff ff    ff ff ff ff ff ff ff ff    
-00 40 02 00 00 00 1f 40    01 01 00 40 02 0a 02 02    
-00 00 00 64 00 00 00 46    40 03 04 0a 01 01 0a 40    
-05 04 00 00 00 64 20 46    01 02 02 20 46 01 01 01    
-ff ff ff ff ff ff ff ff    ff ff ff ff ff ff ff ff    
-00 40 02 00 00 00 1f 40    01 01 00 40 02 0a 02 02    
-00 00 00 64 00 00 00 5a    40 03 04 0a 01 01 0a 40    
-05 04 00 00 00 64 20 5a    01 02 02 20 5a 01 01 01    
-ff ff ff ff ff ff ff ff    ff ff ff ff ff ff ff ff    
-00 17 02 00 00 00 00 
-
-Receive BGP Update message for 0x804b6a0: Length = 1021
-   
-ff ff ff ff ff ff ff ff    ff ff ff ff ff ff ff ff    
-00 70 02 00 00 00 59 90    0e 00 37 00 1b 01 04 0a    
-01 01 0a 00 00 01 00 2a    01 00 00 00 01 00 00 13    
-01 02 00 04 64 00 00 00    01 06 00 07 00 00 00 00    
-00 01 00 01 01 00 0b 01    06 00 07 00 00 00 00 00    
-02 03 40 01 01 00 40 02    06 02 01 00 00 00 64 40    
-05 04 00 00 00 64 80 ff    07 01 13 00 03 15 00 00    
-ff ff ff ff ff ff ff ff    ff ff ff ff ff ff ff ff    
-01 28 02 00 00 01 11 90    0e 00 ef 00 1b 01 04 0a    
-01 01 0a 00 00 01 00 2a    01 00 00 00 01 00 00 13    
-01 02 00 04 64 00 00 00    01 06 00 07 00 00 00 00    
-00 10 00 01 01 00 0b 01    06 00 07 00 00 00 00 00    
-10 03 00 01 00 2a 01 00    00 00 01 00 00 13 01 02    
-00 04 64 00 00 00 01 06    00 07 00 00 00 00 00 10    
-00 01 01 00 0b 01 06 00    07 00 00 00 00 00 10 01    
-00 01 00 2a 01 00 00 00    01 00 00 13 01 02 00 04    
-64 00 00 00 01 06 00 07    00 00 00 00 00 02 00 01    
-01 00 0b 01 06 00 07 00    00 00 00 00 10 01 00 01    
-00 2a 01 00 00 00 01 00    00 13 01 02 00 04 64 00    
-00 00 01 06 00 07 00 00    00 00 00 02 00 01 01 00    
-0b 01 06 00 07 00 00 00    00 00 02 03 00 01 00 2a    
-01 00 00 00 01 00 00 13    01 02 00 04 64 00 00 00    
-01 06 00 07 00 00 00 00    00 01 00 01 01 00 0b 01    
-06 00 07 00 00 00 00 00    10 03 40 01 01 00 40 02    
-06 02 01 00 00 00 64 40    05 04 00 00 00 64 80 ff    
-07 01 13 00 03 0a 00 00    ff ff ff ff ff ff ff ff    
-ff ff ff ff ff ff ff ff    01 56 02 00 00 01 3f 90    
-0e 01 1d 00 1b 01 04 0a    01 01 0a 00 00 01 00 2a    
-01 00 00 00 01 00 00 13    01 02 00 04 64 00 00 00    
-01 06 00 07 00 00 00 00    00 10 03 01 01 00 0b 01    
-06 00 07 00 00 00 00 00    10 00 00 01 00 2a 01 00    
-00 00 01 00 00 13 01 02    00 04 64 00 00 00 01 06    
-00 07 00 00 00 00 00 10    03 01 01 00 0b 01 06 00    
-07 00 00 00 00 00 01 00    00 01 00 2a 01 00 00 00    
-01 00 00 13 01 02 00 04    64 00 00 00 01 06 00 07    
-00 00 00 00 00 10 01 01    01 00 0b 01 06 00 07 00    
-00 00 00 00 10 00 00 01    00 2a 01 00 00 00 01 00    
-00 13 01 02 00 04 64 00    00 00 01 06 00 07 00 00    
-00 00 00 10 01 01 01 00    0b 01 06 00 07 00 00 00    
-00 00 02 00 00 01 00 2a    01 00 00 00 01 00 00 13    
-01 02 00 04 64 00 00 00    01 06 00 07 00 00 00 00    
-00 02 03 01 01 00 0b 01    06 00 07 00 00 00 00 00    
-02 00 00 01 00 2a 01 00    00 00 01 00 00 13 01 02    
-00 04 64 00 00 00 01 06    00 07 00 00 00 00 00 02    
-03 01 01 00 0b 01 06 00    07 00 00 00 00 00 01 00    
-40 01 01 00 40 02 06 02    01 00 00 00 64 40 05 04    
-00 00 00 64 80 ff 07 01    13 00 03 00 00 00 ff ff    
-ff ff ff ff ff ff ff ff    ff ff ff ff ff ff 00 f2    
-02 00 00 00 db 90 0e 00    c3 00 1b 01 04 0a 01 01    
-0a 00 00 02 00 1b 01 00    00 00 01 00 00 13 01 02    
-00 04 64 00 00 00 01 06    00 07 00 00 00 00 00 10    
-03 00 02 00 1b 01 00 00    00 01 00 00 13 01 02 00    
-04 64 00 00 00 01 06 00    07 00 00 00 00 00 10 01    
-00 02 00 1b 01 00 00 00    01 00 00 13 01 02 00 04    
-64 00 00 00 01 06 00 07    00 00 00 00 00 10 00 00    
-02 00 1b 01 00 00 00 01    00 00 13 01 02 00 04 64    
-00 00 00 01 06 00 07 00    00 00 00 00 02 03 00 02    
-00 1b 01 00 00 00 01 00    00 13 01 02 00 04 64 00    
-00 00 01 06 00 07 00 00    00 00 00 02 00 00 02 00    
-1b 01 00 00 00 01 00 00    13 01 02 00 04 64 00 00    
-00 01 06 00 07 00 00 00    00 00 01 00 40 01 01 00    
-40 02 06 02 01 00 00 00    64 40 05 04 00 00 00 64    
-ff ff ff ff ff ff ff ff    ff ff ff ff ff ff ff ff    
-00 1d 02 00 00 00 06 80    0f 03 00 1b 01 

diff --git a/bgp/util/src/test/java/org/opendaylight/protocol/bgp/util/BGPBinaryFileParserTest.java b/bgp/util/src/test/java/org/opendaylight/protocol/bgp/util/BGPBinaryFileParserTest.java
index 7c8b871e02fa90ef3f431066f25b72c3c7b889ff..88e04c254f9e701b1154c877b60ea5132a024c4c 100644 (file)
--- a/bgp/util/src/test/java/org/opendaylight/protocol/bgp/util/BGPBinaryFileParserTest.java
+++ b/bgp/util/src/test/java/org/opendaylight/protocol/bgp/util/BGPBinaryFileParserTest.java
@@ -25,7 +25,7 @@ public class BGPBinaryFileParserTest {
 
        @Test
        public void testCorrectExtraction() throws IOException {
-               final List<byte[]> parsedMessages = extractFromFile("/BgpMessages");
+               final List<byte[]> parsedMessages = extractFromFile("/BgpMessages.bin");
 
                assertThat(parsedMessages.size(), is(43));
 
@@ -49,8 +49,9 @@ public class BGPBinaryFileParserTest {
        private List<byte[]> extractFromFile(final String fileName) throws IOException {
                final InputStream is = BGPBinaryFileParserTest.class.getResourceAsStream(fileName);
                assertNotNull("File not found - " + fileName);
-               if (is == null)
+               if (is == null) {
                        throw new IOException("Failed to get resource " + fileName);
+               }
 
                final ByteArrayOutputStream bis = new ByteArrayOutputStream();
                final byte[] data = new byte[1000];
@@ -75,7 +76,7 @@ public class BGPBinaryFileParserTest {
         */
        @Test
        public void testCorruptedHeader() throws IOException {
-               final List<byte[]> parsedMessages = extractFromFile("/BgpMessages_wrong_header");
+               final List<byte[]> parsedMessages = extractFromFile("/BgpMessages_wrong_header.bin");
                assertEquals(42, parsedMessages.size());
        }
 

diff --git a/bgp/util/src/test/java/org/opendaylight/protocol/bgp/util/BGPHexFileParserTest.java b/bgp/util/src/test/java/org/opendaylight/protocol/bgp/util/BGPHexFileParserTest.java
index 91a70d746748e7cbe64926a70e37ef19e1814d14..ef68959a10c814753e35e10c876f4706f2ce23aa 100644 (file)
--- a/bgp/util/src/test/java/org/opendaylight/protocol/bgp/util/BGPHexFileParserTest.java
+++ b/bgp/util/src/test/java/org/opendaylight/protocol/bgp/util/BGPHexFileParserTest.java
@@ -21,7 +21,7 @@ import org.junit.Test;
 public class BGPHexFileParserTest {
 
        public static final String hexDumpFileName = "/bgp_hex.txt";
-       private final String fileNameInvalid = "/BgpMessage_Hex_InvalidLength";
+       private final String fileNameInvalid = "/BgpMessage_Hex_InvalidLength.bin";
        private final int expectedSize = 25;
 
        @Test

diff --git a/bgp/util/src/test/resources/BgpMessage_Hex_InvalidLength b/bgp/util/src/test/resources/BgpMessage_Hex_InvalidLength.bin
similarity index 100%
rename from bgp/util/src/test/resources/BgpMessage_Hex_InvalidLength
rename to bgp/util/src/test/resources/BgpMessage_Hex_InvalidLength.bin

diff --git a/bgp/util/src/test/resources/BgpMessages b/bgp/util/src/test/resources/BgpMessages
deleted file mode 100644 (file)
index c923b86..0000000
Binary files a/bgp/util/src/test/resources/BgpMessages and /dev/null differ

diff --git a/bgp/rib-mock/src/test/resources/BgpMessages b/bgp/util/src/test/resources/BgpMessages.bin
similarity index 100%
rename from bgp/rib-mock/src/test/resources/BgpMessages
rename to bgp/util/src/test/resources/BgpMessages.bin

diff --git a/bgp/util/src/test/resources/BgpMessages_wrong_header b/bgp/util/src/test/resources/BgpMessages_wrong_header.bin
similarity index 100%
rename from bgp/util/src/test/resources/BgpMessages_wrong_header
rename to bgp/util/src/test/resources/BgpMessages_wrong_header.bin

diff --git a/bgp/util/src/test/resources/OpenMessage b/bgp/util/src/test/resources/OpenMessage
deleted file mode 100644 (file)
index 9975c32..0000000
Binary files a/bgp/util/src/test/resources/OpenMessage and /dev/null differ