[jboss-cvs] JBossAS SVN: r66763 - projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2007-11-06 07:56:34 -0500 (Tue, 06 Nov 2007)
New Revision: 66763

Modified:
   projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/JARCacheUnitTestCase.java
   projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/URLExistsUnitTestCase.java
Log:
Initial File.delete fix on Winz.

Modified: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/JARCacheUnitTestCase.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/JARCacheUnitTestCase.java	2007-11-06 10:59:16 UTC (rev 66762)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/JARCacheUnitTestCase.java	2007-11-06 12:56:34 UTC (rev 66763)
@@ -24,6 +24,7 @@
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.InputStream;
 import java.util.jar.Attributes;
 import java.util.jar.JarFile;
 import java.util.jar.JarOutputStream;
@@ -40,7 +41,7 @@
  * Test the caching strategy of VFS with jar files.
  *
  * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
+ * @version $Revision$
  */
 public class JARCacheUnitTestCase extends BaseTestCase
 {
@@ -52,7 +53,7 @@
    public void test1() throws Exception
    {
       // Create a test.jar with v1 in manifest
-      File testFile = new File("test.jar");
+      File testFile = File.createTempFile("test", ".jar");
       {
          Manifest manifest = new Manifest();
          manifest.getMainAttributes().putValue(Attributes.Name.MANIFEST_VERSION.toString(), "1");

Modified: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/URLExistsUnitTestCase.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/URLExistsUnitTestCase.java	2007-11-06 10:59:16 UTC (rev 66762)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/URLExistsUnitTestCase.java	2007-11-06 12:56:34 UTC (rev 66763)
@@ -23,12 +23,14 @@
 
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.net.JarURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.jar.JarOutputStream;
 import java.util.jar.Manifest;
 
-import junit.framework.TestCase;
+import org.jboss.test.BaseTestCase;
 
 /**
  * Basic tests of URL existence based on URLConnection.getLastModified
@@ -36,8 +38,13 @@
  * @author Scott.Stark at jboss.org
  * @version $Revision$
  */
-public class URLExistsUnitTestCase extends TestCase
+public class URLExistsUnitTestCase extends BaseTestCase
 {
+   public URLExistsUnitTestCase(String name)
+   {
+      super(name);
+   }
+
    /**
     * Test file deletion can be detected via URLConnection.getLastModified == 0.
     * @throws Exception
@@ -48,9 +55,18 @@
       File tmp = File.createTempFile("testFileURLs", null);
       URL tmpURL = tmp.toURL();
       URLConnection conn = tmpURL.openConnection();
-      long lastModified = conn.getLastModified();
-      System.out.println("lastModified, "+lastModified);
-      assertNotSame("lastModified", 0, lastModified);
+      InputStream in = conn.getInputStream();
+      long lastModified;
+      try
+      {
+         lastModified = conn.getLastModified();
+         System.out.println("lastModified, "+lastModified);
+         assertNotSame("lastModified", 0, lastModified);
+      }
+      finally
+      {
+         in.close();
+      }
       assertTrue(tmp.getAbsolutePath()+" deleted", tmp.delete());
       conn = tmpURL.openConnection();
       lastModified = conn.getLastModified();