Author: rdonkin
Date: Mon Sep 1 11:44:36 2008
New Revision: 691028
URL: http://svn.apache.org/viewvc?rev=691028&view=rev
Log:
Switch TestManager from singleton into configuration. JSIEVE-32
Modified:
james/jsieve/trunk/src/main/java/org/apache/jsieve/ConfigurationManager.java
james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveFactory.java
james/jsieve/trunk/src/main/java/org/apache/jsieve/TestManager.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/SieveParserVisitorImplQuoteTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressParseTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AllOfTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AnyOfTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/BodyTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ConditionTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/DiscardTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/EnvelopeTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ExistsTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FalseTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FileIntoTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/HeaderTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/KeepTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/LogTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/NotTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RejectTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireMissingTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/SizeTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/StopTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/TrueTest.java
Modified:
james/jsieve/trunk/src/main/java/org/apache/jsieve/ConfigurationManager.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/ConfigurationManager.java?rev=691028&r1=691027&r2=691028&view=diff
==============================================================================
---
james/jsieve/trunk/src/main/java/org/apache/jsieve/ConfigurationManager.java
(original)
+++
james/jsieve/trunk/src/main/java/org/apache/jsieve/ConfigurationManager.java
Mon Sep 1 11:44:36 2008
@@ -284,4 +284,8 @@
public CommandManager getCommandManager() {
return new CommandManager(fieldCommandMap);
}
+
+ public TestManager getTestManager() {
+ return new TestManager(fieldTestMap);
+ }
}
Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveFactory.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveFactory.java?rev=691028&r1=691027&r2=691028&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveFactory.java
(original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveFactory.java Mon
Sep 1 11:44:36 2008
@@ -86,7 +86,7 @@
try {
final SimpleNode node = new SieveParser(inputStream,
"UTF-8").start();
final CommandManager commandManager =
ConfigurationManager.getInstance().getCommandManager();
- final TestManager testManager = TestManager.getInstance();
+ final TestManager testManager =
ConfigurationManager.getInstance().getTestManager();
SieveValidationVisitor visitor = new
SieveValidationVisitor(commandManager, testManager);
node.jjtAccept(visitor, null);
return node;
@@ -131,7 +131,7 @@
throws SieveException {
final CommandManager commandManager =
ConfigurationManager.getInstance().getCommandManager();
final ComparatorManager comparatorManager =
ConfigurationManager.getInstance().getComparatorManager();
- final TestManager testManager = TestManager.getInstance();
+ final TestManager testManager =
ConfigurationManager.getInstance().getTestManager();
final Log log = ConfigurationManager.log;
SieveContext context = new BaseSieveContext(commandManager,
comparatorManager, testManager, log);
SieveParserVisitor visitor = new SieveParserVisitorImpl(context);
Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/TestManager.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/TestManager.java?rev=691028&r1=691027&r2=691028&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/TestManager.java
(original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/TestManager.java Mon Sep
1 11:44:36 2008
@@ -29,73 +29,15 @@
* implementation classes.
*/
public class TestManager {
- /**
- * The sole instance of the receiver.
- */
- static private TestManager fieldInstance;
+ private final Map classNameMap;
+
/**
* TestManager is instanciated with getInstance
*/
- private TestManager() {
+ public TestManager(final Map classNameMap) {
super();
- }
-
- /**
- * Returns the sole instance of the reciever, lazily initialised if
- * required.
- *
- * @return CommandManager
- */
- public static TestManager getInstance() {
- TestManager current = null;
- if (null == (current = getInstanceBasic())) {
- updateInstance();
- return getInstance();
- }
- return current;
- }
-
- /**
- * Returns the sole instance of the reciever.
- *
- * @return CommandManager
- */
- private static TestManager getInstanceBasic() {
- return fieldInstance;
- }
-
- /**
- * Computes a new instance of the receiver.
- *
- * @return CommandManager
- */
- protected static TestManager computeInstance() {
- return new TestManager();
- }
-
- /**
- * Sets the sole instance of the reciever.
- *
- * @param instance
- * The instance to set
- */
- protected static void setInstance(TestManager instance) {
- fieldInstance = instance;
- }
-
- /**
- * Resets the sole instance of the reciever.
- */
- public static void resetInstance() {
- setInstance(null);
- }
-
- /**
- * Updates the sole instance of the reciever.
- */
- protected static void updateInstance() {
- setInstance(computeInstance());
+ this.classNameMap = classNameMap;
}
/**
@@ -176,7 +118,7 @@
* @throws SieveConfigurationException
*/
protected Map getClassNameMap() throws SieveConfigurationException {
- return ConfigurationManager.getInstance().getTestMap();
+ return classNameMap;
}
}
Modified:
james/jsieve/trunk/src/test/java/org/apache/jsieve/SieveParserVisitorImplQuoteTest.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/SieveParserVisitorImplQuoteTest.java?rev=691028&r1=691027&r2=691028&view=diff
==============================================================================
---
james/jsieve/trunk/src/test/java/org/apache/jsieve/SieveParserVisitorImplQuoteTest.java
(original)
+++
james/jsieve/trunk/src/test/java/org/apache/jsieve/SieveParserVisitorImplQuoteTest.java
Mon Sep 1 11:44:36 2008
@@ -36,7 +36,7 @@
protected void setUp() throws Exception {
super.setUp();
visitor = new SieveParserVisitorImpl(new
BaseSieveContext(ConfigurationManager.getInstance().getCommandManager(),
ConfigurationManager.getInstance().getComparatorManager(),
- TestManager.getInstance(),
LogFactory.getLog(SieveParserVisitorImplQuoteTest.class)));
+ ConfigurationManager.getInstance().getTestManager(),
LogFactory.getLog(SieveParserVisitorImplQuoteTest.class)));
data = new ArrayList();
node = new ASTstring(100);
}
Modified:
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressParseTest.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressParseTest.java?rev=691028&r1=691027&r2=691028&view=diff
==============================================================================
---
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressParseTest.java
(original)
+++
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressParseTest.java
Mon Sep 1 11:44:36 2008
@@ -24,7 +24,6 @@
import org.apache.commons.logging.LogFactory;
import org.apache.jsieve.BaseSieveContext;
import org.apache.jsieve.ConfigurationManager;
-import org.apache.jsieve.TestManager;
import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.junit.utils.SieveMailAdapter;
@@ -42,7 +41,7 @@
protected void setUp() throws Exception {
super.setUp();
context = new
BaseSieveContext(ConfigurationManager.getInstance().getCommandManager(),
ConfigurationManager.getInstance().getComparatorManager(),
- TestManager.getInstance(),
+ ConfigurationManager.getInstance().getTestManager(),
LogFactory.getLog(AddressParseTest.class));
mail = (SieveMailAdapter) JUnitUtils.createMail();
address = new OpenedAddress();
Modified:
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressTest.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressTest.java?rev=691028&r1=691027&r2=691028&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressTest.java
Mon Sep 1 11:44:36 2008
@@ -54,7 +54,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- TestManager.resetInstance();
}
/**
Modified:
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AllOfTest.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AllOfTest.java?rev=691028&r1=691027&r2=691028&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AllOfTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AllOfTest.java Mon
Sep 1 11:44:36 2008
@@ -52,7 +52,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- TestManager.resetInstance();
}
/**
Modified:
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AnyOfTest.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AnyOfTest.java?rev=691028&r1=691027&r2=691028&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AnyOfTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AnyOfTest.java Mon
Sep 1 11:44:36 2008
@@ -52,7 +52,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- TestManager.resetInstance();
}
/**
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/BodyTest.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/BodyTest.java?rev=691028&r1=691027&r2=691028&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/BodyTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/BodyTest.java Mon
Sep 1 11:44:36 2008
@@ -55,7 +55,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- TestManager.resetInstance();
}
/**
Modified:
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ConditionTest.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ConditionTest.java?rev=691028&r1=691027&r2=691028&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ConditionTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ConditionTest.java
Mon Sep 1 11:44:36 2008
@@ -54,7 +54,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- TestManager.resetInstance();
}
/**
Modified:
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/DiscardTest.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/DiscardTest.java?rev=691028&r1=691027&r2=691028&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/DiscardTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/DiscardTest.java
Mon Sep 1 11:44:36 2008
@@ -52,7 +52,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- TestManager.resetInstance();
}
/**
Modified:
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/EnvelopeTest.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/EnvelopeTest.java?rev=691028&r1=691027&r2=691028&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/EnvelopeTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/EnvelopeTest.java
Mon Sep 1 11:44:36 2008
@@ -52,7 +52,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- TestManager.resetInstance();
}
/**
Modified:
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ExistsTest.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ExistsTest.java?rev=691028&r1=691027&r2=691028&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ExistsTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ExistsTest.java
Mon Sep 1 11:44:36 2008
@@ -55,7 +55,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- TestManager.resetInstance();
}
/**
Modified:
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FalseTest.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FalseTest.java?rev=691028&r1=691027&r2=691028&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FalseTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FalseTest.java Mon
Sep 1 11:44:36 2008
@@ -52,7 +52,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- TestManager.resetInstance();
}
/**
Modified:
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FileIntoTest.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FileIntoTest.java?rev=691028&r1=691027&r2=691028&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FileIntoTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FileIntoTest.java
Mon Sep 1 11:44:36 2008
@@ -53,7 +53,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- TestManager.resetInstance();
}
/**
Modified:
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/HeaderTest.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/HeaderTest.java?rev=691028&r1=691027&r2=691028&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/HeaderTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/HeaderTest.java
Mon Sep 1 11:44:36 2008
@@ -54,7 +54,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- TestManager.resetInstance();
}
/**
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/KeepTest.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/KeepTest.java?rev=691028&r1=691027&r2=691028&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/KeepTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/KeepTest.java Mon
Sep 1 11:44:36 2008
@@ -53,7 +53,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- TestManager.resetInstance();
}
/**
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/LogTest.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/LogTest.java?rev=691028&r1=691027&r2=691028&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/LogTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/LogTest.java Mon
Sep 1 11:44:36 2008
@@ -50,7 +50,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- TestManager.resetInstance();
}
/**
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/NotTest.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/NotTest.java?rev=691028&r1=691027&r2=691028&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/NotTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/NotTest.java Mon
Sep 1 11:44:36 2008
@@ -52,7 +52,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- TestManager.resetInstance();
}
/**
Modified:
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RejectTest.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RejectTest.java?rev=691028&r1=691027&r2=691028&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RejectTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RejectTest.java
Mon Sep 1 11:44:36 2008
@@ -54,7 +54,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- TestManager.resetInstance();
}
/**
Modified:
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireMissingTest.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireMissingTest.java?rev=691028&r1=691027&r2=691028&view=diff
==============================================================================
---
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireMissingTest.java
(original)
+++
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireMissingTest.java
Mon Sep 1 11:44:36 2008
@@ -37,7 +37,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- TestManager.resetInstance();
}
/**
Modified:
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireTest.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireTest.java?rev=691028&r1=691027&r2=691028&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireTest.java
Mon Sep 1 11:44:36 2008
@@ -51,7 +51,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- TestManager.resetInstance();
}
/**
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/SizeTest.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/SizeTest.java?rev=691028&r1=691027&r2=691028&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/SizeTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/SizeTest.java Mon
Sep 1 11:44:36 2008
@@ -55,7 +55,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- TestManager.resetInstance();
}
/**
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/StopTest.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/StopTest.java?rev=691028&r1=691027&r2=691028&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/StopTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/StopTest.java Mon
Sep 1 11:44:36 2008
@@ -54,7 +54,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- TestManager.resetInstance();
}
/**
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/TrueTest.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/TrueTest.java?rev=691028&r1=691027&r2=691028&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/TrueTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/TrueTest.java Mon
Sep 1 11:44:36 2008
@@ -52,7 +52,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- TestManager.resetInstance();
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
