Menu
▾
▴
[tinyTiM-commits] SF.net SVN: tinytim:[109] tinytim/trunk/src/test/java/org/tinytim/core
|
From: <lh...@us...> - 2008-08-08 14:03:45
|
Revision: 109
http://tinytim.svn.sourceforge.net/tinytim/?rev=109&view=rev
Author: lheuer
Date: 2008-08-08 14:03:53 +0000 (Fri, 08 Aug 2008)
Log Message:
-----------
Updated test cases
Modified Paths:
--------------
tinytim/trunk/src/test/java/org/tinytim/core/TestIRI.java
tinytim/trunk/src/test/java/org/tinytim/core/TestLiteral.java
tinytim/trunk/src/test/java/org/tinytim/core/TestSignatureGenerator.java
tinytim/trunk/src/test/java/org/tinytim/core/TinyTimTestCase.java
Modified: tinytim/trunk/src/test/java/org/tinytim/core/TestIRI.java
===================================================================
--- tinytim/trunk/src/test/java/org/tinytim/core/TestIRI.java 2008-08-08 12:10:45 UTC (rev 108)
+++ tinytim/trunk/src/test/java/org/tinytim/core/TestIRI.java 2008-08-08 14:03:53 UTC (rev 109)
@@ -26,7 +26,7 @@
* Tests against the locator implementation.
*
* @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
- * @version $Rev:$ - $Date:$
+ * @version $Rev$ - $Date$
*/
public class TestIRI extends TinyTimTestCase {
Modified: tinytim/trunk/src/test/java/org/tinytim/core/TestLiteral.java
===================================================================
--- tinytim/trunk/src/test/java/org/tinytim/core/TestLiteral.java 2008-08-08 12:10:45 UTC (rev 108)
+++ tinytim/trunk/src/test/java/org/tinytim/core/TestLiteral.java 2008-08-08 14:03:53 UTC (rev 109)
@@ -27,10 +27,20 @@
*
*
* @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
- * @version $Rev:$ - $Date:$
+ * @version $Rev$ - $Date$
*/
public class TestLiteral extends TinyTimTestCase {
+
+ public void testStringGet() {
+ final String value = "tiny tiny tiny";
+ ILiteral lit = Literal.get(value);
+ assertNull(lit);
+ lit = Literal.create(value);
+ assertNotNull(lit);
+ assertSame(lit, Literal.get(value));
+ }
+
public void testStringEquality() {
final String value = "tinyTiM";
ILiteral lit1 = Literal.create(value);
Modified: tinytim/trunk/src/test/java/org/tinytim/core/TestSignatureGenerator.java
===================================================================
--- tinytim/trunk/src/test/java/org/tinytim/core/TestSignatureGenerator.java 2008-08-08 12:10:45 UTC (rev 108)
+++ tinytim/trunk/src/test/java/org/tinytim/core/TestSignatureGenerator.java 2008-08-08 14:03:53 UTC (rev 109)
@@ -44,8 +44,8 @@
Association assoc = _tm.createAssociation(type);
Association assoc2 = _tm.createAssociation(type);
assertFalse(assoc.getId().equals(assoc2.getId()));
- String sig = SignatureGenerator.generateSignature(assoc);
- assertEquals(sig, SignatureGenerator.generateSignature(assoc2));
+ assertEquals(SignatureGenerator.generateSignature(assoc),
+ SignatureGenerator.generateSignature(assoc2));
}
/**
@@ -58,8 +58,17 @@
Occurrence occ = topic.createOccurrence(type, "tinyTiM");
Occurrence occ2 = topic.createOccurrence(type, "tinyTiM");
assertFalse(occ.getId().equals(occ2.getId()));
- String sig = SignatureGenerator.generateSignature(occ);
- assertEquals(sig, SignatureGenerator.generateSignature(occ2));
+ assertEquals(SignatureGenerator.generateSignature(occ),
+ SignatureGenerator.generateSignature(occ2));
+ int occ1Sig = SignatureGenerator.generateSignature(occ);
+ int occ2Sig = SignatureGenerator.generateSignature(occ2);
+ assertEquals(occ1Sig, occ2Sig);
+ occ.setType(createTopic());
+ int occ1Sig2 = SignatureGenerator.generateSignature(occ);
+ assertFalse(occ1Sig == occ1Sig2);
+ occ2.setType(occ.getType());
+ int occ2Sig2 = SignatureGenerator.generateSignature(occ2);
+ assertEquals(occ1Sig2, occ2Sig2);
}
/**
@@ -71,8 +80,15 @@
Name name = topic.createName("tinyTiM");
Name name2 = topic.createName("tinyTiM");
assertFalse(name.getId().equals(name2.getId()));
- String sig = SignatureGenerator.generateSignature(name);
- assertEquals(sig, SignatureGenerator.generateSignature(name2));
+ int name1Sig = SignatureGenerator.generateSignature(name);
+ int name2Sig = SignatureGenerator.generateSignature(name2);
+ assertEquals(name1Sig, name2Sig);
+ name.setType(createTopic());
+ int name1Sig2 = SignatureGenerator.generateSignature(name);
+ assertFalse(name1Sig == name1Sig2);
+ name2.setType(name.getType());
+ int name2Sig2 = SignatureGenerator.generateSignature(name2);
+ assertEquals(name1Sig2, name2Sig2);
}
/**
@@ -80,11 +96,20 @@
* signature.
*/
public void testVariantBasic() {
- Topic topic = _tm.createTopic();
- Name name = topic.createName("tinyTiM");
- Variant variant = name.createVariant("tiny Topic Maps", _tm.createTopic());
- String sig = SignatureGenerator.generateSignature(variant);
- assertEquals(sig, SignatureGenerator.generateSignature(variant));
+ final Name name = createName();
+ final Topic theme = createTopic();
+ final Topic theme2 = createTopic();
+ Variant variant = name.createVariant("tiny Topic Maps", theme);
+ Variant variant2 = name.createVariant("tiny Topic Maps", theme);
+ int var1Sig = SignatureGenerator.generateSignature(variant);
+ int var2Sig = SignatureGenerator.generateSignature(variant2);
+ assertEquals(var1Sig, var2Sig);
+ variant.addTheme(theme2);
+ int var1Sig2 = SignatureGenerator.generateSignature(variant);
+ assertFalse(var1Sig == var1Sig2);
+ variant2.addTheme(theme2);
+ int var2Sig2 = SignatureGenerator.generateSignature(variant2);
+ assertEquals(var1Sig2, var2Sig2);
}
/**
@@ -94,10 +119,10 @@
Topic type1 = _tm.createTopic();
Topic type2 = _tm.createTopic();
Association assoc = _tm.createAssociation(type1);
- String sigBefore = SignatureGenerator.generateSignature(assoc);
+ int sigBefore = SignatureGenerator.generateSignature(assoc);
assoc.setType(type2);
- String sigAfter = SignatureGenerator.generateSignature(assoc);
- assertFalse(sigBefore.equals(sigAfter));
+ int sigAfter = SignatureGenerator.generateSignature(assoc);
+ assertFalse(sigBefore == sigAfter);
Association assoc2 = _tm.createAssociation(type1);
assertEquals(sigBefore, SignatureGenerator.generateSignature(assoc2));
assoc2.setType(type2);
@@ -112,7 +137,19 @@
Role role2 = assoc.createRole(type, player);
assertEquals(2, player.getRolesPlayed().size());
assertEquals(2, assoc.getRoles().size());
- String sig = SignatureGenerator.generateSignature(role1);
- assertEquals(sig, SignatureGenerator.generateSignature(role2));
+ assertEquals(SignatureGenerator.generateSignature(role1),
+ SignatureGenerator.generateSignature(role2));
}
+
+ public void testRoles2() {
+ Association assoc = createAssociation();
+ Topic type = createTopic();
+ Topic player = createTopic();
+ Role role1 = assoc.createRole(type, player);
+ Role role2 = assoc.createRole(player, type);
+ assertEquals(2, assoc.getRoles().size());
+ int role1Sig = SignatureGenerator.generateSignature(role1);
+ int role2Sig = SignatureGenerator.generateSignature(role2);
+ assertTrue(role1Sig != role2Sig);
+ }
}
Modified: tinytim/trunk/src/test/java/org/tinytim/core/TinyTimTestCase.java
===================================================================
--- tinytim/trunk/src/test/java/org/tinytim/core/TinyTimTestCase.java 2008-08-08 12:10:45 UTC (rev 108)
+++ tinytim/trunk/src/test/java/org/tinytim/core/TinyTimTestCase.java 2008-08-08 14:03:53 UTC (rev 109)
@@ -23,7 +23,13 @@
import java.util.Enumeration;
import java.util.Properties;
+import org.tmapi.core.Association;
import org.tmapi.core.Locator;
+import org.tmapi.core.Name;
+import org.tmapi.core.Occurrence;
+import org.tmapi.core.Role;
+import org.tmapi.core.Topic;
+import org.tmapi.core.Variant;
import junit.framework.TestCase;
@@ -56,6 +62,62 @@
return null;
}
+ /**
+ * 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());
+ }
+
/* (non-Javadoc)
* @see junit.framework.TestCase#setUp()
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
