[llvm-commits] CVS: llvm-java/test/Programs/SingleSource/UnitTests/Collections.java Collections1.java Collections2.java

[Alkis Evlogimenos]

Changes in directory llvm-java/test/Programs/SingleSource/UnitTests:

Collections.java updated: 1.2 -> 1.3
Collections1.java updated: 1.1 -> 1.2
Collections2.java updated: 1.1 -> 1.2
---
Log message:

Share some code and make sure we are calling methods through the Collection interface

---
Diffs of the changes:  (+15 -17)

 Collections.java  |   14 +++++++++++---
 Collections1.java |    9 ++-------
 Collections2.java |    9 ++-------
 3 files changed, 15 insertions(+), 17 deletions(-)


Index: llvm-java/test/Programs/SingleSource/UnitTests/Collections.java
diff -u llvm-java/test/Programs/SingleSource/UnitTests/Collections.java:1.2 llvm-java/test/Programs/SingleSource/UnitTests/Collections.java:1.3
--- llvm-java/test/Programs/SingleSource/UnitTests/Collections.java:1.2	Tue Jan 25 09:52:48 2005
+++ llvm-java/test/Programs/SingleSource/UnitTests/Collections.java	Tue Jan 25 10:45:11 2005
@@ -2,11 +2,19 @@
 
 public class Collections
 {
+    public static void fillCollectionWithInts(Collection c) {
+        for (int i = 0; i < 10; ++i)
+            c.add(new Integer(i));
+    }
+
+    public static void printIntCollection(Collection c) {
+        for (Iterator i = c.iterator(); i.hasNext(); )
+            Test.println(((Integer)i.next()).intValue());
+    }
+
     public static void main(String[] args) {
         Collection c1 = new TreeSet();
-        for (int i = 0; i < 100; ++i) {
-            c1.add(new Integer(i));
-        }
+        fillCollectionWithInts(c1);
         Collection c2 = new TreeSet(c1);
 
         Test.println(c1.remove(new Integer(5)));


Index: llvm-java/test/Programs/SingleSource/UnitTests/Collections1.java
diff -u llvm-java/test/Programs/SingleSource/UnitTests/Collections1.java:1.1 llvm-java/test/Programs/SingleSource/UnitTests/Collections1.java:1.2
--- llvm-java/test/Programs/SingleSource/UnitTests/Collections1.java:1.1	Tue Jan 25 02:29:20 2005
+++ llvm-java/test/Programs/SingleSource/UnitTests/Collections1.java	Tue Jan 25 10:45:11 2005
@@ -4,12 +4,7 @@
 {
     public static void main(String[] args) {
         Collection c1 = new LinkedList();
-        for (int i = 0; i < 100; ++i) {
-            c1.add(new Integer(i));
-        }
-
-        for (Iterator i = c1.iterator(); i.hasNext(); ) {
-            Test.println(((Integer) i.next()).intValue());
-        }
+        Collections.fillCollectionWithInts(c1);
+        Collections.printIntCollection(c1);
     }
 }


Index: llvm-java/test/Programs/SingleSource/UnitTests/Collections2.java
diff -u llvm-java/test/Programs/SingleSource/UnitTests/Collections2.java:1.1 llvm-java/test/Programs/SingleSource/UnitTests/Collections2.java:1.2
--- llvm-java/test/Programs/SingleSource/UnitTests/Collections2.java:1.1	Tue Jan 25 02:29:20 2005
+++ llvm-java/test/Programs/SingleSource/UnitTests/Collections2.java	Tue Jan 25 10:45:11 2005
@@ -4,12 +4,7 @@
 {
     public static void main(String[] args) {
         Collection c1 = new TreeSet();
-        for (int i = 0; i < 100; ++i) {
-            c1.add(new Integer(i));
-        }
-
-        for (Iterator i = c1.iterator(); i.hasNext(); ) {
-            Test.println(((Integer) i.next()).intValue());
-        }
+        Collections.fillCollectionWithInts(c1);
+        Collections.printIntCollection(c1);
     }
 }