[jbosscache-commits] JBoss Cache SVN: r5666 - in core/trunk/src: test/java/org/jboss/cache and 1 other directories.

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2008-04-24 11:08:23 -0400 (Thu, 24 Apr 2008)
New Revision: 5666

Modified:
   core/trunk/src/main/java/org/jboss/cache/Fqn.java
   core/trunk/src/test/java/org/jboss/cache/FqnTest.java
   core/trunk/src/test/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderCompatibilityTest.java
Log:
Fixed Fqn stuff

Modified: core/trunk/src/main/java/org/jboss/cache/Fqn.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/Fqn.java	2008-04-24 14:45:57 UTC (rev 5665)
+++ core/trunk/src/main/java/org/jboss/cache/Fqn.java	2008-04-24 15:08:23 UTC (rev 5666)
@@ -355,9 +355,9 @@
    @SuppressWarnings("unchecked")
    public static Fqn<String> fromString(String stringRepresentation)
    {
-      if (stringRepresentation == null)
+      if (stringRepresentation == null || stringRepresentation.equals(SEPARATOR))
       {
-         return root();
+         return ROOT;
       }
       return new StringFqn(stringRepresentation);
    }
@@ -537,7 +537,13 @@
          elements.add(e);
       }
 
-      if (getClass().equals(StringFqn.class)) stringRepresentation = getStringRepresentation(elements);
+      if (getClass().equals(StringFqn.class))
+      {
+         if (isRoot())
+            stringRepresentation = SEPARATOR;
+         else
+            stringRepresentation = getStringRepresentation(elements);
+      }
    }
 
 

Modified: core/trunk/src/test/java/org/jboss/cache/FqnTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/FqnTest.java	2008-04-24 14:45:57 UTC (rev 5665)
+++ core/trunk/src/test/java/org/jboss/cache/FqnTest.java	2008-04-24 15:08:23 UTC (rev 5666)
@@ -303,6 +303,11 @@
 
       fqn = Fqn.fromString("/one/two");
       assert !fqn.isRoot();
+
+      Fqn f = Fqn.fromString("/");
+
+      assert f.isRoot();
+      assert f.equals(Fqn.ROOT);
    }
 
    public void testGetName()

Modified: core/trunk/src/test/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderCompatibilityTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderCompatibilityTest.java	2008-04-24 14:45:57 UTC (rev 5665)
+++ core/trunk/src/test/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderCompatibilityTest.java	2008-04-24 15:08:23 UTC (rev 5666)
@@ -133,7 +133,7 @@
       assertEquals(newImpl.get(Fqn.fromString("/a/b/d")).get("key2"), "value2");
       assertEquals(newImpl.get(Fqn.fromString("/a/b/e")).get("key3"), "value3");
       assertEquals(newImpl.get(Fqn.fromString("/a/f/e")).get("key4"), "value4");
-      assertEquals(newImpl.get(Fqn.ROOT).get("root_key"), "root_value");
+      assertEquals("root_value", newImpl.get(Fqn.ROOT).get("root_key"));
       assertEquals(newImpl.getNodeCount(), 8);
    }