commit 5e54f2e8995a97def0fa6439a80f51953a854c3f
author Jonathan Hart <jono@onlab.us> Thu Apr 17 13:43:40 2014 -0700
committer Gerrit Code Review <gerrit2@gerrit.onos.onlab.us> Fri Apr 18 10:50:19 2014 -0700
tree 2a730c07b0be768a89cd113f5f33300c096bd366
parent 31e15f1ded66931a73d80d84fc28f86d097b12d5

Renamed Trie to Tree for consistency.

This is in the context of SDN-IP's patricia tree.

Change-Id: I59437fb49580aba01a287e9bc0bf035c093c7b95

src/test/java/net/onrc/onos/apps/bgproute/PtreeTest.java

diff --git a/src/test/java/net/onrc/onos/apps/bgproute/PtreeTest.java b/src/test/java/net/onrc/onos/apps/bgproute/PtreeTest.java
index 1b4b8b1..ab461f6 100644
--- a/src/test/java/net/onrc/onos/apps/bgproute/PtreeTest.java
+++ b/src/test/java/net/onrc/onos/apps/bgproute/PtreeTest.java
@@ -25,14 +25,14 @@
     private Logger log = LoggerFactory.getLogger(PtreeTest.class);
 
     private Ptree ptree;
-    private PatriciaTrie<RibEntry> ooptrie;
+    private PatriciaTree<RibEntry> ooPtree;
 
     private Map<String, byte[]> byteAddresses;
 
     @Before
     public void setUp() throws Exception {
         ptree = new Ptree(32);
-        ooptrie = new PatriciaTrie<RibEntry>(32);
+        ooPtree = new PatriciaTree<RibEntry>(32);
 
         String[] strPrefixes = {
                 "192.168.10.0/24",
@@ -54,7 +54,7 @@
 
             PtreeNode node = ptree.acquire(byteAddresses.get(prefix), prefixLength);
             // node.rib = new RibEntry("192.168.10.101", "192.168.60.1");
-            ooptrie.put(new Prefix(byteAddresses.get(prefix), prefixLength),
+            ooPtree.put(new Prefix(byteAddresses.get(prefix), prefixLength),
                     new RibEntry("192.168.10.101", "192.168.60.1"));
         }
     }
@@ -200,11 +200,11 @@
 
     @Test
     public void testIteration() {
-        Iterator<IPatriciaTrie.Entry<RibEntry>> it = ooptrie.iterator();
+        Iterator<IPatriciaTree.Entry<RibEntry>> it = ooPtree.iterator();
 
         while (it.hasNext()) {
-            IPatriciaTrie.Entry<RibEntry> entry = it.next();
-            log.debug("PatriciaTrie prefix {} \t {}", entry.getPrefix(), entry.getPrefix().printAsBits());
+            IPatriciaTree.Entry<RibEntry> entry = it.next();
+            log.debug("PatriciaTree prefix {} \t {}", entry.getPrefix(), entry.getPrefix().printAsBits());
         }
 
         try {