test/java/util/UUID/UUIDTest.java

rev 5332 : imported patch holder

@@ -56,10 +56,16 @@
 
     private static void randomUUIDTest() throws Exception {
         List list = new LinkedList();
         for (int i=0; i<100; i++) {
             UUID u1 = UUID.randomUUID();
+            if(4 != u1.version()) {
+                throw new Exception("bad version");
+            }
+            if(2 != u1.variant()) {
+                throw new Exception("bad variant");
+            }
             if (list.contains(u1))
                 throw new Exception("random UUID collision very unlikely");
             list.add(u1);
         }
     }

@@ -68,14 +74,20 @@
         Random byteSource = new Random();
         byte[] someBytes = new byte[12];
         List list = new LinkedList();
         for (int i=0; i<100; i++) {
             byteSource.nextBytes(someBytes);
-            UUID test = UUID.nameUUIDFromBytes(someBytes);
-            if (list.contains(test))
+            UUID u1 = UUID.nameUUIDFromBytes(someBytes);
+            if(3 != u1.version()) {
+                throw new Exception("bad version");
+            }
+            if(2 != u1.variant()) {
+                throw new Exception("bad variant");
+            }
+            if (list.contains(u1))
                 throw new Exception("byte UUID collision very unlikely");
-            list.add(test);
+            list.add(u1);
         }
     }
 
     private static void stringTest() throws Exception {
         for (int i=0; i<100; i++) {