Menu
▾
▴
tmapi-commit — TMAPI commit messages
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(29) |
Sep
(4) |
Oct
|
Nov
(12) |
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(1) |
Feb
(4) |
Mar
(4) |
Apr
|
May
(2) |
Jun
(4) |
Jul
(9) |
Aug
(2) |
Sep
|
Oct
(10) |
Nov
|
Dec
|
| 2010 |
Jan
(12) |
Feb
(20) |
Mar
(17) |
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
(1) |
Sep
(7) |
Oct
|
Nov
|
Dec
|
|
From: <lh...@us...> - 2010-09-22 12:02:18
|
Revision: 191
http://tmapi.svn.sourceforge.net/tmapi/?rev=191&view=rev
Author: lheuer
Date: 2010-09-22 12:02:12 +0000 (Wed, 22 Sep 2010)
Log Message:
-----------
Fixes issue #424686 (reported by Hannes)
Modified Paths:
--------------
trunk/build.xml
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2010-09-14 14:41:34 UTC (rev 190)
+++ trunk/build.xml 2010-09-22 12:02:12 UTC (rev 191)
@@ -42,6 +42,7 @@
<target name="init">
<property name="dist.version" value="${version}${version_suffix}"/>
+ <property name="dist.version_bundle" value="${version}"/>
<property name="dist.name" value="tmapi-${dist.version}"/>
<property name="tmapi.jar" value="${dist.name}.jar"/>
@@ -187,14 +188,14 @@
<attribute name="Implementation-Version" value="${dist.version}"/>
<attribute name="Implementation-URL" value="http://www.tmapi.org/"/>
<!-- OSGi-specific -->
- <attribute name="Export-Package" value="org.tmapi.core;version=${dist.version},org.tmapi.index;version=${dist.version}"/>
+ <attribute name="Export-Package" value="org.tmapi.core;version=${dist.version_bundle},org.tmapi.index;version=${dist.version_bundle}"/>
<attribute name="Import-Package" value="org.osgi.framework"/>
<attribute name="Bundle-Name" value="TMAPI"/>
<attribute name="Bundle-SymbolicName" value="org.tmapi"/>
<attribute name="Bundle-Vendor" value="TMAPI.org"/>
<attribute name="Bundle-Description" value="Common Topic Maps API"/>
<attribute name="Bundle-Activator" value="org.tmapi.core.internal.Activator"/>
- <attribute name="Bundle-Version" value="${dist.version}"/>
+ <attribute name="Bundle-Version" value="${dist.version_bundle}"/>
</manifest>
</jar>
<checksum file="${dir.build}/${tmapi.jar}" algorithm="sha1"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-09-14 14:41:44
|
Revision: 190
http://tmapi.svn.sourceforge.net/tmapi/?rev=190&view=rev
Author: lheuer
Date: 2010-09-14 14:41:34 +0000 (Tue, 14 Sep 2010)
Log Message:
-----------
Added section about testing TMAPI processors to README.txt. Contributed by Benjamin Bock
<https://sourceforge.net/tracker/?func=detail&aid=3065991&group_id=39237&atid=424688>
Modified Paths:
--------------
trunk/README.txt
Modified: trunk/README.txt
===================================================================
--- trunk/README.txt 2010-09-01 18:04:56 UTC (rev 189)
+++ trunk/README.txt 2010-09-14 14:41:34 UTC (rev 190)
@@ -3,9 +3,11 @@
1. What is TMAPI?
2. How do I run it?
-3. Reporting Bugs
-4. Legal stuff
+3. How do I test my own Topic Maps processor implementation?
+4. Reporting Bugs
+5. Legal stuff
+
1. What is TMAPI?
-----------------
TMAPI is an open-source effort to define a set of common APIs for programming
@@ -26,6 +28,7 @@
interface packages for topic map parsers; query engines; and other Topic Maps
processing tools as needed.
+
2. How do I run it?
-------------------
TMAPI is NOT a Topic Maps processor! There is really nothing to run except for
@@ -34,7 +37,35 @@
implementations available. Up-to-date details can be found on the TMAPI website
at http://www.tmapi.org/2.0/
-3. Reporting Bugs
+
+3. How do I test my own Topic Maps processor implementation?
+------------------------------------------------------------
+Instead of copying the TMAPI test suite to your project you should run the
+org.tmapi.AllTests Suite. This suite includes both the core tests and the index
+tests but not the TMAPI-internal self-tests like e.g. TestTopicMapSystemFactory.
+
+Your minimal test suite could look as follows:
+
+ public class TestTMAPI extends TestSuite {
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(suite());
+ }
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite();
+ suite.addTest(org.tmapi.AllTests.suite());
+ return suite;
+ }
+ }
+
+The test suite expects to find your engine's TopicMapSystemFactory which it uses
+to instantiate your TopicMapSystem, so you should provide this information in the
+META-INF/services/org.tmapi.core.TopicMapSystemFactory resource file in your project.
+If your project uses Maven, the META-INF directory should be in src/main/resources/.
+
+
+4. Reporting Bugs
-----------------
If an implementation does not behave as you expect it to, please DO NOT TELL US!
Tell the vendor/author of the implementation.
@@ -46,9 +77,9 @@
tma...@li... (you may need to register for this list
before posting - go the http://sourceforge.net/projects/tmapi and click on Lists).
-4. Legal Stuff
+
+5. Legal Stuff
--------------
-
TMAPI is Public Domain software. See the file LICENSE.txt that is part of this
distribution.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-09-01 18:05:02
|
Revision: 189
http://tmapi.svn.sourceforge.net/tmapi/?rev=189&view=rev
Author: lheuer
Date: 2010-09-01 18:04:56 +0000 (Wed, 01 Sep 2010)
Log Message:
-----------
Updated CHANGES.txt
Modified Paths:
--------------
trunk/CHANGES.txt
Modified: trunk/CHANGES.txt
===================================================================
--- trunk/CHANGES.txt 2010-09-01 11:18:37 UTC (rev 188)
+++ trunk/CHANGES.txt 2010-09-01 18:04:56 UTC (rev 189)
@@ -4,6 +4,8 @@
TMAPI 2.0.3 - 2010-mm-dd
------------------------
+* Added "clear()" method to the org.tmapi.core.TopicMap interface
+* Added more tests
* Fixed bug in test (only relevant if the feature
"http://tmapi.org/features/type-instance-associations" is enabled)
reported and fixed by Sven Krosse
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bo...@us...> - 2010-09-01 11:18:43
|
Revision: 188
http://tmapi.svn.sourceforge.net/tmapi/?rev=188&view=rev
Author: bosso
Date: 2010-09-01 11:18:37 +0000 (Wed, 01 Sep 2010)
Log Message:
-----------
implemented advises from lars heuer
Modified Paths:
--------------
trunk/src/test/java/org/tmapi/core/TestTopicMap.java
Modified: trunk/src/test/java/org/tmapi/core/TestTopicMap.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestTopicMap.java 2010-09-01 09:55:11 UTC (rev 187)
+++ trunk/src/test/java/org/tmapi/core/TestTopicMap.java 2010-09-01 11:18:37 UTC (rev 188)
@@ -235,67 +235,71 @@
}
public void testClear() {
- LiteralIndex li = _tm.getIndex(LiteralIndex.class);
- if (!li.isOpen()) {
- li.open();
- }
-
- // adding some constructs to the topic map
- _tm.setReifier(_tm.createTopic());
- assertNotNull(_tm.getReifier());
-
- _tm.addItemIdentifier(_tm.createLocator("http://tmapi.org/test/topicmap"));
- assertEquals(1, _tm.getItemIdentifiers().size());
-
- // create topic with name, variant and occurrence
- Topic t = _tm.createTopic();
- assertNotNull(t);
-
- Name n = t.createName("Test", _tm.createTopic());
- assertNotNull(n);
-
- Variant v = n.createVariant("VariantName", _tm.createTopic());
- assertNotNull(v);
-
- Occurrence occ = t.createOccurrence(_tm.createTopic(), "TestOccurrence");
- assertNotNull(occ);
-
- Association assoc = _tm.createAssociation(_tm.createTopic());
- assertNotNull(assoc);
-
- Role r = assoc.createRole(_tm.createTopic(), _tm.createTopic());
- assertNotNull(r);
-
-
- // checking the literal index
- if (!li.isAutoUpdated()) {
- li.reindex();
- }
- assertEquals(1, li.getNames("Test").size());
- assertEquals(n, li.getNames("Test").iterator().next());
- assertEquals(1, li.getVariants("VariantName").size());
- assertEquals(v, li.getVariants("VariantName").iterator().next());
- assertEquals(1, li.getOccurrences("TestOccurrence").size());
- assertEquals(occ, li.getOccurrences("TestOccurrence").iterator().next());
-
- // clear the topic map
- _tm.clear();
-
- // check topic map
- assertEquals(0, _tm.getAssociations().size());
- assertEquals(0, _tm.getTopics().size());
- assertEquals(0, _tm.getItemIdentifiers().size());
- assertNull(_tm.getReifier());
- assertEquals(_defaultLocator, _tm.getLocator());
-
- // check index
- if (!li.isAutoUpdated()) {
- li.reindex();
- }
- assertEquals(0, li.getNames("Test").size());
- assertEquals(0, li.getVariants("VariantName").size());
- assertEquals(0, li.getOccurrences("TestOccurrence").size());
-
+ LiteralIndex li = _tm.getIndex(LiteralIndex.class);
+ if (!li.isOpen()) {
+ li.open();
+ }
+
+ // adding some constructs to the topic map
+ _tm.setReifier(_tm.createTopic());
+ assertNotNull(_tm.getReifier());
+
+ _tm.addItemIdentifier(_tm
+ .createLocator("http://tmapi.org/test/topicmap"));
+ assertEquals(1, _tm.getItemIdentifiers().size());
+
+ // create topic with name, variant and occurrence
+ Topic t = _tm.createTopic();
+ assertNotNull(t);
+
+ Name n = t.createName("Test", _tm.createTopic());
+ assertNotNull(n);
+
+ Variant v = n.createVariant("VariantName", _tm.createTopic());
+ assertNotNull(v);
+
+ Occurrence occ = t
+ .createOccurrence(_tm.createTopic(), "TestOccurrence");
+ assertNotNull(occ);
+
+ Association assoc = _tm.createAssociation(_tm.createTopic());
+ assertNotNull(assoc);
+
+ Role r = assoc.createRole(_tm.createTopic(), _tm.createTopic());
+ assertNotNull(r);
+
+ // checking the literal index
+ if (!li.isAutoUpdated()) {
+ li.reindex();
+ }
+ assertEquals(1, li.getNames("Test").size());
+ assertEquals(n, li.getNames("Test").iterator().next());
+ assertEquals(1, li.getVariants("VariantName").size());
+ assertEquals(v, li.getVariants("VariantName").iterator().next());
+ assertEquals(1, li.getOccurrences("TestOccurrence").size());
+ assertEquals(occ, li.getOccurrences("TestOccurrence").iterator().next());
+
+ // clear the topic map
+ _tm.clear();
+
+ // check topic map
+
+ assertNotNull(_sys.getTopicMap(_tm.getLocator()));
+
+ assertEquals(0, _tm.getAssociations().size());
+ assertEquals(0, _tm.getTopics().size());
+ assertEquals(0, _tm.getItemIdentifiers().size());
+ assertNull(_tm.getReifier());
+ assertEquals(_defaultLocator, _tm.getLocator());
+
+ // check index
+ if (!li.isAutoUpdated()) {
+ li.reindex();
+ }
+ assertEquals(0, li.getNames("Test").size());
+ assertEquals(0, li.getVariants("VariantName").size());
+ assertEquals(0, li.getOccurrences("TestOccurrence").size());
+
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-09-01 09:55:17
|
Revision: 187
http://tmapi.svn.sourceforge.net/tmapi/?rev=187&view=rev
Author: lheuer
Date: 2010-09-01 09:55:11 +0000 (Wed, 01 Sep 2010)
Log Message:
-----------
Removed references to sun.reflect.generics.visitor.Reifier
Modified Paths:
--------------
trunk/src/main/java/org/tmapi/core/TopicMap.java
Modified: trunk/src/main/java/org/tmapi/core/TopicMap.java
===================================================================
--- trunk/src/main/java/org/tmapi/core/TopicMap.java 2010-09-01 09:02:58 UTC (rev 186)
+++ trunk/src/main/java/org/tmapi/core/TopicMap.java 2010-09-01 09:55:11 UTC (rev 187)
@@ -18,8 +18,6 @@
import org.tmapi.index.Index;
-import sun.reflect.generics.visitor.Reifier;
-
/**
* Represents a
* <a href="http://www.isotopicmaps.org/sam/sam-model/#d0e657">topic map item</a>.
@@ -243,7 +241,7 @@
/**
* Clears the topic map.
* <p>
- * All constructs in the topic map will be removed including the {@link Reifier} of the topic map
+ * All constructs in the topic map will be removed including the reifier of the topic map
* and all item identifiers of the map.
* </p>
* <p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-09-01 09:03:04
|
Revision: 186
http://tmapi.svn.sourceforge.net/tmapi/?rev=186&view=rev
Author: lheuer
Date: 2010-09-01 09:02:58 +0000 (Wed, 01 Sep 2010)
Log Message:
-----------
Fixed typo (if the variable tm is final, it is impossible to assign "tm = tmSys.createTopicMap(loc);")
Modified Paths:
--------------
trunk/src/main/java/org/tmapi/core/TopicMap.java
Modified: trunk/src/main/java/org/tmapi/core/TopicMap.java
===================================================================
--- trunk/src/main/java/org/tmapi/core/TopicMap.java 2010-09-01 08:48:13 UTC (rev 185)
+++ trunk/src/main/java/org/tmapi/core/TopicMap.java 2010-09-01 09:02:58 UTC (rev 186)
@@ -250,9 +250,9 @@
* The result is a map which would be equal to:
* <code>
* final Locator loc = tmSys.createLocator("http://example.org/map");
- * final TopicMap tm = tmSys.createTopicMap(loc);
+ * TopicMap tm = tmSys.createTopicMap(loc);
* tm.remove();
- * tm = tmSys.createTopicMap(loc);
+ * tm = tmSys.createTopicMap(loc);
* </code>
* </p>
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bo...@us...> - 2010-09-01 08:48:20
|
Revision: 185
http://tmapi.svn.sourceforge.net/tmapi/?rev=185&view=rev
Author: bosso
Date: 2010-09-01 08:48:13 +0000 (Wed, 01 Sep 2010)
Log Message:
-----------
added clear method and testCase; see issue #3056681
Modified Paths:
--------------
trunk/src/main/java/org/tmapi/core/TopicMap.java
trunk/src/test/java/org/tmapi/core/TestTopicMap.java
Modified: trunk/src/main/java/org/tmapi/core/TopicMap.java
===================================================================
--- trunk/src/main/java/org/tmapi/core/TopicMap.java 2010-08-31 14:27:13 UTC (rev 184)
+++ trunk/src/main/java/org/tmapi/core/TopicMap.java 2010-09-01 08:48:13 UTC (rev 185)
@@ -18,6 +18,8 @@
import org.tmapi.index.Index;
+import sun.reflect.generics.visitor.Reifier;
+
/**
* Represents a
* <a href="http://www.isotopicmaps.org/sam/sam-model/#d0e657">topic map item</a>.
@@ -236,6 +238,25 @@
* </p>
*/
public void close();
+
+
+ /**
+ * Clears the topic map.
+ * <p>
+ * All constructs in the topic map will be removed including the {@link Reifier} of the topic map
+ * and all item identifiers of the map.
+ * </p>
+ * <p>
+ * The result is a map which would be equal to:
+ * <code>
+ * final Locator loc = tmSys.createLocator("http://example.org/map");
+ * final TopicMap tm = tmSys.createTopicMap(loc);
+ * tm.remove();
+ * tm = tmSys.createTopicMap(loc);
+ * </code>
+ * </p>
+ */
+ public void clear();
/**
* Merges the topic map <tt>other</tt> into this topic map.
Modified: trunk/src/test/java/org/tmapi/core/TestTopicMap.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestTopicMap.java 2010-08-31 14:27:13 UTC (rev 184)
+++ trunk/src/test/java/org/tmapi/core/TestTopicMap.java 2010-09-01 08:48:13 UTC (rev 185)
@@ -18,6 +18,7 @@
import java.util.Collections;
import org.tmapi.index.Index;
+import org.tmapi.index.LiteralIndex;
/**
* Tests against the {@link TopicMap} interface.
@@ -232,6 +233,70 @@
// noop.
}
}
+
+ public void testClear() {
+ LiteralIndex li = _tm.getIndex(LiteralIndex.class);
+ if (!li.isOpen()) {
+ li.open();
+ }
+
+ // adding some constructs to the topic map
+ _tm.setReifier(_tm.createTopic());
+ assertNotNull(_tm.getReifier());
+
+ _tm.addItemIdentifier(_tm.createLocator("http://tmapi.org/test/topicmap"));
+ assertEquals(1, _tm.getItemIdentifiers().size());
+
+ // create topic with name, variant and occurrence
+ Topic t = _tm.createTopic();
+ assertNotNull(t);
+
+ Name n = t.createName("Test", _tm.createTopic());
+ assertNotNull(n);
+
+ Variant v = n.createVariant("VariantName", _tm.createTopic());
+ assertNotNull(v);
+
+ Occurrence occ = t.createOccurrence(_tm.createTopic(), "TestOccurrence");
+ assertNotNull(occ);
+
+ Association assoc = _tm.createAssociation(_tm.createTopic());
+ assertNotNull(assoc);
+
+ Role r = assoc.createRole(_tm.createTopic(), _tm.createTopic());
+ assertNotNull(r);
+
+
+ // checking the literal index
+ if (!li.isAutoUpdated()) {
+ li.reindex();
+ }
+ assertEquals(1, li.getNames("Test").size());
+ assertEquals(n, li.getNames("Test").iterator().next());
+ assertEquals(1, li.getVariants("VariantName").size());
+ assertEquals(v, li.getVariants("VariantName").iterator().next());
+ assertEquals(1, li.getOccurrences("TestOccurrence").size());
+ assertEquals(occ, li.getOccurrences("TestOccurrence").iterator().next());
+
+ // clear the topic map
+ _tm.clear();
+
+ // check topic map
+ assertEquals(0, _tm.getAssociations().size());
+ assertEquals(0, _tm.getTopics().size());
+ assertEquals(0, _tm.getItemIdentifiers().size());
+ assertNull(_tm.getReifier());
+ assertEquals(_defaultLocator, _tm.getLocator());
+
+ // check index
+ if (!li.isAutoUpdated()) {
+ li.reindex();
+ }
+ assertEquals(0, li.getNames("Test").size());
+ assertEquals(0, li.getVariants("VariantName").size());
+ assertEquals(0, li.getOccurrences("TestOccurrence").size());
+
+ }
/**
* Test index.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-08-31 16:10:01
|
Revision: 184
http://tmapi.svn.sourceforge.net/tmapi/?rev=184&view=rev
Author: lheuer
Date: 2010-08-31 14:27:13 +0000 (Tue, 31 Aug 2010)
Log Message:
-----------
* Added test for topic map recreation under the same storage address
* Added test for the removal of topic maps
Modified Paths:
--------------
trunk/src/test/java/org/tmapi/core/TestTopicMapSystem.java
Modified: trunk/src/test/java/org/tmapi/core/TestTopicMapSystem.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestTopicMapSystem.java 2010-07-20 12:54:47 UTC (rev 183)
+++ trunk/src/test/java/org/tmapi/core/TestTopicMapSystem.java 2010-08-31 14:27:13 UTC (rev 184)
@@ -85,4 +85,38 @@
tm.close();
}
+ public void testTopicMapRecreation() throws Exception {
+ final String ref = "http://www.tmapi.org/recreation";
+ final Locator loc = _sys.createLocator(ref);
+ final TopicMap tm = _sys.createTopicMap(loc);
+ assertNotNull(tm);
+ final Topic topic = tm.createTopic();
+ assertNotNull(topic);
+ assertEquals(1, tm.getTopics().size());
+ tm.remove();
+ assertNull(_sys.getTopicMap(loc));
+ final TopicMap tm2 = _sys.createTopicMap(loc);
+ assertNotNull(tm2);
+ assertEquals(0, tm2.getTopics().size());
+ }
+
+ public void testTopicMapRemoval() throws Exception {
+ final String ref = "http://www.tmapi.org/removal";
+ final Locator loc = _sys.createLocator(ref);
+ final TopicMap tm = _sys.createTopicMap(loc);
+ assertNotNull(tm);
+ final Topic topic = tm.createTopic();
+ assertNotNull(topic);
+ final Topic topic2 = tm.createTopic();
+ assertNotNull(topic2);
+ final Name name = topic2.createName(topic, "Bla");
+ assertNotNull(name);
+ tm.setReifier(topic2);
+ assertEquals(topic2, tm.getReifier());
+ // topic is used by topic2 and topic2 is the reifier of the topic map,
+ // but .remove() MUST NOT throw a TopicInUseException!
+ tm.remove();
+ assertNull(_sys.getTopicMap(loc));
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-07-20 12:54:53
|
Revision: 183
http://tmapi.svn.sourceforge.net/tmapi/?rev=183&view=rev
Author: lheuer
Date: 2010-07-20 12:54:47 +0000 (Tue, 20 Jul 2010)
Log Message:
-----------
Avoid merging of roles
Modified Paths:
--------------
trunk/src/test/java/org/tmapi/core/TestTopic.java
Modified: trunk/src/test/java/org/tmapi/core/TestTopic.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestTopic.java 2010-07-19 15:18:32 UTC (rev 182)
+++ trunk/src/test/java/org/tmapi/core/TestTopic.java 2010-07-20 12:54:47 UTC (rev 183)
@@ -169,45 +169,45 @@
public void testRoleAssociationFilter() {
final Topic player = createTopic();
final Topic assocType1 = createTopic();
- final Topic assocType2 = createTopic();
+ final Topic unusedType = createTopic();
final Topic roleType1 = createTopic();
final Topic roleType2 = createTopic();
final Association assoc = _tm.createAssociation(assocType1);
assertEquals(0, player.getRolesPlayed(roleType1, assocType1).size());
- assertEquals(0, player.getRolesPlayed(roleType1, assocType2).size());
+ assertEquals(0, player.getRolesPlayed(roleType1, unusedType).size());
assertEquals(0, player.getRolesPlayed(roleType2, assocType1).size());
- assertEquals(0, player.getRolesPlayed(roleType2, assocType2).size());
+ assertEquals(0, player.getRolesPlayed(roleType2, unusedType).size());
final Role role1 = assoc.createRole(roleType1, player);
assertEquals(1, player.getRolesPlayed(roleType1, assocType1).size());
assertTrue(player.getRolesPlayed(roleType1, assocType1).contains(role1));
- assertEquals(0, player.getRolesPlayed(roleType1, assocType2).size());
+ assertEquals(0, player.getRolesPlayed(roleType1, unusedType).size());
assertEquals(0, player.getRolesPlayed(roleType2, assocType1).size());
- assertEquals(0, player.getRolesPlayed(roleType2, assocType2).size());
+ assertEquals(0, player.getRolesPlayed(roleType2, unusedType).size());
final Role role2 = assoc.createRole(roleType2, player);
assertEquals(1, player.getRolesPlayed(roleType1, assocType1).size());
assertTrue(player.getRolesPlayed(roleType1, assocType1).contains(role1));
- assertEquals(0, player.getRolesPlayed(roleType1, assocType2).size());
+ assertEquals(0, player.getRolesPlayed(roleType1, unusedType).size());
assertEquals(1, player.getRolesPlayed(roleType2, assocType1).size());
assertTrue(player.getRolesPlayed(roleType2, assocType1).contains(role2));
- assertEquals(0, player.getRolesPlayed(roleType2, assocType2).size());
- role2.setType(roleType1);
+ assertEquals(0, player.getRolesPlayed(roleType2, unusedType).size());
+ final Role role3 = _tm.createAssociation(assocType1).createRole(roleType1, player);
assertEquals(2, player.getRolesPlayed(roleType1, assocType1).size());
assertTrue(player.getRolesPlayed(roleType1, assocType1).contains(role1));
- assertTrue(player.getRolesPlayed(roleType1, assocType1).contains(role2));
- assertEquals(0, player.getRolesPlayed(roleType1, assocType2).size());
- assertEquals(0, player.getRolesPlayed(roleType2, assocType1).size());
- assertEquals(0, player.getRolesPlayed(roleType2, assocType2).size());
- role1.remove();
+ assertTrue(player.getRolesPlayed(roleType1, assocType1).contains(role3));
+ assertEquals(0, player.getRolesPlayed(roleType1, unusedType).size());
+ assertEquals(1, player.getRolesPlayed(roleType2, assocType1).size());
+ assertEquals(0, player.getRolesPlayed(roleType2, unusedType).size());
+ role3.remove();
assertEquals(1, player.getRolesPlayed(roleType1, assocType1).size());
- assertTrue(player.getRolesPlayed(roleType1, assocType1).contains(role2));
- assertEquals(0, player.getRolesPlayed(roleType1, assocType2).size());
- assertEquals(0, player.getRolesPlayed(roleType2, assocType1).size());
- assertEquals(0, player.getRolesPlayed(roleType2, assocType2).size());
+ assertTrue(player.getRolesPlayed(roleType1, assocType1).contains(role1));
+ assertEquals(0, player.getRolesPlayed(roleType1, unusedType).size());
+ assertEquals(1, player.getRolesPlayed(roleType2, assocType1).size());
+ assertEquals(0, player.getRolesPlayed(roleType2, unusedType).size());
assoc.remove();
assertEquals(0, player.getRolesPlayed(roleType1, assocType1).size());
- assertEquals(0, player.getRolesPlayed(roleType1, assocType2).size());
+ assertEquals(0, player.getRolesPlayed(roleType1, unusedType).size());
assertEquals(0, player.getRolesPlayed(roleType2, assocType1).size());
- assertEquals(0, player.getRolesPlayed(roleType2, assocType2).size());
+ assertEquals(0, player.getRolesPlayed(roleType2, unusedType).size());
}
public void testRoleAssociationFilterIllegalAssociation() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-07-19 15:18:38
|
Revision: 182
http://tmapi.svn.sourceforge.net/tmapi/?rev=182&view=rev
Author: lheuer
Date: 2010-07-19 15:18:32 +0000 (Mon, 19 Jul 2010)
Log Message:
-----------
Checked exception wasn't handled by the patch. Fixed.
Modified Paths:
--------------
trunk/src/test/java/org/tmapi/core/TestTopicRemovableConstraint.java
Modified: trunk/src/test/java/org/tmapi/core/TestTopicRemovableConstraint.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestTopicRemovableConstraint.java 2010-07-19 15:11:41 UTC (rev 181)
+++ trunk/src/test/java/org/tmapi/core/TestTopicRemovableConstraint.java 2010-07-19 15:18:32 UTC (rev 182)
@@ -206,7 +206,7 @@
* Tests if the removable constraint is respected if a topic is
* used as topic type.
*/
- public void testUsedAsTopicType() {
+ public void testUsedAsTopicType() throws Exception {
Topic topic = createTopic();
Topic topic2 = createTopic();
assertEquals(2, _tm.getTopics().size());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-07-19 15:11:48
|
Revision: 181
http://tmapi.svn.sourceforge.net/tmapi/?rev=181&view=rev
Author: lheuer
Date: 2010-07-19 15:11:41 +0000 (Mon, 19 Jul 2010)
Log Message:
-----------
Applied Sven's patch, updated CHANGES.txt
Modified Paths:
--------------
trunk/CHANGES.txt
trunk/src/test/java/org/tmapi/core/TestTopicRemovableConstraint.java
Modified: trunk/CHANGES.txt
===================================================================
--- trunk/CHANGES.txt 2010-03-23 21:45:47 UTC (rev 180)
+++ trunk/CHANGES.txt 2010-07-19 15:11:41 UTC (rev 181)
@@ -2,6 +2,13 @@
TMAPI Changes
=============
+TMAPI 2.0.3 - 2010-mm-dd
+------------------------
+* Fixed bug in test (only relevant if the feature
+ "http://tmapi.org/features/type-instance-associations" is enabled)
+ reported and fixed by Sven Krosse
+
+
TMAPI 2.0.2 - 2010-03-18
------------------------
* Added TopicMap.getLocator() to return the storage address of
Modified: trunk/src/test/java/org/tmapi/core/TestTopicRemovableConstraint.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestTopicRemovableConstraint.java 2010-03-23 21:45:47 UTC (rev 180)
+++ trunk/src/test/java/org/tmapi/core/TestTopicRemovableConstraint.java 2010-07-19 15:11:41 UTC (rev 181)
@@ -24,6 +24,8 @@
*/
public class TestTopicRemovableConstraint extends AbstractTMAPITestCase {
+ private static final String _FEATURE_TYPE_INSTANCE_ASSOCIATIONS= "http://tmapi.org/features/type-instance-associations";
+
public TestTopicRemovableConstraint(String name) {
super(name);
}
@@ -216,10 +218,20 @@
catch (TopicInUseException ex) {
assertEquals(topic, ex.getReporter());
}
- assertEquals(2, _tm.getTopics().size());
+ if (_sys.getFeature(_FEATURE_TYPE_INSTANCE_ASSOCIATIONS)) {
+ assertEquals(5, _tm.getTopics().size());
+ }
+ else{
+ assertEquals(2, _tm.getTopics().size());
+ }
topic2.removeType(topic);
topic.remove();
- assertEquals(1, _tm.getTopics().size());
+ if (_sys.getFeature(_FEATURE_TYPE_INSTANCE_ASSOCIATIONS)) {
+ assertEquals(4, _tm.getTopics().size());
+ }
+ else{
+ assertEquals(1, _tm.getTopics().size());
+ }
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-03-23 21:45:54
|
Revision: 180
http://tmapi.svn.sourceforge.net/tmapi/?rev=180&view=rev
Author: lheuer
Date: 2010-03-23 21:45:47 +0000 (Tue, 23 Mar 2010)
Log Message:
-----------
Renamed TMAPITestCase to AbstractTMAPITestCase
Modified Paths:
--------------
trunk/src/test/java/org/tmapi/core/AbstractTestDatatypeAware.java
trunk/src/test/java/org/tmapi/core/AbstractTestTopicMergeDetection.java
trunk/src/test/java/org/tmapi/core/TestAssociation.java
trunk/src/test/java/org/tmapi/core/TestConstruct.java
trunk/src/test/java/org/tmapi/core/TestItemIdentifierConstraint.java
trunk/src/test/java/org/tmapi/core/TestLocator.java
trunk/src/test/java/org/tmapi/core/TestName.java
trunk/src/test/java/org/tmapi/core/TestRFC3986.java
trunk/src/test/java/org/tmapi/core/TestReifiable.java
trunk/src/test/java/org/tmapi/core/TestRole.java
trunk/src/test/java/org/tmapi/core/TestSameTopicMap.java
trunk/src/test/java/org/tmapi/core/TestScoped.java
trunk/src/test/java/org/tmapi/core/TestTopic.java
trunk/src/test/java/org/tmapi/core/TestTopicMap.java
trunk/src/test/java/org/tmapi/core/TestTopicMapMerge.java
trunk/src/test/java/org/tmapi/core/TestTopicMapSystem.java
trunk/src/test/java/org/tmapi/core/TestTopicMerge.java
trunk/src/test/java/org/tmapi/core/TestTopicRemovableConstraint.java
trunk/src/test/java/org/tmapi/core/TestTyped.java
trunk/src/test/java/org/tmapi/index/TestLiteralIndex.java
trunk/src/test/java/org/tmapi/index/TestScopedIndex.java
trunk/src/test/java/org/tmapi/index/TestTypeInstanceIndex.java
Added Paths:
-----------
trunk/src/test/java/org/tmapi/core/AbstractTMAPITestCase.java
Removed Paths:
-------------
trunk/src/test/java/org/tmapi/core/TMAPITestCase.java
Added: trunk/src/test/java/org/tmapi/core/AbstractTMAPITestCase.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/AbstractTMAPITestCase.java (rev 0)
+++ trunk/src/test/java/org/tmapi/core/AbstractTMAPITestCase.java 2010-03-23 21:45:47 UTC (rev 180)
@@ -0,0 +1,213 @@
+/*
+ * The Topic Maps API (TMAPI) was created collectively by
+ * the membership of the tmapi-discuss mailing list
+ * <http://lists.sourceforge.net/mailman/listinfo/tmapi-discuss>,
+ * is hereby released into the public domain; and comes with
+ * NO WARRANTY.
+ *
+ * No one owns TMAPI: you may use it freely in both commercial and
+ * non-commercial applications, bundle it with your software
+ * distribution, include it on a CD-ROM, list the source code in a
+ * book, mirror the documentation at your own web site, or use it in
+ * any other way you see fit.
+ */
+package org.tmapi.core;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+/**
+ * This TestClass is the base of all TMAPI test classes.
+ *
+ * It uses {@link TopicMapSystemFactory} in {@link #setUp()} method.
+ * So, the Property "org.tmapi.core.TopicMapSystemFactory" has to be set
+ * to the implementing factory class.
+ *
+ * Please use also the {@link #createTopicMap(Locator)}, {@link #createTopicMap(String)},
+ * and {@link #removeTopicMap(Locator)}, {@link #removeTopicMap(String)}
+ * methods.
+ * So after running the test the {@link #teardown()} method removes all created
+ * {@link TopicMap} instances.
+ * That needed for TMAPI implementations which are working with persistent
+ * backends.
+ *
+ * @author <a href="http://tmapi.org/">The TMAPI Project</a>
+ * @version $Rev: 66 $ - $Date: 2008-08-20 13:26:30 +0200 (Mi, 20 Aug 2008) $
+ */
+public abstract class AbstractTMAPITestCase extends TestCase {
+
+ /**
+ * Default address under which the initial topic map is stored.
+ */
+ protected static final String _DEFAULT_ADDRESS = "http://www.tmapi.org/tmapi2.0";
+
+ /**
+ * Locator representing the <tt>_DEFAUL_ADDRESS</tt>.
+ */
+ protected Locator _defaultLocator;
+
+ /**
+ * Default TopicMapSystem instance created during {@link #setUp()}
+ */
+ protected TopicMapSystem _sys;
+
+ /**
+ * Default topic map which is created during {@link #setUp()}
+ */
+ protected TopicMap _tm;
+
+ public AbstractTMAPITestCase(String name) {
+ super(name);
+ }
+
+ /* (non-Javadoc)
+ * @see junit.framework.TestCase#setUp()
+ */
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ TopicMapSystemFactory factory = TopicMapSystemFactory.newInstance();
+ //bad hack to copy all System.Properties to factory
+ for (Object obj: System.getProperties().keySet()) {
+ String key = (String) obj;
+ factory.setProperty(key, System.getProperty(key));
+ }
+ _sys = factory.newTopicMapSystem();
+ removeAllMaps(); // Seems to be unnecessary, but who knows
+ _defaultLocator = _sys.createLocator(_DEFAULT_ADDRESS);
+ _tm = _sys.createTopicMap(_defaultLocator);
+ }
+
+ /* (non-Javadoc)
+ * @see junit.framework.TestCase#tearDown()
+ */
+ @Override
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ removeAllMaps();
+ _sys.close();
+ }
+
+ /**
+ * Creates a topic with a random item identifier.
+ *
+ * @return The topic.
+ */
+ protected Topic createTopic() {
+ return _tm.createTopic();
+ }
+
+ /**
+ * Creates an association with a random type and no roles.
+ *
+ * @return The association.
+ */
+ protected Association createAssociation() {
+ return _tm.createAssociation(createTopic());
+ }
+
+ /**
+ * Creates a role which is part of a random association with a random
+ * player and type.
+ *
+ * @return The role.
+ */
+ protected Role createRole() {
+ return createAssociation().createRole(createTopic(), createTopic());
+ }
+
+ /**
+ * Creates an occurrence which is part of a random topic with a random type.
+ *
+ * @return The occurrence.
+ */
+ protected Occurrence createOccurrence() {
+ return createTopic().createOccurrence(createTopic(), "Occurrence");
+ }
+
+ /**
+ * Creates a name which is part of a newly created topic using the default
+ * type name.
+ *
+ * @return The name.
+ */
+ protected Name createName() {
+ return createTopic().createName("Name");
+ }
+
+ /**
+ * Creates a variant which is part of a newly created name.
+ *
+ * @return The variant.
+ */
+ protected Variant createVariant() {
+ return createName().createVariant("Variant", createTopic());
+ }
+
+ protected Locator createLocator(final String iri) {
+ return _sys.createLocator(iri);
+ }
+
+ /**
+ * Creates a topic map under the specified <tt>iri</tt>.
+ *
+ * @param iri The IRI where the topic map should be stored.
+ * @return A topic map instance.
+ * @throws TopicMapExistsException If a topic map under the IRI exists already.
+ */
+ protected TopicMap createTopicMap(String iri) throws TopicMapExistsException {
+ return createTopicMap(_sys.createLocator(iri));
+ }
+
+ /**
+ * Creates a topic map under the specified <tt>locator</tt>.
+ *
+ * @param locator The locator under which the topic map should be stored.
+ * @return A topic map instance.
+ * @throws TopicMapExistsException If a topic map under the IRI exists already.
+ */
+ protected TopicMap createTopicMap(Locator locator) throws TopicMapExistsException {
+ return _sys.createTopicMap(locator);
+ }
+
+ /**
+ * Removes a topic map stored at <tt>iri</tt> from this system.
+ *
+ * @param iri The IRI where the topic map is stored.
+ */
+ protected void removeTopicMap(String iri) {
+ removeTopicMap(createLocator(iri));
+ }
+
+ /**
+ * Removes a topic map stored at <tt>locator</tt> from this system.
+ *
+ * @param locator The IRI where the topic map is stored.
+ */
+ protected void removeTopicMap(Locator locator) {
+ removeTopicMap(_sys.getTopicMap(locator));
+ }
+
+ /**
+ * Removes a topic map.
+ *
+ * @param tm The topic map to remove
+ */
+ protected void removeTopicMap(TopicMap tm) {
+ tm.remove();
+ }
+
+ /**
+ * Deletes all topic maps known in the system.
+ */
+ protected void removeAllMaps() {
+ List<Locator> locs = new ArrayList<Locator>();
+ locs.addAll(_sys.getLocators());
+ for (Locator loc: locs) {
+ removeTopicMap(loc);
+ }
+ }
+
+}
Modified: trunk/src/test/java/org/tmapi/core/AbstractTestDatatypeAware.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/AbstractTestDatatypeAware.java 2010-03-23 21:37:44 UTC (rev 179)
+++ trunk/src/test/java/org/tmapi/core/AbstractTestDatatypeAware.java 2010-03-23 21:45:47 UTC (rev 180)
@@ -23,7 +23,7 @@
* @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
* @version $Rev$ - $Date$
*/
-public abstract class AbstractTestDatatypeAware extends TMAPITestCase {
+public abstract class AbstractTestDatatypeAware extends AbstractTMAPITestCase {
protected static final String _XSD = "http://www.w3.org/2001/XMLSchema#";
protected static final String _XSD_STRING = _XSD + "string";
Modified: trunk/src/test/java/org/tmapi/core/AbstractTestTopicMergeDetection.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/AbstractTestTopicMergeDetection.java 2010-03-23 21:37:44 UTC (rev 179)
+++ trunk/src/test/java/org/tmapi/core/AbstractTestTopicMergeDetection.java 2010-03-23 21:45:47 UTC (rev 180)
@@ -20,7 +20,7 @@
* @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
* @version $Rev$ - $Date$
*/
-public abstract class AbstractTestTopicMergeDetection extends TMAPITestCase {
+public abstract class AbstractTestTopicMergeDetection extends AbstractTMAPITestCase {
private boolean _automerge;
Deleted: trunk/src/test/java/org/tmapi/core/TMAPITestCase.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TMAPITestCase.java 2010-03-23 21:37:44 UTC (rev 179)
+++ trunk/src/test/java/org/tmapi/core/TMAPITestCase.java 2010-03-23 21:45:47 UTC (rev 180)
@@ -1,213 +0,0 @@
-/*
- * The Topic Maps API (TMAPI) was created collectively by
- * the membership of the tmapi-discuss mailing list
- * <http://lists.sourceforge.net/mailman/listinfo/tmapi-discuss>,
- * is hereby released into the public domain; and comes with
- * NO WARRANTY.
- *
- * No one owns TMAPI: you may use it freely in both commercial and
- * non-commercial applications, bundle it with your software
- * distribution, include it on a CD-ROM, list the source code in a
- * book, mirror the documentation at your own web site, or use it in
- * any other way you see fit.
- */
-package org.tmapi.core;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-/**
- * This TestClass is the base of all TMAPI test classes.
- *
- * It uses {@link TopicMapSystemFactory} in {@link #setUp()} method.
- * So, the Property "org.tmapi.core.TopicMapSystemFactory" has to be set
- * to the implementing factory class.
- *
- * Please use also the {@link #createTopicMap(Locator)}, {@link #createTopicMap(String)},
- * and {@link #removeTopicMap(Locator)}, {@link #removeTopicMap(String)}
- * methods.
- * So after running the test the {@link #teardown()} method removes all created
- * {@link TopicMap} instances.
- * That needed for TMAPI implementations which are working with persistent
- * backends.
- *
- * @author <a href="http://tmapi.org/">The TMAPI Project</a>
- * @version $Rev$ - $Date$
- */
-public abstract class TMAPITestCase extends TestCase {
-
- /**
- * Default address under which the initial topic map is stored.
- */
- protected static final String _DEFAULT_ADDRESS = "http://www.tmapi.org/tmapi2.0";
-
- /**
- * Locator representing the <tt>_DEFAUL_ADDRESS</tt>.
- */
- protected Locator _defaultLocator;
-
- /**
- * Default TopicMapSystem instance created during {@link #setUp()}
- */
- protected TopicMapSystem _sys;
-
- /**
- * Default topic map which is created during {@link #setUp()}
- */
- protected TopicMap _tm;
-
- public TMAPITestCase(String name) {
- super(name);
- }
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- TopicMapSystemFactory factory = TopicMapSystemFactory.newInstance();
- //bad hack to copy all System.Properties to factory
- for (Object obj: System.getProperties().keySet()) {
- String key = (String) obj;
- factory.setProperty(key, System.getProperty(key));
- }
- _sys = factory.newTopicMapSystem();
- removeAllMaps(); // Seems to be unnecessary, but who knows
- _defaultLocator = _sys.createLocator(_DEFAULT_ADDRESS);
- _tm = _sys.createTopicMap(_defaultLocator);
- }
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#tearDown()
- */
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
- removeAllMaps();
- _sys.close();
- }
-
- /**
- * Creates a topic with a random item identifier.
- *
- * @return The topic.
- */
- protected Topic createTopic() {
- return _tm.createTopic();
- }
-
- /**
- * Creates an association with a random type and no roles.
- *
- * @return The association.
- */
- protected Association createAssociation() {
- return _tm.createAssociation(createTopic());
- }
-
- /**
- * Creates a role which is part of a random association with a random
- * player and type.
- *
- * @return The role.
- */
- protected Role createRole() {
- return createAssociation().createRole(createTopic(), createTopic());
- }
-
- /**
- * Creates an occurrence which is part of a random topic with a random type.
- *
- * @return The occurrence.
- */
- protected Occurrence createOccurrence() {
- return createTopic().createOccurrence(createTopic(), "Occurrence");
- }
-
- /**
- * Creates a name which is part of a newly created topic using the default
- * type name.
- *
- * @return The name.
- */
- protected Name createName() {
- return createTopic().createName("Name");
- }
-
- /**
- * Creates a variant which is part of a newly created name.
- *
- * @return The variant.
- */
- protected Variant createVariant() {
- return createName().createVariant("Variant", createTopic());
- }
-
- protected Locator createLocator(final String iri) {
- return _sys.createLocator(iri);
- }
-
- /**
- * Creates a topic map under the specified <tt>iri</tt>.
- *
- * @param iri The IRI where the topic map should be stored.
- * @return A topic map instance.
- * @throws TopicMapExistsException If a topic map under the IRI exists already.
- */
- protected TopicMap createTopicMap(String iri) throws TopicMapExistsException {
- return createTopicMap(_sys.createLocator(iri));
- }
-
- /**
- * Creates a topic map under the specified <tt>locator</tt>.
- *
- * @param locator The locator under which the topic map should be stored.
- * @return A topic map instance.
- * @throws TopicMapExistsException If a topic map under the IRI exists already.
- */
- protected TopicMap createTopicMap(Locator locator) throws TopicMapExistsException {
- return _sys.createTopicMap(locator);
- }
-
- /**
- * Removes a topic map stored at <tt>iri</tt> from this system.
- *
- * @param iri The IRI where the topic map is stored.
- */
- protected void removeTopicMap(String iri) {
- removeTopicMap(createLocator(iri));
- }
-
- /**
- * Removes a topic map stored at <tt>locator</tt> from this system.
- *
- * @param locator The IRI where the topic map is stored.
- */
- protected void removeTopicMap(Locator locator) {
- removeTopicMap(_sys.getTopicMap(locator));
- }
-
- /**
- * Removes a topic map.
- *
- * @param tm The topic map to remove
- */
- protected void removeTopicMap(TopicMap tm) {
- tm.remove();
- }
-
- /**
- * Deletes all topic maps known in the system.
- */
- protected void removeAllMaps() {
- List<Locator> locs = new ArrayList<Locator>();
- locs.addAll(_sys.getLocators());
- for (Locator loc: locs) {
- removeTopicMap(loc);
- }
- }
-
-}
Modified: trunk/src/test/java/org/tmapi/core/TestAssociation.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestAssociation.java 2010-03-23 21:37:44 UTC (rev 179)
+++ trunk/src/test/java/org/tmapi/core/TestAssociation.java 2010-03-23 21:45:47 UTC (rev 180)
@@ -20,7 +20,7 @@
* @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
* @version $Rev$ - $Date$
*/
-public class TestAssociation extends TMAPITestCase {
+public class TestAssociation extends AbstractTMAPITestCase {
public TestAssociation(String name) {
super(name);
Modified: trunk/src/test/java/org/tmapi/core/TestConstruct.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestConstruct.java 2010-03-23 21:37:44 UTC (rev 179)
+++ trunk/src/test/java/org/tmapi/core/TestConstruct.java 2010-03-23 21:45:47 UTC (rev 180)
@@ -20,7 +20,7 @@
* @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
* @version $Rev$ - $Date$
*/
-public class TestConstruct extends TMAPITestCase {
+public class TestConstruct extends AbstractTMAPITestCase {
public TestConstruct(String name) {
super(name);
Modified: trunk/src/test/java/org/tmapi/core/TestItemIdentifierConstraint.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestItemIdentifierConstraint.java 2010-03-23 21:37:44 UTC (rev 179)
+++ trunk/src/test/java/org/tmapi/core/TestItemIdentifierConstraint.java 2010-03-23 21:45:47 UTC (rev 180)
@@ -26,7 +26,7 @@
* @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
* @version $Rev$ - $Date$
*/
-public class TestItemIdentifierConstraint extends TMAPITestCase {
+public class TestItemIdentifierConstraint extends AbstractTMAPITestCase {
public TestItemIdentifierConstraint(String name) {
super(name);
Modified: trunk/src/test/java/org/tmapi/core/TestLocator.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestLocator.java 2010-03-23 21:37:44 UTC (rev 179)
+++ trunk/src/test/java/org/tmapi/core/TestLocator.java 2010-03-23 21:45:47 UTC (rev 180)
@@ -19,7 +19,7 @@
* @author <a href="http://tmapi.org/">The TMAPI Project</a>
* @version $Rev$ - $Date$
*/
-public class TestLocator extends TMAPITestCase {
+public class TestLocator extends AbstractTMAPITestCase {
public TestLocator(String name) {
super(name);
Modified: trunk/src/test/java/org/tmapi/core/TestName.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestName.java 2010-03-23 21:37:44 UTC (rev 179)
+++ trunk/src/test/java/org/tmapi/core/TestName.java 2010-03-23 21:45:47 UTC (rev 180)
@@ -22,7 +22,7 @@
* @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
* @version $Rev$ - $Date$
*/
-public class TestName extends TMAPITestCase {
+public class TestName extends AbstractTMAPITestCase {
public TestName(String name) {
super(name);
Modified: trunk/src/test/java/org/tmapi/core/TestRFC3986.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestRFC3986.java 2010-03-23 21:37:44 UTC (rev 179)
+++ trunk/src/test/java/org/tmapi/core/TestRFC3986.java 2010-03-23 21:45:47 UTC (rev 180)
@@ -20,7 +20,7 @@
* @author <a href="http://tmapi.org/">The TMAPI Project</a>
* @version $Rev$ - $Date$
*/
-public class TestRFC3986 extends TMAPITestCase {
+public class TestRFC3986 extends AbstractTMAPITestCase {
public TestRFC3986(String name) {
super(name);
Modified: trunk/src/test/java/org/tmapi/core/TestReifiable.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestReifiable.java 2010-03-23 21:37:44 UTC (rev 179)
+++ trunk/src/test/java/org/tmapi/core/TestReifiable.java 2010-03-23 21:45:47 UTC (rev 180)
@@ -20,7 +20,7 @@
* @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
* @version $Rev$ - $Date$
*/
-public class TestReifiable extends TMAPITestCase {
+public class TestReifiable extends AbstractTMAPITestCase {
public TestReifiable(String name) {
super(name);
Modified: trunk/src/test/java/org/tmapi/core/TestRole.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestRole.java 2010-03-23 21:37:44 UTC (rev 179)
+++ trunk/src/test/java/org/tmapi/core/TestRole.java 2010-03-23 21:45:47 UTC (rev 180)
@@ -20,7 +20,7 @@
* @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
* @version $Rev$ - $Date$
*/
-public class TestRole extends TMAPITestCase {
+public class TestRole extends AbstractTMAPITestCase {
public TestRole(String name) {
super(name);
Modified: trunk/src/test/java/org/tmapi/core/TestSameTopicMap.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestSameTopicMap.java 2010-03-23 21:37:44 UTC (rev 179)
+++ trunk/src/test/java/org/tmapi/core/TestSameTopicMap.java 2010-03-23 21:45:47 UTC (rev 180)
@@ -27,7 +27,7 @@
* @author <a href="http://tmapi.org/">The TMAPI Project</a>
* @version $Rev$ - $Date$
*/
-public class TestSameTopicMap extends TMAPITestCase {
+public class TestSameTopicMap extends AbstractTMAPITestCase {
private TopicMap _tm2;
Modified: trunk/src/test/java/org/tmapi/core/TestScoped.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestScoped.java 2010-03-23 21:37:44 UTC (rev 179)
+++ trunk/src/test/java/org/tmapi/core/TestScoped.java 2010-03-23 21:45:47 UTC (rev 180)
@@ -20,7 +20,7 @@
* @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
* @version $Rev$ - $Date$
*/
-public class TestScoped extends TMAPITestCase {
+public class TestScoped extends AbstractTMAPITestCase {
public TestScoped(String name) {
super(name);
Modified: trunk/src/test/java/org/tmapi/core/TestTopic.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestTopic.java 2010-03-23 21:37:44 UTC (rev 179)
+++ trunk/src/test/java/org/tmapi/core/TestTopic.java 2010-03-23 21:45:47 UTC (rev 180)
@@ -24,7 +24,7 @@
* @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
* @version $Rev$ - $Date$
*/
-public class TestTopic extends TMAPITestCase {
+public class TestTopic extends AbstractTMAPITestCase {
public TestTopic(String name) {
super(name);
Modified: trunk/src/test/java/org/tmapi/core/TestTopicMap.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestTopicMap.java 2010-03-23 21:37:44 UTC (rev 179)
+++ trunk/src/test/java/org/tmapi/core/TestTopicMap.java 2010-03-23 21:45:47 UTC (rev 180)
@@ -26,7 +26,7 @@
* @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
* @version $Rev$ - $Date$
*/
-public class TestTopicMap extends TMAPITestCase {
+public class TestTopicMap extends AbstractTMAPITestCase {
public TestTopicMap(String name) {
super(name);
Modified: trunk/src/test/java/org/tmapi/core/TestTopicMapMerge.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestTopicMapMerge.java 2010-03-23 21:37:44 UTC (rev 179)
+++ trunk/src/test/java/org/tmapi/core/TestTopicMapMerge.java 2010-03-23 21:45:47 UTC (rev 180)
@@ -24,7 +24,7 @@
* @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
* @version $Rev$ - $Date$
*/
-public class TestTopicMapMerge extends TMAPITestCase {
+public class TestTopicMapMerge extends AbstractTMAPITestCase {
private static final String _TM2_BASE = "http://www.sf.net/projects/tinytim/tm-2";
Modified: trunk/src/test/java/org/tmapi/core/TestTopicMapSystem.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestTopicMapSystem.java 2010-03-23 21:37:44 UTC (rev 179)
+++ trunk/src/test/java/org/tmapi/core/TestTopicMapSystem.java 2010-03-23 21:45:47 UTC (rev 180)
@@ -19,7 +19,7 @@
* @author <a href="http://tmapi.org/">The TMAPI Project</a>
* @version $Rev$ - $Date$
*/
-public class TestTopicMapSystem extends TMAPITestCase {
+public class TestTopicMapSystem extends AbstractTMAPITestCase {
public TestTopicMapSystem(String name) {
super(name);
Modified: trunk/src/test/java/org/tmapi/core/TestTopicMerge.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestTopicMerge.java 2010-03-23 21:37:44 UTC (rev 179)
+++ trunk/src/test/java/org/tmapi/core/TestTopicMerge.java 2010-03-23 21:45:47 UTC (rev 180)
@@ -20,7 +20,7 @@
* @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
* @version $Rev$ - $Date$
*/
-public class TestTopicMerge extends TMAPITestCase {
+public class TestTopicMerge extends AbstractTMAPITestCase {
public TestTopicMerge(String name) {
super(name);
Modified: trunk/src/test/java/org/tmapi/core/TestTopicRemovableConstraint.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestTopicRemovableConstraint.java 2010-03-23 21:37:44 UTC (rev 179)
+++ trunk/src/test/java/org/tmapi/core/TestTopicRemovableConstraint.java 2010-03-23 21:45:47 UTC (rev 180)
@@ -22,7 +22,7 @@
* @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
* @version $Rev$ - $Date$
*/
-public class TestTopicRemovableConstraint extends TMAPITestCase {
+public class TestTopicRemovableConstraint extends AbstractTMAPITestCase {
public TestTopicRemovableConstraint(String name) {
super(name);
Modified: trunk/src/test/java/org/tmapi/core/TestTyped.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestTyped.java 2010-03-23 21:37:44 UTC (rev 179)
+++ trunk/src/test/java/org/tmapi/core/TestTyped.java 2010-03-23 21:45:47 UTC (rev 180)
@@ -20,7 +20,7 @@
* @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
* @version $Rev$ - $Date$
*/
-public class TestTyped extends TMAPITestCase {
+public class TestTyped extends AbstractTMAPITestCase {
public TestTyped(String name) {
super(name);
Modified: trunk/src/test/java/org/tmapi/index/TestLiteralIndex.java
===================================================================
--- trunk/src/test/java/org/tmapi/index/TestLiteralIndex.java 2010-03-23 21:37:44 UTC (rev 179)
+++ trunk/src/test/java/org/tmapi/index/TestLiteralIndex.java 2010-03-23 21:45:47 UTC (rev 180)
@@ -16,7 +16,7 @@
import org.tmapi.core.Locator;
import org.tmapi.core.Name;
import org.tmapi.core.Occurrence;
-import org.tmapi.core.TMAPITestCase;
+import org.tmapi.core.AbstractTMAPITestCase;
import org.tmapi.core.Topic;
import org.tmapi.core.Variant;
@@ -27,7 +27,7 @@
* @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
* @version $Rev$ - $Date$
*/
-public class TestLiteralIndex extends TMAPITestCase {
+public class TestLiteralIndex extends AbstractTMAPITestCase {
private LiteralIndex _litIdx;
private Locator _xsdString;
Modified: trunk/src/test/java/org/tmapi/index/TestScopedIndex.java
===================================================================
--- trunk/src/test/java/org/tmapi/index/TestScopedIndex.java 2010-03-23 21:37:44 UTC (rev 179)
+++ trunk/src/test/java/org/tmapi/index/TestScopedIndex.java 2010-03-23 21:45:47 UTC (rev 180)
@@ -18,7 +18,7 @@
import org.tmapi.core.Association;
import org.tmapi.core.Name;
import org.tmapi.core.Occurrence;
-import org.tmapi.core.TMAPITestCase;
+import org.tmapi.core.AbstractTMAPITestCase;
import org.tmapi.core.Topic;
import org.tmapi.core.Variant;
@@ -29,7 +29,7 @@
* @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
* @version $Rev$ - $Date$
*/
-public class TestScopedIndex extends TMAPITestCase {
+public class TestScopedIndex extends AbstractTMAPITestCase {
public TestScopedIndex(String name) {
super(name);
Modified: trunk/src/test/java/org/tmapi/index/TestTypeInstanceIndex.java
===================================================================
--- trunk/src/test/java/org/tmapi/index/TestTypeInstanceIndex.java 2010-03-23 21:37:44 UTC (rev 179)
+++ trunk/src/test/java/org/tmapi/index/TestTypeInstanceIndex.java 2010-03-23 21:45:47 UTC (rev 180)
@@ -18,7 +18,7 @@
import org.tmapi.core.Name;
import org.tmapi.core.Occurrence;
import org.tmapi.core.Role;
-import org.tmapi.core.TMAPITestCase;
+import org.tmapi.core.AbstractTMAPITestCase;
import org.tmapi.core.Topic;
/**
@@ -28,7 +28,7 @@
* @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
* @version $Rev$ - $Date$
*/
-public class TestTypeInstanceIndex extends TMAPITestCase {
+public class TestTypeInstanceIndex extends AbstractTMAPITestCase {
private static final String _FEATURE_TYPE_INSTANCE_ASSOCIATIONS= "http://tmapi.org/features/type-instance-associations";
private TypeInstanceIndex _typeInstanceIdx;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-03-23 21:37:50
|
Revision: 179
http://tmapi.svn.sourceforge.net/tmapi/?rev=179&view=rev
Author: lheuer
Date: 2010-03-23 21:37:44 +0000 (Tue, 23 Mar 2010)
Log Message:
-----------
Made TMAPI test case abstract
Modified Paths:
--------------
trunk/src/test/java/org/tmapi/core/TMAPITestCase.java
Modified: trunk/src/test/java/org/tmapi/core/TMAPITestCase.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TMAPITestCase.java 2010-03-19 13:58:46 UTC (rev 178)
+++ trunk/src/test/java/org/tmapi/core/TMAPITestCase.java 2010-03-23 21:37:44 UTC (rev 179)
@@ -36,7 +36,7 @@
* @author <a href="http://tmapi.org/">The TMAPI Project</a>
* @version $Rev$ - $Date$
*/
-public class TMAPITestCase extends TestCase {
+public abstract class TMAPITestCase extends TestCase {
/**
* Default address under which the initial topic map is stored.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-03-19 13:58:52
|
Revision: 178
http://tmapi.svn.sourceforge.net/tmapi/?rev=178&view=rev
Author: lheuer
Date: 2010-03-19 13:58:46 +0000 (Fri, 19 Mar 2010)
Log Message:
-----------
Updated build props
Modified Paths:
--------------
tags/release-2_0_2/build.properties
trunk/build.properties
Modified: tags/release-2_0_2/build.properties
===================================================================
--- tags/release-2_0_2/build.properties 2010-03-19 13:32:39 UTC (rev 177)
+++ tags/release-2_0_2/build.properties 2010-03-19 13:58:46 UTC (rev 178)
@@ -1,5 +1,5 @@
version=2.0.2
-version_suffix=-SNAPSHOT
+version_suffix=
debug=off
optimize=on
Modified: trunk/build.properties
===================================================================
--- trunk/build.properties 2010-03-19 13:32:39 UTC (rev 177)
+++ trunk/build.properties 2010-03-19 13:58:46 UTC (rev 178)
@@ -1,4 +1,4 @@
-version=2.0.2
+version=2.0.3
version_suffix=-SNAPSHOT
debug=off
optimize=on
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-03-19 13:32:46
|
Revision: 177
http://tmapi.svn.sourceforge.net/tmapi/?rev=177&view=rev
Author: lheuer
Date: 2010-03-19 13:32:39 +0000 (Fri, 19 Mar 2010)
Log Message:
-----------
Tagged 2.0.2
Added Paths:
-----------
tags/release-2_0_2/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-03-19 13:31:27
|
Revision: 176
http://tmapi.svn.sourceforge.net/tmapi/?rev=176&view=rev
Author: lheuer
Date: 2010-03-19 13:31:17 +0000 (Fri, 19 Mar 2010)
Log Message:
-----------
Updated date for 2.0.2
Modified Paths:
--------------
trunk/CHANGES.txt
Modified: trunk/CHANGES.txt
===================================================================
--- trunk/CHANGES.txt 2010-03-10 13:06:21 UTC (rev 175)
+++ trunk/CHANGES.txt 2010-03-19 13:31:17 UTC (rev 176)
@@ -2,7 +2,7 @@
TMAPI Changes
=============
-TMAPI 2.0.2 - 2010-mm-dd
+TMAPI 2.0.2 - 2010-03-18
------------------------
* Added TopicMap.getLocator() to return the storage address of
the topic map within a TopicMapSystem.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-03-10 13:06:31
|
Revision: 175
http://tmapi.svn.sourceforge.net/tmapi/?rev=175&view=rev
Author: lheuer
Date: 2010-03-10 13:06:21 +0000 (Wed, 10 Mar 2010)
Log Message:
-----------
More tests
Modified Paths:
--------------
trunk/src/test/java/org/tmapi/core/TestTopicMapSystem.java
Modified: trunk/src/test/java/org/tmapi/core/TestTopicMapSystem.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestTopicMapSystem.java 2010-03-10 13:03:46 UTC (rev 174)
+++ trunk/src/test/java/org/tmapi/core/TestTopicMapSystem.java 2010-03-10 13:06:21 UTC (rev 175)
@@ -77,9 +77,11 @@
final Locator loc = _sys.createLocator(ref+"2");
TopicMap tm = _sys.createTopicMap(ref);
assertEquals(ref, tm.getLocator().getReference());
+ assertEquals(tm, _sys.getTopicMap(ref));
tm.close();
tm = _sys.createTopicMap(loc);
assertEquals(loc, tm.getLocator());
+ assertEquals(tm, _sys.getTopicMap(loc));
tm.close();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-03-10 13:03:54
|
Revision: 174
http://tmapi.svn.sourceforge.net/tmapi/?rev=174&view=rev
Author: lheuer
Date: 2010-03-10 13:03:46 +0000 (Wed, 10 Mar 2010)
Log Message:
-----------
Updated CHANGES.txt
Modified Paths:
--------------
trunk/CHANGES.txt
Modified: trunk/CHANGES.txt
===================================================================
--- trunk/CHANGES.txt 2010-03-10 13:02:21 UTC (rev 173)
+++ trunk/CHANGES.txt 2010-03-10 13:03:46 UTC (rev 174)
@@ -4,9 +4,10 @@
TMAPI 2.0.2 - 2010-mm-dd
------------------------
+* Added TopicMap.getLocator() to return the storage address of
+ the topic map within a TopicMapSystem.
-
TMAPI 2.0.1 - 2010-03-09
------------------------
* Added more illegal Variant scope tests.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-03-10 13:02:30
|
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.
|
|
From: <bo...@us...> - 2010-03-10 12:19:27
|
Revision: 172
http://tmapi.svn.sourceforge.net/tmapi/?rev=172&view=rev
Author: bosso
Date: 2010-03-10 12:18:40 +0000 (Wed, 10 Mar 2010)
Log Message:
-----------
added "getLocator" into the topic map
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-09 09:35:32 UTC (rev 171)
+++ trunk/src/main/java/org/tmapi/core/TopicMap.java 2010-03-10 12:18:40 UTC (rev 172)
@@ -44,6 +44,13 @@
public Set<Topic> getTopics();
/**
+ * Returns the {@link Locator} that was used to create the topic map.
+ *
+ * @return A {@link Locator}.
+ */
+ public Locator getLocator();
+
+ /**
* Returns all {@link Association}s contained in this topic map.
*
* The return value may be empty but must never be <tt>null</tt>.
Modified: trunk/src/test/java/org/tmapi/core/TestTopicMapSystem.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestTopicMapSystem.java 2010-03-09 09:35:32 UTC (rev 171)
+++ trunk/src/test/java/org/tmapi/core/TestTopicMapSystem.java 2010-03-10 12:18:40 UTC (rev 172)
@@ -71,5 +71,21 @@
final Locator loc = _sys.createLocator(ref);
assertEquals(ref, loc.getReference());
}
+
+ public void testTopicMapLocator() {
+ 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");
+ }
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-03-09 09:35:41
|
Revision: 171
http://tmapi.svn.sourceforge.net/tmapi/?rev=171&view=rev
Author: lheuer
Date: 2010-03-09 09:35:32 +0000 (Tue, 09 Mar 2010)
Log Message:
-----------
Incremented version no, updated CHANGES.txt
Modified Paths:
--------------
tags/release-2_0_1/CHANGES.txt
tags/release-2_0_1/build.properties
trunk/CHANGES.txt
trunk/build.properties
Modified: tags/release-2_0_1/CHANGES.txt
===================================================================
--- tags/release-2_0_1/CHANGES.txt 2010-03-09 09:30:33 UTC (rev 170)
+++ tags/release-2_0_1/CHANGES.txt 2010-03-09 09:35:32 UTC (rev 171)
@@ -2,12 +2,13 @@
TMAPI Changes
=============
-TMAPI 2.0.1 - 2010-mm-dd
+TMAPI 2.0.1 - 2010-03-09
------------------------
* Added more illegal Variant scope tests.
* Added support for OSGi (TMAPI is usable as an OSGi bundle)
* Java-Doc fixes (reported by Jan Schreiber)
+
TMAPI 2.0 - 2010-02-06
----------------------
* Simplified TestItemIdentifierConstraint test case to avoid
Modified: tags/release-2_0_1/build.properties
===================================================================
--- tags/release-2_0_1/build.properties 2010-03-09 09:30:33 UTC (rev 170)
+++ tags/release-2_0_1/build.properties 2010-03-09 09:35:32 UTC (rev 171)
@@ -1,6 +1,5 @@
version=2.0.1
-# If the suffix is provided, it MUST start with "."
-version_suffix=.snapshot
+version_suffix=
debug=off
optimize=on
Modified: trunk/CHANGES.txt
===================================================================
--- trunk/CHANGES.txt 2010-03-09 09:30:33 UTC (rev 170)
+++ trunk/CHANGES.txt 2010-03-09 09:35:32 UTC (rev 171)
@@ -2,12 +2,18 @@
TMAPI Changes
=============
-TMAPI 2.0.1 - 2010-mm-dd
+TMAPI 2.0.2 - 2010-mm-dd
------------------------
+
+
+
+TMAPI 2.0.1 - 2010-03-09
+------------------------
* Added more illegal Variant scope tests.
* Added support for OSGi (TMAPI is usable as an OSGi bundle)
* Java-Doc fixes (reported by Jan Schreiber)
+
TMAPI 2.0 - 2010-02-06
----------------------
* Simplified TestItemIdentifierConstraint test case to avoid
Modified: trunk/build.properties
===================================================================
--- trunk/build.properties 2010-03-09 09:30:33 UTC (rev 170)
+++ trunk/build.properties 2010-03-09 09:35:32 UTC (rev 171)
@@ -1,6 +1,5 @@
-version=2.0.1
-# If the suffix is provided, it MUST start with "."
-version_suffix=.snapshot
+version=2.0.2
+version_suffix=-SNAPSHOT
debug=off
optimize=on
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-03-09 09:30:39
|
Revision: 170
http://tmapi.svn.sourceforge.net/tmapi/?rev=170&view=rev
Author: lheuer
Date: 2010-03-09 09:30:33 +0000 (Tue, 09 Mar 2010)
Log Message:
-----------
Tagged 2.0.1
Added Paths:
-----------
tags/release-2_0_1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-03-07 19:50:18
|
Revision: 169
http://tmapi.svn.sourceforge.net/tmapi/?rev=169&view=rev
Author: lheuer
Date: 2010-03-07 19:50:09 +0000 (Sun, 07 Mar 2010)
Log Message:
-----------
Updated CHANGES
Modified Paths:
--------------
trunk/CHANGES.txt
Modified: trunk/CHANGES.txt
===================================================================
--- trunk/CHANGES.txt 2010-03-05 20:37:40 UTC (rev 168)
+++ trunk/CHANGES.txt 2010-03-07 19:50:09 UTC (rev 169)
@@ -5,7 +5,8 @@
TMAPI 2.0.1 - 2010-mm-dd
------------------------
* Added more illegal Variant scope tests.
-* Added support for OSGi
+* Added support for OSGi (TMAPI is usable as an OSGi bundle)
+* Java-Doc fixes (reported by Jan Schreiber)
TMAPI 2.0 - 2010-02-06
----------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-03-05 20:37:46
|
Revision: 168
http://tmapi.svn.sourceforge.net/tmapi/?rev=168&view=rev
Author: lheuer
Date: 2010-03-05 20:37:40 +0000 (Fri, 05 Mar 2010)
Log Message:
-----------
Better docs
Modified Paths:
--------------
trunk/src/main/java/org/tmapi/index/TypeInstanceIndex.java
Modified: trunk/src/main/java/org/tmapi/index/TypeInstanceIndex.java
===================================================================
--- trunk/src/main/java/org/tmapi/index/TypeInstanceIndex.java 2010-03-05 20:32:27 UTC (rev 167)
+++ trunk/src/main/java/org/tmapi/index/TypeInstanceIndex.java 2010-03-05 20:37:40 UTC (rev 168)
@@ -40,7 +40,7 @@
/**
* Returns the topics which are an instance of the specified <tt>type</tt> or
- * all topics which have no type (iff {@code type} is {@code null).
+ * all topics which have are not an instance of another topic (iff {@code type} is {@code null}).
* <p>
* Note: Implementations may return only those topics whose <tt>types</tt>
* property contains the type and may ignore
@@ -51,7 +51,8 @@
* </p>
* The return value may be empty but must never be <tt>null</tt>.
*
- * @param type The type of the {@link Topic}s to be returned or {@code null} to return all untyped topics.
+ * @param type The type of the {@link Topic}s to be returned or {@code null} to
+ * return all topics which are not an instance of another topic.
* @return An unmodifiable collection of {@link Topic}s.
*/
public Collection<Topic> getTopics(Topic type);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-03-05 20:32:36
|
Revision: 167
http://tmapi.svn.sourceforge.net/tmapi/?rev=167&view=rev
Author: lheuer
Date: 2010-03-05 20:32:27 +0000 (Fri, 05 Mar 2010)
Log Message:
-----------
Fixed docs, reported by Jan Schreiber
Modified Paths:
--------------
trunk/src/main/java/org/tmapi/index/TypeInstanceIndex.java
Modified: trunk/src/main/java/org/tmapi/index/TypeInstanceIndex.java
===================================================================
--- trunk/src/main/java/org/tmapi/index/TypeInstanceIndex.java 2010-03-02 23:56:30 UTC (rev 166)
+++ trunk/src/main/java/org/tmapi/index/TypeInstanceIndex.java 2010-03-05 20:32:27 UTC (rev 167)
@@ -39,7 +39,8 @@
public interface TypeInstanceIndex extends Index {
/**
- * Returns the topics which are an instance of the specified <tt>type</tt>.
+ * Returns the topics which are an instance of the specified <tt>type</tt> or
+ * all topics which have no type (iff {@code type} is {@code null).
* <p>
* Note: Implementations may return only those topics whose <tt>types</tt>
* property contains the type and may ignore
@@ -50,7 +51,7 @@
* </p>
* The return value may be empty but must never be <tt>null</tt>.
*
- * @param type The type of the {@link Topic}s to be returned.
+ * @param type The type of the {@link Topic}s to be returned or {@code null} to return all untyped topics.
* @return An unmodifiable collection of {@link Topic}s.
*/
public Collection<Topic> getTopics(Topic type);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|