weaver      2004/07/06 07:29:40

  Modified:    portal/src/test/org/apache/jetspeed/deployment
                        TestSimpleDeployment.java
  Log:
  Added explicit calls to remove deployment artifact files from the cache.
  
  Revision  Changes    Path
  1.11      +8 -6      
jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/deployment/TestSimpleDeployment.java
  
  Index: TestSimpleDeployment.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/deployment/TestSimpleDeployment.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- TestSimpleDeployment.java 2 Jul 2004 14:39:05 -0000       1.10
  +++ TestSimpleDeployment.java 6 Jul 2004 14:29:40 -0000       1.11
  @@ -120,8 +120,8 @@
           // assertEquals("org.apache.commons.vfs.provider.jar.JarFileSystem", 
testObj.getFileSystem().getClass().getName());
           FileObject webXml = testObj.resolveFile("WEB-INF/web.xml");
           assertNotNull(webXml);
  -        assertNotNull(webXml.getContent().getInputStream());       
  -        
  +        assertNotNull(webXml.getContent().getInputStream());
  +        fsManager.getFilesCache().close();        
       }
       
       public void testFileSystemManagerForJars() throws Exception
  @@ -129,7 +129,7 @@
           File demoApp = new File(deploySrc, "portletstd.jar");
           FileObject testObj = 
fsManager.createFileSystem(fsManager.toFileObject(demoApp));
           assertEquals("org.apache.commons.vfs.provider.jar.JarFileSystem", 
testObj.getFileSystem().getClass().getName());
  -        
  +        fsManager.getFilesCache().close();
       }
   
       public void testDeploy() throws Exception
  @@ -286,7 +286,9 @@
           fsManager.getFilesCache().clear(deploySrcObj.getFileSystem());
           deploySrcObj.copyFrom(copyFromObj, new AllFileSelector());
           copyFromObj.close();
  -        deploySrcObj.close();
  +        deploySrcObj.close();  
  +        fsManager.getFilesCache().removeFile(deploySrcObj.getFileSystem(), 
deploySrcObj.getName());
  +        fsManager.getFilesCache().removeFile(copyFromObj.getFileSystem(), 
copyFromObj.getName());
       }
   
       /**
  @@ -321,7 +323,7 @@
           }
   
           DirectoryUtils.rmdir(new File("./target/deployment"));
  -
  +        fsManager.getFilesCache().close();
           super.tearDown();
   
       }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to