[pcgen-commit-svn] SF.net SVN: pcgen: [3843] branches/cdom/code/src/itest/plugin/lsttokens/ loader/testsupport/AbstractTokenLoaderTestCase.java

[<van...@us...>]

Revision: 3843
          http://pcgen.svn.sourceforge.net/pcgen/?rev=3843&view=rev
Author:   vandaelek
Date:     2007-08-21 00:33:06 -0700 (Tue, 21 Aug 2007)

Log Message:
-----------
Correct problems with contexts not beeing cleared between runs.
Added test for testing .CLEAR before tokens are parsed. Causes exceptions in EditorContext.
Had to merge some changes from Tom.

Modified Paths:
--------------
    branches/cdom/code/src/itest/plugin/lsttokens/loader/testsupport/AbstractTokenLoaderTestCase.java

Modified: branches/cdom/code/src/itest/plugin/lsttokens/loader/testsupport/AbstractTokenLoaderTestCase.java
===================================================================
--- branches/cdom/code/src/itest/plugin/lsttokens/loader/testsupport/AbstractTokenLoaderTestCase.java	2007-08-21 01:37:35 UTC (rev 3842)
+++ branches/cdom/code/src/itest/plugin/lsttokens/loader/testsupport/AbstractTokenLoaderTestCase.java	2007-08-21 07:33:06 UTC (rev 3843)
@@ -102,38 +102,55 @@
 	public abstract String[] getTestArray();
 
 	/*
-	 * Test the provided testArray in Runtime Context
+	 * Test Clearing the provided testArray in Runtime Context
 	 */
 	public void testTestArrayInRuntimeContext()
 		throws PersistenceLayerException
 	{
-		String[] testData = getTestArray();
-		if (isClearable())
-		{
-			runClearAllTest(testData);
-		}
-		if (isDotClearable())
-		{
-			runClearAllIndexesTest(testData);
-		}
+		runClearAllTest(getTestArray());
 	}
+	
+	/*
+	 * Test clearing the context before adding the testData to ensure that it doesn't 
+	 * get cleared.
+	 */
+	public void testPreClearTestArrayInRuntimeContext() 
+		throws PersistenceLayerException
+	{
+		runPreClearAllTest(getTestArray());
+	}
+	/*
+	 * Try to clear every element in the testarray.
+	 */
+	public void testDotClearTestArrayInRuntimeContext() 
+		throws PersistenceLayerException, URISyntaxException
+	{
+		runClearAllIndexesTest(getTestArray());
+	}
 
 	/*
 	 * Test the provided testArray in Editor Context
 	 */
-	public void testTestArrayInEditorContext() throws PersistenceLayerException
+	public void testClearTestArrayInEditorContext() 
+		throws PersistenceLayerException
 	{
 		context = new EditorLoadContext(new PCGenGraph());
-		String[] testData = getTestArray();
-		if (isClearable())
-		{
-			runClearAllTest(testData);
-		}
-		if (isDotClearable())
-		{
-			runClearAllIndexesTest(testData);
-		}
+		runClearAllTest(getTestArray());
 	}
+	
+	public void testPreClearTestArrayInEditorContext() 
+		throws PersistenceLayerException
+	{
+		context = new EditorLoadContext(new PCGenGraph());
+		runPreClearAllTest(getTestArray());
+	}
+	
+	public void testDotClearTestArrayInEditorContext() 
+		throws PersistenceLayerException, URISyntaxException
+	{
+		context = new EditorLoadContext(new PCGenGraph());
+		runClearAllIndexesTest(getTestArray());
+	}
 
 	protected abstract boolean isClearable();
 
@@ -195,6 +212,9 @@
 
 	public void runClearAllTest(String... str) throws PersistenceLayerException
 	{
+		if (!isClearable()) {
+			return;
+		}
 		for (String s : str)
 		{
 			testParse(context, s);
@@ -204,16 +224,31 @@
 		testCleared(context);
 	}
 
+	public void runPreClearAllTest(String... str) throws PersistenceLayerException
+	{
+		if (!isClearable()) {
+			return;
+		}
+		testParse(context,".CLEAR");
+		for (String s : str) {
+			testParse(context,s);
+		}
+		assertNotNull(getToken().unparse(context, prof));
+	}
+	
 	/*
 	 * Clear each element of the array and test the results
 	 */
-	public void runClearAllIndexesTest(String... str)
-		throws PersistenceLayerException
+	public void runClearAllIndexesTest(String... str) 
+		throws PersistenceLayerException, URISyntaxException
 	{
-		for (int i = 0; i < str.length; i++)
-		{
-			runClearIndexTest(i, str);
+		if (!isDotClearable()) {
+			return;
 		}
+		for (int i = 0; i < str.length; i++) {
+			setUp();
+			runClearIndexTest(i,str);
+		}
 	}
 
 	/*


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.