[Exist-commits] eXist-1.0/src/org/exist/xmldb/test CreateCollectionsTest.java,1.6,1.7

[Jean-Marc V. <jm...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/xmldb/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13344/src/org/exist/xmldb/test

Modified Files:
	CreateCollectionsTest.java 
Log Message:
This test was unable to pass a second time without manually erasing the DB.

Index: CreateCollectionsTest.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xmldb/test/CreateCollectionsTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CreateCollectionsTest.java	2 Oct 2003 12:20:20 -0000	1.6
--- CreateCollectionsTest.java	9 Jul 2004 08:31:40 -0000	1.7
***************
*** 3,7 ****
--- 3,11 ----
  import java.io.File;
  import java.io.IOException;
+ import java.util.ArrayList;
+ import java.util.Arrays;
+ import java.util.Collections;
  import java.util.HashSet;
+ import java.util.Iterator;
  
  import junit.framework.TestCase;
***************
*** 87,119 ****
  				testCollection.isOpen());
  
  			System.out.println("---------------------------------------");
! 			System.out.println("storing files ...");
  			System.out.println("---------------------------------------");
! 			File f = new File("samples/shakespeare");
  			File files[] = f.listFiles(new XMLFilenameFilter());
  
  			for (int i = 0; i < files.length; i++) {
- 				// XMLResource storeResourceFromFile(File f, Collection col)
  				storeResourceFromFile(files[i], testCollection);
  			}
  
! 			HashSet fileNames = new HashSet();
  			for (int i = 0; i < files.length; i++) {
  				String file = files[i].toString();
  				int lastSeparator = file.lastIndexOf(File.separatorChar);
! 				fileNames.add(file.substring(lastSeparator + 1));
  			}
! 			System.out.println("fileNames: " + fileNames.toString());
  
  			String[] resourcesNames = testCollection.listResources();
  			int resourceCount = testCollection.getResourceCount();
! 			System.out.println(
! 				"testCollection.getResourceCount()=" + resourceCount);
! 			for (int i = 0; i < resourceCount; i++) {
! 				System.out.println("resourcesNames[i]=" + resourcesNames[i]);
! 				assertTrue(
! 					"resourcesNames must contain fileNames just stored",
! 					fileNames.contains(resourcesNames[i]));
  			}
  
  			String fileToRemove = "macbeth.xml";
--- 91,123 ----
  				testCollection.isOpen());
  
+ 			String directory = "samples/shakespeare";
  			System.out.println("---------------------------------------");
! 			System.out.println("storing all XML files in directory " +directory+"...");
  			System.out.println("---------------------------------------");
! 			File f = new File(directory);
  			File files[] = f.listFiles(new XMLFilenameFilter());
  
  			for (int i = 0; i < files.length; i++) {
  				storeResourceFromFile(files[i], testCollection);
  			}
  
! 			HashSet fileNamesJustStored = new HashSet();
  			for (int i = 0; i < files.length; i++) {
  				String file = files[i].toString();
  				int lastSeparator = file.lastIndexOf(File.separatorChar);
! 				fileNamesJustStored.add(file.substring(lastSeparator + 1));
  			}
! 			System.out.println("fileNames stored: " + fileNamesJustStored.toString());
  
  			String[] resourcesNames = testCollection.listResources();
  			int resourceCount = testCollection.getResourceCount();
! 			System.out.println(  "testCollection.getResourceCount()=" + resourceCount);
! 
! 			ArrayList fileNamesPresentInDatabase = new ArrayList();
! 			for (int i = 0; i < resourcesNames.length; i++) {
! 				fileNamesPresentInDatabase.add( resourcesNames[i]);
  			}
+ 			assertTrue( "resourcesNames must contain fileNames just stored",
+ 					fileNamesPresentInDatabase. containsAll( fileNamesJustStored) );
  
  			String fileToRemove = "macbeth.xml";
***************
*** 127,131 ****
  			storeResourceFromFile(
  				new File(
! 					"samples/shakespeare" + File.separatorChar + fileToRemove),
  				testCollection);
  
--- 131,135 ----
  			storeResourceFromFile(
  				new File(
! 					directory + File.separatorChar + fileToRemove),
  				testCollection);