You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2010/06/02 18:42:05 UTC
svn commit: r950638 - in
/qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src:
main/java/org/apache/qpid/server/virtualhost/plugin/logging/
test/java/org/apache/qpid/server/virtualhost/plugin/
test/java/org/apache/qpid/server/vir...
Author: ritchiem
Date: Wed Jun 2 16:42:04 2010
New Revision: 950638
URL: http://svn.apache.org/viewvc?rev=950638&view=rev
Log:
QPID-1447 : Fully comment tests and ensure asserts are made in all test cases
Modified:
qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/logging/LogMessages.properties
qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionConfigurationTest.java
qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionPolicyConfigurationTest.java
qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfigurationTest.java
Modified: qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/logging/LogMessages.properties
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/logging/LogMessages.properties?rev=950638&r1=950637&r2=950638&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/logging/LogMessages.properties (original)
+++ qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/logging/LogMessages.properties Wed Jun 2 16:42:04 2010
@@ -1,8 +1,10 @@
+#SlowConsumerDetection.logMessages
SCD=SlowConsumerDetection
SCD_RUNNING = SCD-1001 : Running
SCD_COMPLETE = SCD-1002 : Complete
SCD_CHECKING_QUEUE = SCD-1003 : Checking Status of Queue {0}
+#TopicDeletePolicy.logMessages
TDP=TopicDeletePolicy
TDP_DELETING_QUEUE = TDP-1001 : Deleting Queue
TDP_DISCONNECTING = TDP-1002 : Disconnecting Session
\ No newline at end of file
Modified: qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionConfigurationTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionConfigurationTest.java?rev=950638&r1=950637&r2=950638&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionConfigurationTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionConfigurationTest.java Wed Jun 2 16:42:04 2010
@@ -29,18 +29,32 @@ import org.apache.qpid.test.utils.QpidTe
import java.util.concurrent.TimeUnit;
-/** Provide Unit Test coverage of the SlowConsumerConfiguration */
+/**
+ * Provide Unit Test coverage of the virtualhost SlowConsumer Configuration
+ * This is what controls how often the plugin will execute
+ */
public class SlowConsumerDetectionConfigurationTest extends QpidTestCase
{
+ /**
+ * Default Testing:
+ *
+ * Provide a fully complete and valid configuration specifying 'delay' and
+ * 'timeunit' and ensure that it is correctly processed.
+ *
+ * Ensure no exceptions are thrown and that we get the same values back that
+ * were put into the configuration.
+ */
public void testConfigLoadingValidConfig()
{
SlowConsumerDetectionConfiguration config = new SlowConsumerDetectionConfiguration();
XMLConfiguration xmlconfig = new XMLConfiguration();
- xmlconfig.addProperty("delay", "10");
- xmlconfig.addProperty("timeunit", TimeUnit.MICROSECONDS.toString());
+ long DELAY=10;
+ String TIMEUNIT=TimeUnit.MICROSECONDS.toString();
+ xmlconfig.addProperty("delay", String.valueOf(DELAY));
+ xmlconfig.addProperty("timeunit", TIMEUNIT);
// Create a CompositeConfiguration as this is what the broker uses
CompositeConfiguration composite = new CompositeConfiguration();
@@ -55,11 +69,60 @@ public class SlowConsumerDetectionConfig
e.printStackTrace();
fail(e.getMessage());
}
+
+ assertEquals("Delay not correctly returned.", DELAY, config.getDelay());
+ assertEquals("TimeUnit not correctly returned.",
+ TIMEUNIT, String.valueOf(config.getTimeUnit()));
}
/**
+ * Default Testing:
+ *
+ * Test Missing TimeUnit value gets default.
+ *
+ * The TimeUnit value is optional and default to SECONDS.
+ *
+ * Test that if we do not specify a TimeUnit then we correctly get seconds.
+ *
+ * Also verify that relying on the default does not impact the setting of
+ * the 'delay' value.
+ *
+ */
+ public void testConfigLoadingMissingTimeUnitDefaults()
+ {
+ SlowConsumerDetectionConfiguration config = new SlowConsumerDetectionConfiguration();
+
+ XMLConfiguration xmlconfig = new XMLConfiguration();
+
+ long DELAY=10;
+ xmlconfig.addProperty("delay", String.valueOf(DELAY));
+
+ // Create a CompositeConfiguration as this is what the broker uses
+ CompositeConfiguration composite = new CompositeConfiguration();
+ composite.addConfiguration(xmlconfig);
+ try
+ {
+ config.setConfiguration("", composite);
+ }
+ catch (ConfigurationException e)
+ {
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
+
+ assertEquals("Delay not correctly returned.", DELAY, config.getDelay());
+ assertEquals("Default TimeUnit incorrect", TimeUnit.SECONDS, config.getTimeUnit());
+ }
+
+ /**
+ * Input Testing:
+ *
* TimeUnit parsing requires the String value be in UpperCase.
* Ensure we can handle when the user doesn't know this.
+ *
+ * Same test as 'testConfigLoadingValidConfig' but checking that
+ * the timeunit field is not case sensitive.
+ * i.e. the toUpper is being correctly applied.
*/
public void testConfigLoadingValidConfigStrangeTimeUnit()
{
@@ -67,7 +130,9 @@ public class SlowConsumerDetectionConfig
XMLConfiguration xmlconfig = new XMLConfiguration();
- xmlconfig.addProperty("delay", "10");
+ long DELAY=10;
+
+ xmlconfig.addProperty("delay", DELAY);
xmlconfig.addProperty("timeunit", "MiCrOsEcOnDs");
// Create a CompositeConfiguration as this is what the broker uses
@@ -83,9 +148,23 @@ public class SlowConsumerDetectionConfig
e.printStackTrace();
fail(e.getMessage());
}
+
+ assertEquals("Delay not correctly returned.", DELAY, config.getDelay());
+ assertEquals("TimeUnit not correctly returned.",
+ TimeUnit.MICROSECONDS.toString(), String.valueOf(config.getTimeUnit()));
+
}
- /** Test that delay must be long not a string value. */
+ /**
+ * Failure Testing:
+ *
+ * Test that delay must be long not a string value.
+ * Provide a delay as a written value not a long. 'ten'.
+ *
+ * This should throw a configuration exception which is being trapped and
+ * verified to be the right exception, a NumberFormatException.
+ *
+ */
public void testConfigLoadingInValidDelayString()
{
SlowConsumerDetectionConfiguration config = new SlowConsumerDetectionConfiguration();
@@ -112,7 +191,16 @@ public class SlowConsumerDetectionConfig
}
}
- /** Test that negative delays are invalid */
+ /**
+ * Failure Testing:
+ *
+ * Test that negative delays are invalid.
+ *
+ * Delay must be a positive value as negative delay means doesn't make sense.
+ *
+ * Configuration exception with a useful message should be thrown here.
+ *
+ */
public void testConfigLoadingInValidDelayNegative()
{
SlowConsumerDetectionConfiguration config = new SlowConsumerDetectionConfiguration();
@@ -144,7 +232,17 @@ public class SlowConsumerDetectionConfig
}
}
- /** Tet that delay cannot be 0 */
+ /**
+ * Failure Testing:
+ *
+ * Test that delay cannot be 0.
+ *
+ * A zero delay means run constantly. This is not how VirtualHostTasks
+ * are designed to be run so we dis-allow the use of 0 delay.
+ *
+ * Same test as 'testConfigLoadingInValidDelayNegative' but with a 0 value.
+ *
+ */
public void testConfigLoadingInValidDelayZero()
{
SlowConsumerDetectionConfiguration config = new SlowConsumerDetectionConfiguration();
@@ -176,7 +274,14 @@ public class SlowConsumerDetectionConfig
}
}
- /** Test that missing delay fails */
+ /**
+ * Failure Testing:
+ *
+ * Test that missing delay fails.
+ * If we have no delay then we do not pick a default. So a Configuration
+ * Exception is thrown.
+ *
+ * */
public void testConfigLoadingInValidMissingDelay()
{
SlowConsumerDetectionConfiguration config = new SlowConsumerDetectionConfiguration();
@@ -199,14 +304,28 @@ public class SlowConsumerDetectionConfig
}
}
- /** Test that erroneous TimeUnit fails */
+ /**
+ * Failure Testing:
+ *
+ * Test that erroneous TimeUnit fails.
+ *
+ * Valid TimeUnit values vary based on the JVM version i.e. 1.6 added HOURS/DAYS etc.
+ *
+ * We don't test the values for TimeUnit are accepted other than MILLISECONDS in the
+ * positive testing at the start.
+ *
+ * Here we ensure that an erroneous for TimeUnit correctly throws an exception.
+ *
+ * We test with 'foo', which will never be a TimeUnit
+ *
+ */
public void testConfigLoadingInValidTimeUnit()
{
SlowConsumerDetectionConfiguration config = new SlowConsumerDetectionConfiguration();
String TIMEUNIT = "foo";
XMLConfiguration xmlconfig = new XMLConfiguration();
-
+
xmlconfig.addProperty("delay", "10");
xmlconfig.addProperty("timeunit", TIMEUNIT);
@@ -224,29 +343,5 @@ public class SlowConsumerDetectionConfig
}
}
- /** Test Missing TimeUnit value gets default */
- public void testConfigLoadingMissingTimeUnitDefaults()
- {
- SlowConsumerDetectionConfiguration config = new SlowConsumerDetectionConfiguration();
-
- XMLConfiguration xmlconfig = new XMLConfiguration();
-
- xmlconfig.addProperty("delay", "10");
-
- // Create a CompositeConfiguration as this is what the broker uses
- CompositeConfiguration composite = new CompositeConfiguration();
- composite.addConfiguration(xmlconfig);
- try
- {
- config.setConfiguration("", composite);
- }
- catch (ConfigurationException e)
- {
- e.printStackTrace();
- fail(e.getMessage());
- }
-
- assertEquals("Default TimeUnit incorrect", TimeUnit.SECONDS, config.getTimeUnit());
- }
}
Modified: qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionPolicyConfigurationTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionPolicyConfigurationTest.java?rev=950638&r1=950637&r2=950638&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionPolicyConfigurationTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionPolicyConfigurationTest.java Wed Jun 2 16:42:04 2010
@@ -26,16 +26,29 @@ import org.apache.commons.configuration.
import org.apache.qpid.server.configuration.plugin.SlowConsumerDetectionPolicyConfiguration;
import org.apache.qpid.test.utils.QpidTestCase;
+/**
+ * Test class to ensure that the policy configuration can be processed.
+ */
public class SlowConsumerDetectionPolicyConfigurationTest extends QpidTestCase
{
+ /**
+ * Input Testing:
+ *
+ * Test that a given String can be set and retrieved through the configuration
+ *
+ * No validation is being performed to ensure that the policy exists. Only
+ * that a value can be set for the policy.
+ *
+ */
public void testConfigLoadingValidConfig()
{
SlowConsumerDetectionPolicyConfiguration config = new SlowConsumerDetectionPolicyConfiguration();
XMLConfiguration xmlconfig = new XMLConfiguration();
- xmlconfig.addProperty("name", "TestPolicy");
+ String policyName = "TestPolicy";
+ xmlconfig.addProperty("name", policyName);
// Create a CompositeConfiguration as this is what the broker uses
CompositeConfiguration composite = new CompositeConfiguration();
@@ -50,8 +63,21 @@ public class SlowConsumerDetectionPolicy
e.printStackTrace();
fail(e.getMessage());
}
+
+ assertEquals("Policy name not retrieved as expected.",
+ policyName, config.getPolicyName());
}
+ /**
+ * Failure Testing:
+ *
+ * Test that providing a configuration section without the 'name' field
+ * causes an exception to be thrown.
+ *
+ * An empty configuration is provided and the thrown exception message
+ * is checked to confirm the right reason.
+ *
+ */
public void testConfigLoadingInValidConfig()
{
SlowConsumerDetectionPolicyConfiguration config = new SlowConsumerDetectionPolicyConfiguration();
Modified: qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfigurationTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfigurationTest.java?rev=950638&r1=950637&r2=950638&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfigurationTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfigurationTest.java Wed Jun 2 16:42:04 2010
@@ -25,9 +25,15 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.XMLConfiguration;
import org.apache.qpid.test.utils.QpidTestCase;
+/**
+ * Test to ensure TopicDelete Policy configuration can be loaded.
+ */
public class TopicDeletePolicyConfigurationTest extends QpidTestCase
{
-
+ /**
+ * Test without any configuration being provided that the
+ * deletePersistent option is disabled.
+ */
public void testNoConfigNoDeletePersistent()
{
TopicDeletePolicyConfiguration config = new TopicDeletePolicyConfiguration();
@@ -36,7 +42,24 @@ public class TopicDeletePolicyConfigurat
config.deletePersistent());
}
-
+ /**
+ * Test that with the correct configuration the deletePersistent option can
+ * be enabled.
+ *
+ * Test creates a new Configuration object and passes in the xml snippet
+ * that the ConfigurationPlugin would receive during normal execution.
+ * This is the XML that would be matched for this plugin:
+ * <topicdelete>
+ * <delete-persistent>
+ * <topicdelete>
+ *
+ * So it would be subset and passed in as just:
+ * <delete-persistent>
+ *
+ *
+ * The property should therefore be enabled.
+ *
+ */
public void testConfigDeletePersistent()
{
TopicDeletePolicyConfiguration config = new TopicDeletePolicyConfiguration();
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org