merged 1.1 branch into head

[mir.git] / source / mir / storage / store / test / TestStore.java

diff --git a/source/mir/storage/store/test/TestStore.java b/source/mir/storage/store/test/TestStore.java
index 4f01995..7737958 100755 (executable)
--- a/source/mir/storage/store/test/TestStore.java
+++ b/source/mir/storage/store/test/TestStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -18,13 +18,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with  any library licensed under the Apache Software License, 
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library 
- * (or with modified versions of the above that use the same license as the above), 
- * and distribute linked combinations including the two.  You must obey the 
- * GNU General Public License in all respects for all of the code used other than 
- * the above mentioned libraries.  If you modify this file, you may extend this 
- * exception to your version of the file, but you are not obligated to do so.  
+ * the code of this program with  any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two.  You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries.  If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
  * If you do not wish to do so, delete this exception statement from your version.
  */
 package mir.storage.store.test;
@@ -44,64 +42,61 @@ import mir.storage.store.StoreIdentifier;
 
 public class TestStore {
 
-        private static ObjectStore o_store = ObjectStore.getInstance();
+  private static ObjectStore o_store = ObjectStore.getInstance();
 
-        public TestStore() {
+  public TestStore() {
 
-        }
+  }
 
-        public static void main(String[] args) {
-                long startTime = System.currentTimeMillis();
-                System.out.println("Starting testrun on ObjectStore...");
-                TestStore testStore1 = new TestStore();
-                testStore1.startTest();
-                System.out.println("Finished testrun on ObjectStore. ("
-                                + (System.currentTimeMillis() - startTime) + " ms)");
-        }
+  public static void main(String[] args) {
+    long startTime = System.currentTimeMillis();
+    System.out.println("Starting testrun on ObjectStore...");
+    TestStore testStore1 = new TestStore();
+    testStore1.startTest();
+    System.out.println("Finished testrun on ObjectStore. ("
+        + (System.currentTimeMillis() - startTime) + " ms)");
+  }
 
-        public void startTest() {
+  public void startTest() {
 
-                EntityC1 c1 = new EntityC1("1");
-                o_store.add(c1.getStoreIdentifier());
-                EntityC1 c12 = new EntityC1("2");
-                o_store.add(c12.getStoreIdentifier());
+    EntityC1 c1 = new EntityC1("1");
+    o_store.add(c1.getStoreIdentifier());
+    EntityC1 c12 = new EntityC1("2");
+    o_store.add(c12.getStoreIdentifier());
     o_store.add(c12.getStoreIdentifier()); // should not be added as it's there already
 
     EntityC2 c2;
-    for (int i=0; i<20; i++) {
-      c2 = new EntityC2(""+i);
+    for (int i = 0; i < 20; i++) {
+      c2 = new EntityC2("" + i);
       o_store.add(c2.getStoreIdentifier());
     } // should contain only 10
 
-    // test cycle: search in store
+// test cycle: search in store
 
-    StorableObject reference; StoreIdentifier search_sid;
+    StorableObject reference;
+    StoreIdentifier search_sid;
 
-    // search for EntityC1
-    search_sid=new StoreIdentifier(EntityC1.class,"1");
-    reference=o_store.use(search_sid);
-    if (reference==null)
+// search for EntityC1
+    search_sid = new StoreIdentifier(EntityC1.class, "1");
+    reference = o_store.use(search_sid);
+    if (reference == null)
       System.out.println("--- should have found" + search_sid.toString());
 
-    search_sid=new StoreIdentifier(EntityC1.class,"A");
-    reference=o_store.use(search_sid);
-    if (reference!=null)
+    search_sid = new StoreIdentifier(EntityC1.class, "A");
+    reference = o_store.use(search_sid);
+    if (reference != null)
       System.out.println("--- should not have found" + search_sid.toString());
 
-    search_sid=new StoreIdentifier(EntityC3.class,"1");
-    reference=o_store.use(search_sid);
-    if (reference!=null)
+    search_sid = new StoreIdentifier(EntityC3.class, "1");
+    reference = o_store.use(search_sid);
+    if (reference != null)
       System.out.println("--- should not have found" + search_sid.toString());
 
-    // test cycle: invalidation */
-    search_sid=new StoreIdentifier(EntityC1.class,"1");
+// test cycle: invalidation */
+    search_sid = new StoreIdentifier(EntityC1.class, "1");
     o_store.invalidate(search_sid);
 
-                System.out.println(o_store.toString());
-    /** @todo compare values of store and state failed if values are not
-     *  right*/
+    System.out.println(o_store.toString());
 
-
-
-        }
+  }
 }
\ No newline at end of file