updated test cases for spring 2006 schema, and major debug of locking system

[vamsas.git] / src / org / vamsas / test / simpleclient / VamsasArchive.java

diff --git a/src/org/vamsas/test/simpleclient/VamsasArchive.java b/src/org/vamsas/test/simpleclient/VamsasArchive.java
index 354f9af..09ddf34 100644 (file)
--- a/src/org/vamsas/test/simpleclient/VamsasArchive.java
+++ b/src/org/vamsas/test/simpleclient/VamsasArchive.java
@@ -79,7 +79,7 @@ public class VamsasArchive {
     apuser.setDataReference(appdata_ref);
     appdata.addUser(apuser);
     appdata.setVersion("noggin");
-    appdata.setUrn("program:/the.nog/");
+    //TODO: write instance appdata  appdata.setUrn("program:/the.nog/");
     try {
       ObjectOutputStream ost = new ObjectOutputStream(va.getAppDataStream(appdata_ref));
       ost.writeObject(appdata);
@@ -125,12 +125,18 @@ public class VamsasArchive {
         }
         while (newf.exists()); 
       } */
+      if (newf.exists()) {
+        log.info("Removing existing "+newf);
+        newf.delete();
+      }
+        
       log.info("Now writing new Archive into "+newf.getAbsolutePath());
       org.vamsas.client.simpleclient.VamsasArchive va=null;
       { // hold lock over deletion and write of new archive.
-        Lock wlock = sfile.getLock();
-        newf.delete(); // clear out old file.
-        va = new org.vamsas.client.simpleclient.VamsasArchive(newf, true, wlock);
+        //Lock wlock = sfile.getLock();
+        //newf.delete(); // clear out old file.
+        sfile.getLock();
+        va = new org.vamsas.client.simpleclient.VamsasArchive(newf, true, true, sfile);
         // open another and...
         ApplicationData appdata = makeDemoAppdata(va, 
             "org.vamsas.test.simpleclient.VamsasArchive", "arnold Bugger esq", "disOrganised");
@@ -146,9 +152,11 @@ public class VamsasArchive {
       {
         Lock lock=sfile.getLock();
         if (lock==null)
-          while ((lock=sfile.getLock())!=null)
+          while ((lock=sfile.getLock())==null) {
             log.info("Waiting for lock.");
-        VamsasArchiveReader vreader = new VamsasArchiveReader(newf);
+            Thread.sleep(100);
+          }
+        VamsasArchiveReader vreader = new VamsasArchiveReader(sfile.getVamsasFile());// lock); // cannot do new JarFile on a locked file. // newf);
         SimpleDocument sdoc = new SimpleDocument("testing new vamsas write");
         ArchiveReports.reportDocument(sdoc.getVamsasDocument(vreader), vreader, true, System.out);
         sfile.unLock();
@@ -160,9 +168,9 @@ public class VamsasArchive {
         log.info("Successfully cancelled.");
       else
         log.info("Didn't cancel.");
-      
+      long t=System.currentTimeMillis()+200; while (t>System.currentTimeMillis());
       log.info("Now testing archive update.");
-      va = new org.vamsas.client.simpleclient.VamsasArchive(newf, true);
+      va = new org.vamsas.client.simpleclient.VamsasArchive(newf, false, true, sfile);
       doc = va.getVamsasDocument();
       doc.addVAMSAS(Core.getDemoVamsas());
       doc.addApplicationData(makeDemoAppdata(va, 
@@ -173,17 +181,22 @@ public class VamsasArchive {
         log.warn("No appdatas were transferred. This is wrong.");
       va.putVamsasDocument(doc);
       va.closeArchive();
+      sfile.unLock();
       log.info("Testing update: ");
       {
         Lock lock=sfile.getLock();
         if (lock==null)
-          while ((lock=sfile.getLock())!=null)
+          while ((lock=sfile.getLock())==null)
             log.info("Waiting for lock.");
+        // VamsasArchiveReader vreader = new VamsasArchiveReader(lock);
         VamsasArchiveReader vreader = new VamsasArchiveReader(newf);
+        
         SimpleDocument sdoc = new SimpleDocument("testing vamsas update");
-        ArchiveReports.reportDocument(sdoc.getVamsasDocument(vreader), vreader, true, System.out);
-        lock.release();
-        lock = null;
+        VamsasDocument finaldoc = sdoc.getVamsasDocument(vreader);
+        if (finaldoc!=null)
+          ArchiveReports.reportDocument(finaldoc, vreader, true, System.out);
+        else 
+          log.error("Null Document Read from "+newf);
       }
     } catch (Exception e) {
       e.printStackTrace(System.err);