[tmapi-commit] SF.net SVN: tmapi:[173] trunk/src

[<lh...@us...>]

Revision: 173
          http://tmapi.svn.sourceforge.net/tmapi/?rev=173&view=rev
Author:   lheuer
Date:     2010-03-10 13:02:21 +0000 (Wed, 10 Mar 2010)

Log Message:
-----------
* Simplified test
* Added further Java Docs

Modified Paths:
--------------
    trunk/src/main/java/org/tmapi/core/TopicMap.java
    trunk/src/test/java/org/tmapi/core/TestTopicMapSystem.java

Modified: trunk/src/main/java/org/tmapi/core/TopicMap.java
===================================================================
--- trunk/src/main/java/org/tmapi/core/TopicMap.java	2010-03-10 12:18:40 UTC (rev 172)
+++ trunk/src/main/java/org/tmapi/core/TopicMap.java	2010-03-10 13:02:21 UTC (rev 173)
@@ -45,8 +45,15 @@
 
     /**
      * Returns the {@link Locator} that was used to create the topic map.
+     * <p>
+     * Note: The returned locator represents the storage address of the topic map
+     * and implies no further semantics.
+     * </p>
+     * 
+     * @see org.tmapi.core.TopicMapSystem#createTopicMap(org.tmapi.core.Locator)
+     * @see org.tmapi.core.TopicMapSystem#getTopicMap(org.tmapi.core.Locator)
      *
-     * @return A {@link Locator}.
+     * @return A {@link Locator}, never {@code null}.
      */
     public Locator getLocator();
     

Modified: trunk/src/test/java/org/tmapi/core/TestTopicMapSystem.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestTopicMapSystem.java	2010-03-10 12:18:40 UTC (rev 172)
+++ trunk/src/test/java/org/tmapi/core/TestTopicMapSystem.java	2010-03-10 13:02:21 UTC (rev 173)
@@ -72,20 +72,15 @@
         assertEquals(ref, loc.getReference());
     }
     
-    public void testTopicMapLocator() {
+    public void testTopicMapLocator() throws Exception {
         final String ref = "http://www.tmapi.org/";
         final Locator loc = _sys.createLocator(ref+"2");
-        try {
-            TopicMap tm = _sys.createTopicMap(ref);
-            assertEquals(ref, tm.getLocator().getReference());
-            tm.close();
-            
-            tm = _sys.createTopicMap(loc);
-            assertEquals(loc, tm.getLocator());
-            tm.close();
-        } catch (TopicMapExistsException e) {
-            fail("An exception was thrown while creating the topic map");
-        }
+        TopicMap tm = _sys.createTopicMap(ref);
+        assertEquals(ref, tm.getLocator().getReference());
+        tm.close();
+        tm = _sys.createTopicMap(loc);
+        assertEquals(loc, tm.getLocator());
+        tm.close();
     }
 
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.