Merge "Added missing parent tag to pom files"

[yangtools.git] / yang / yang-data-impl / src / test / java / org / opendaylight / yangtools / yang / data / impl / codec / xml / RandomPrefixTest.java

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/RandomPrefixTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/RandomPrefixTest.java
index 95d8ac6bea14e6587a616cb018019b2e01ac2b7b..73e3ad6f25c686006a5e24d05cb4e3e310ca5c2c 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/RandomPrefixTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/RandomPrefixTest.java
@@ -13,29 +13,32 @@ import static org.junit.Assert.assertThat;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
+
 import java.net.URI;
 import java.util.Date;
 import java.util.List;
+
 import org.hamcrest.CoreMatchers;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
 
 public class RandomPrefixTest {
+    static final int MAX_COUNTER = 4000;
 
     @Test
     public void testEncodeDecode() throws Exception {
+
         final List<String> allGenerated = Lists.newArrayList();
-        for (int i = 0; i < RandomPrefix.MAX_COUNTER_VALUE; i++) {
+        for (int i = 0; i < MAX_COUNTER; i++) {
             final String encoded = RandomPrefix.encode(i);
             assertEquals(RandomPrefix.decode(encoded), i);
             allGenerated.add(encoded);
         }
 
-        assertEquals(allGenerated.size(), RandomPrefix.MAX_COUNTER_VALUE);
-        assertEquals("zzzz", allGenerated.get(RandomPrefix.MAX_COUNTER_VALUE - 1));
+        assertEquals(allGenerated.size(), MAX_COUNTER);
+        assertEquals("dPT", allGenerated.get(MAX_COUNTER - 1));
         assertEquals("a", allGenerated.get(0));
-        assertEquals("xml", allGenerated.get(RandomPrefix.decode("xml")));
         assertEquals(allGenerated.size(), Sets.newHashSet(allGenerated).size());
     }
 
@@ -44,22 +47,22 @@ public class RandomPrefixTest {
         final RandomPrefix a = new RandomPrefix();
 
         final List<String> allGenerated = Lists.newArrayList();
-        for (int i = 0; i < RandomPrefix.MAX_COUNTER_VALUE; i++) {
+        for (int i = 0; i < MAX_COUNTER; i++) {
             final String prefix = RandomPrefix.encode(i);
             final URI uri = new URI("localhost:" + prefix);
-            final QName qName = QName.create(QNameModule.create(uri, new Date()), prefix, "local-name");
-            allGenerated.add(a.encodePrefix(qName));
+            final QName qName = QName.create(QNameModule.create(uri, new Date()), "local-name");
+            allGenerated.add(a.encodePrefix(qName.getNamespace()));
         }
 
-        assertEquals(RandomPrefix.MAX_COUNTER_VALUE, allGenerated.size());
+        assertEquals(MAX_COUNTER, allGenerated.size());
         // We are generating MAX_COUNTER_VALUE + 27 prefixes total, so we should encounter a reset in prefix a start from 0 at some point
         // At the end, there should be only 27 values in RandomPrefix cache
-        assertEquals(27, Iterables.size(a.getPrefixes()));
+        assertEquals(MAX_COUNTER, Iterables.size(a.getPrefixes()));
         assertThat(allGenerated, CoreMatchers.not(CoreMatchers.hasItem("xml")));
         assertThat(allGenerated, CoreMatchers.not(CoreMatchers.hasItem("xmla")));
         assertThat(allGenerated, CoreMatchers.not(CoreMatchers.hasItem("xmlz")));
 
-        assertEquals(2, Iterables.frequency(allGenerated, "a"));
+        assertEquals(1, Iterables.frequency(allGenerated, "a"));
     }
 
     @Test
@@ -70,7 +73,7 @@ public class RandomPrefixTest {
         final QName qName = QName.create(QNameModule.create(uri, new Date()), "p1", "local-name");
         final QName qName2 = QName.create(QNameModule.create(uri, new Date()), "p2", "local-name");
 
-        assertEquals(a.encodePrefix(qName), a.encodePrefix(qName2));
+        assertEquals(a.encodePrefix(qName.getNamespace()), a.encodePrefix(qName2.getNamespace()));
     }
 
     @Test
@@ -79,11 +82,11 @@ public class RandomPrefixTest {
 
         final URI uri = URI.create("localhost");
         QName qName = QName.create(uri, new Date(), "local-name");
-        assertEquals("a", a.encodePrefix(qName));
+        assertEquals("a", a.encodePrefix(qName.getNamespace()));
         qName = QName.create(QNameModule.create(uri, new Date()), "", "local-name");
-        assertEquals("a", a.encodePrefix(qName));
+        assertEquals("a", a.encodePrefix(qName.getNamespace()));
         qName = QName.create(QNameModule.create(URI.create("second"), new Date()), "", "local-name");
-        assertEquals("b", a.encodePrefix(qName));
+        assertEquals("b", a.encodePrefix(qName.getNamespace()));
 
     }
 }