[Cdk-commits] CVS: cdk-taverna/src/org/openscience/applications/test/taverna TavernaTestData.java,1.5,1.6

[thomaskuhn <tho...@us...>]

Update of /cvsroot/cdk/cdk-taverna/src/org/openscience/applications/test/taverna
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9621/src/org/openscience/applications/test/taverna

Modified Files:
	TavernaTestData.java 
Log Message:
Change the calling of two methods. This causes a bug. And changes the writing of the test smiles

Index: TavernaTestData.java
===================================================================
RCS file: /cvsroot/cdk/cdk-taverna/src/org/openscience/applications/test/taverna/TavernaTestData.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TavernaTestData.java	15 Mar 2006 10:40:39 -0000	1.5
+++ TavernaTestData.java	21 Mar 2006 14:31:52 -0000	1.6
@@ -90,16 +90,16 @@
 	 * @throws Exception
 	 */
 	public static void loadDefaultDataForTests() throws Exception {
-		createTestData();
 		pathToWriteInUnitTestFiles = "Data" + File.separator + "UnitTest";
+		createTestData();
 	}
 	/**
 	 * Loads the default data for the junit-tests
 	 * @throws Exception
 	 */
 	private static void createTestData() throws Exception{
-		String[] smiles = new String[] {"CC", "CCO", "COCCC0", "C1=CC=CC=C1", "C=C=C",
-			"C=CC1=CC=CC=C1CC=CCO", "C=CCOCCN", "CCCCCCCCCCCCCCC", "OCC=CCO", "NCCCCN"};
+		String[] smiles = new String[] {"CC", "OCC", "O(C)CCC", "c1ccccc1", "C(=C)=C",
+				"OCC=CCc1ccccc1(C=C)", "O(CC=C)CCN", "CCCCCCCCCCCCCCC", "OCC=CCO", "NCCCCN"};
 		SmilesParser sp = new SmilesParser();
 		atomContainer = new IAtomContainer[smiles.length];
 		cmlChemFile = new CMLChemFile[smiles.length];