Author: sdeboy
Date: Fri Jun 6 21:37:25 2008
New Revision: 664279
URL: http://svn.apache.org/viewvc?rev=664279&view=rev
Log:
Add tests to ensure CompositeTriggeringPolicy.activateOptions calls
activateOptions on each of the TriggeringPolicies, but that it's not called by
addTriggeringPolicy (seems to be the convention in the code I looked at).
Modified:
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/rolling/CompositeTriggeringPolicyTest.java
Modified:
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/rolling/CompositeTriggeringPolicyTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/rolling/CompositeTriggeringPolicyTest.java?rev=664279&r1=664278&r2=664279&view=diff
==============================================================================
---
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/rolling/CompositeTriggeringPolicyTest.java
(original)
+++
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/rolling/CompositeTriggeringPolicyTest.java
Fri Jun 6 21:37:25 2008
@@ -87,20 +87,48 @@
Assert.assertTrue(composite.isTriggeringEvent(appender, event, "file",
100));
}
+ public void testActivateOptionsCalledByCompositeActivateOptions() {
+ TestTriggeringPolicy policy1 = new TestTriggeringPolicy(true);
+ TestTriggeringPolicy policy2 = new TestTriggeringPolicy(true);
+
+ composite.addTriggeringPolicy(policy1);
+ composite.addTriggeringPolicy(policy2);
+ composite.activateOptions();
+
+ Assert.assertTrue(policy1.activateOptionsCalled());
+ Assert.assertTrue(policy2.activateOptionsCalled());
+ }
+
+ public void testActivateOptionsNotCalledByAddTriggeringPolicy() {
+ TestTriggeringPolicy policy1 = new TestTriggeringPolicy(true);
+ TestTriggeringPolicy policy2 = new TestTriggeringPolicy(true);
+
+ composite.addTriggeringPolicy(policy1);
+ composite.addTriggeringPolicy(policy2);
+
+ Assert.assertFalse(policy1.activateOptionsCalled());
+ Assert.assertFalse(policy2.activateOptionsCalled());
+ }
+
class TestTriggeringPolicy implements TriggeringPolicy {
private final boolean result;
+ private boolean activateOptionsCalled = false;
public TestTriggeringPolicy(boolean result) {
this.result = result;
}
+ public boolean activateOptionsCalled() {
+ return activateOptionsCalled;
+ }
+
public boolean isTriggeringEvent(Appender appender, LoggingEvent event,
String filename, long fileLength) {
return result;
}
public void activateOptions() {
- //no-op
+ activateOptionsCalled = true;
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
