Author: andy
Date: Tue May 27 21:13:42 2014
New Revision: 1597883
URL: http://svn.apache.org/r1597883
Log:
Clean UUID testing.
Modified:
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/shared/uuid/UUID_V4_Gen.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/shared/uuid/TestUUID.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/shared/uuid/TestUUID_JRE.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/shared/uuid/UUIDTestSuite.java
Modified:
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/shared/uuid/UUID_V4_Gen.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/shared/uuid/UUID_V4_Gen.java?rev=1597883&r1=1597882&r2=1597883&view=diff
==============================================================================
---
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/shared/uuid/UUID_V4_Gen.java
(original)
+++
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/shared/uuid/UUID_V4_Gen.java
Tue May 27 21:13:42 2014
@@ -32,7 +32,7 @@ public class UUID_V4_Gen implements UUID
static final int versionHere = 4 ; // Version 4: random number
static final int variantHere = JenaUUID.Var_Std ;
- Random random = null ;
+ private Random random = null ;
public UUID_V4_Gen() {}
Modified:
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/shared/uuid/TestUUID.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/shared/uuid/TestUUID.java?rev=1597883&r1=1597882&r2=1597883&view=diff
==============================================================================
---
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/shared/uuid/TestUUID.java
(original)
+++
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/shared/uuid/TestUUID.java
Tue May 27 21:13:42 2014
@@ -19,10 +19,10 @@
package com.hp.hpl.jena.shared.uuid;
import junit.framework.TestCase;
+import static com.hp.hpl.jena.shared.uuid.UUIDTestSuite.* ;
public class TestUUID extends TestCase
{
-
public void testNilUUID1()
{
JenaUUID u = JenaUUID.nil();
@@ -59,7 +59,7 @@ public class TestUUID extends TestCase
public void testTime3()
{
- UUID_V1 u1 = new UUID_V1_Gen().generateV1() ;
+ UUID_V1 u1 = factory1.generateV1() ;
UUID_V1 u2 = UUID_V1_Gen.generate(u1.getVersion(), u1.getVariant(),
u1.getTimestamp(), u1.getClockSequence(), u1.getNode()) ;
assertEquals(u1.getVersion(), u2.getVersion() ) ;
@@ -71,7 +71,7 @@ public class TestUUID extends TestCase
public void testTime4()
{
- UUID_V1 u1 = new UUID_V1_Gen().generateV1() ;
+ UUID_V1 u1 = factory1.generateV1() ;
UUID_V1 u2 = UUID_V1_Gen.generate(u1.getVersion(), u1.getVariant(),
u1.getTimestamp(), u1.getClockSequence(), u1.getNode()) ;
assertEquals(u1, u2) ;
assertEquals(u1.asString(), u2.asString()) ;
@@ -80,7 +80,7 @@ public class TestUUID extends TestCase
public void testTime5()
{
- UUID_V1 u1 = new UUID_V1_Gen().generateV1() ;
+ UUID_V1 u1 = factory1.generateV1() ;
UUID_V1 u2 = UUID_V1_Gen.generate(u1.getVersion(), u1.getVariant(),
u1.getTimestamp(), u1.getClockSequence(), u1.getNode()) ;
assertEquals(u1.asString(), u2.asString()) ;
}
@@ -92,11 +92,9 @@ public class TestUUID extends TestCase
assertFalse(u1.equals(u2)) ;
}
- UUIDFactory randomFactory = new UUID_V4_Gen() ;
-
public void testRandom1()
{
- JenaUUID u = randomFactory.generate() ;
+ JenaUUID u = factory4.generate() ;
assertEquals(u.getVersion(), UUID_V4.version) ;
assertEquals(u.getVariant(), UUID_V4.variant) ;
}
@@ -104,20 +102,20 @@ public class TestUUID extends TestCase
public void testRandom2()
{
- JenaUUID u = randomFactory.generate() ;
+ JenaUUID u = factory4.generate() ;
check(u) ;
}
public void testRandom3()
{
- JenaUUID u = randomFactory.generate() ;
+ JenaUUID u = factory4.generate() ;
check(u.asString()) ;
}
public void testRandom4()
{
- JenaUUID u1 = randomFactory.generate() ;
- JenaUUID u2 = randomFactory.generate() ;
+ JenaUUID u1 = factory4.generate() ;
+ JenaUUID u2 = factory4.generate() ;
assertFalse(u1.equals(u2)) ;
}
@@ -136,11 +134,11 @@ public class TestUUID extends TestCase
public void testEquals2()
{
- JenaUUID u1 = randomFactory.generate() ;
+ JenaUUID u1 = factory4.generate() ;
JenaUUID u2 = JenaUUID.parse(u1.asString()) ;
assertNotSame(u1, u2) ;
assertEquals(u1, u2) ;
- JenaUUID u3 = randomFactory.generate() ;
+ JenaUUID u3 = factory4.generate() ;
assertFalse(u1.equals(u3)) ;
assertFalse(u3.equals(u1)) ;
assertFalse(u2.equals(u3)) ;
@@ -160,7 +158,7 @@ public class TestUUID extends TestCase
public void testHash2()
{
- JenaUUID u1 = randomFactory.generate() ;
+ JenaUUID u1 = factory4.generate() ;
JenaUUID u2 = JenaUUID.parse(u1.asString()) ;
assertNotSame(u1, u2) ;
assertEquals(u1.hashCode(), u2.hashCode()) ;
Modified:
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/shared/uuid/TestUUID_JRE.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/shared/uuid/TestUUID_JRE.java?rev=1597883&r1=1597882&r2=1597883&view=diff
==============================================================================
---
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/shared/uuid/TestUUID_JRE.java
(original)
+++
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/shared/uuid/TestUUID_JRE.java
Tue May 27 21:13:42 2014
@@ -18,6 +18,9 @@
package com.hp.hpl.jena.shared.uuid;
+import static com.hp.hpl.jena.shared.uuid.UUIDTestSuite.factory1 ;
+import static com.hp.hpl.jena.shared.uuid.UUIDTestSuite.factory4 ;
+
import java.util.UUID ;
import junit.framework.TestCase ;
@@ -26,9 +29,6 @@ import junit.framework.TestCase ;
public class TestUUID_JRE extends TestCase
{
- UUID_V1_Gen factory1 = new UUID_V1_Gen() ;
- UUID_V4_Gen factory4 = new UUID_V4_Gen() ;
-
public void testU5_1()
{
JenaUUID u1 = JenaUUID.generate() ;
Modified:
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/shared/uuid/UUIDTestSuite.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/shared/uuid/UUIDTestSuite.java?rev=1597883&r1=1597882&r2=1597883&view=diff
==============================================================================
---
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/shared/uuid/UUIDTestSuite.java
(original)
+++
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/shared/uuid/UUIDTestSuite.java
Tue May 27 21:13:42 2014
@@ -22,6 +22,9 @@ import junit.framework.TestSuite;
public class UUIDTestSuite extends TestSuite
{
+ static UUID_V4_Gen factory4 = new UUID_V4_Gen() ;
+ static UUID_V1_Gen factory1 = new UUID_V1_Gen() ;
+
static public TestSuite suite() {
return new UUIDTestSuite();
}
