summaryrefslogtreecommitdiff
path: root/java
Commit message (Collapse)AuthorAgeFilesLines
* QPID-1816 : Update to AOMT based tests, Test now continues as long as ↵Martin Ritchie2009-10-054-6/+44
| | | | | | | | | messages are received. If there has been no message received for 5 seconds then it counts the test as failed. Excluded AutoAck failover tests due to QPID-143 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@821829 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1816 : Add testing for publication on a dirty session after failover.Martin Ritchie2009-10-052-0/+409
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@821828 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1816 : Add testing for ack after failover, and testing for ↵Martin Ritchie2009-10-053-79/+282
| | | | | | acknowledgement in a dirty session after failover. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@821826 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1816 : Add Acknowledge tests and QuickAcking manual test helper.Martin Ritchie2009-10-055-19/+426
| | | | | | Updated AcknowldegeAfterFailoverTest to correctly cover the failure cases. Sending messages on a dirty transaction and Receiveing messagges on a dirty session. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@821824 13f79535-47bb-0310-9956-ffa450edef68
* Fix for dirty sessions, start to test that sessions are dirty when required.Martin Ritchie2009-10-052-21/+90
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@821823 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1816 : Updated AcknowledgeTests to cover all ack modes and the ↵Martin Ritchie2009-10-055-88/+601
| | | | | | synchronous receive and asynchronous onMessage approaches. Also added tests that failover between acking. Currently these tests are setup to repoulate the broker between failover. However, in a clustered environment that would not be requried. Investigation is need on how best to setup failover tests in general so that clustered and non-clustered environments can be easily tested. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@821822 13f79535-47bb-0310-9956-ffa450edef68
* Updated testing harness: QpidTestCase and FailoverBaseCase.Martin Ritchie2009-10-057-204/+192
| | | | | | | | | | | | | | | | | | Updates to QpidTestCase: to allow the sending of messages that are tagged from an offset value. to correctly commit the sent messages if the sent number does not fit within the batch window. update to createMessage to add an INDEX int property. update to rename ssl connectionfactory default.ssl to align with other factories. updated test-provider accordingly. added a getTestQueue method that creates an AMQQueue using getTestQueueName to further simplify tests. Updates to FailoverBaseCase removed setFailingPort, failBroker now takes the port to fail, this allows both brokers to be failed more easily. Update to ensure that all subclasses get a failover connection url, through the getConnection(), some were not. Fixed by overriding getConnectionFactory() call. Fixed second broker work directory to write to defined QPID_WORK rather than java.io.tmpdir. If QPID_WORK is not set then tests will fall back to java.io.tmpdir getFailingPort now returns the correct value if you are running InVM (2)or externally(test.alt.port) Updated tests that used failBroker to use failBroker(getFailingPort()) so tests will work InVM and externally. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@821821 13f79535-47bb-0310-9956-ffa450edef68
* Update to ensure system properties are always reset even if exception ocurrs ↵Martin Ritchie2009-10-051-6/+11
| | | | | | during tearDown git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@821820 13f79535-47bb-0310-9956-ffa450edef68
* Update to FBC to ensure second broker is shutdown in the event of an ↵Martin Ritchie2009-10-051-2/+18
| | | | | | exception during super.tearDown. This may have been the cause of CI stuck brokers git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@821819 13f79535-47bb-0310-9956-ffa450edef68
* Removed BasicConfigurator.configure() this should not be used in testing as ↵Martin Ritchie2009-10-051-0/+1
| | | | | | it will enabled full DEBUG logging. If the logging needs tweeked for the test the test must remember the previous configuratio and restore it after the test run. Here I can see no reason to enable DEBUG logging. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@821818 13f79535-47bb-0310-9956-ffa450edef68
* Updated BlockingWaiter to provided more details when a new exception arrives ↵Martin Ritchie2009-10-051-1/+1
| | | | | | and the old one has not been consumed git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@821817 13f79535-47bb-0310-9956-ffa450edef68
* Added close actor to NAR to prevent exception during InVM broker shutdown.Martin Ritchie2009-10-051-0/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@821816 13f79535-47bb-0310-9956-ffa450edef68
* Updated broker log4j.xml to remove the DEBUG logging from o.a.commonsMartin Ritchie2009-10-051-0/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@821815 13f79535-47bb-0310-9956-ffa450edef68
* QPID-942: fix test exclusionRobert Gemmell2009-10-021-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@820932 13f79535-47bb-0310-9956-ffa450edef68
* QPID-942 : Add Simplistic Producer Flow Control to the java Broker / java ↵Robert Godfrey2009-10-0116-29/+695
| | | | | | 0-8/0-9 client git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@820739 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2125: Make FailoverBaseCase set the second brokers QPID_WORK as a ↵Robert Gemmell2009-10-012-5/+2
| | | | | | subdirectory of the first instead of /tmp, allowing common cleanBroker() execution via QpidTestCase. Update QueueBrowserAutoAckTest to use the getTestQueueName() helper method instead of creating its own time-based queue names git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@820685 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2121 : Noticed that the logging level for the test VM was being set ↵Martin Ritchie2009-10-012-7/+46
| | | | | | directly. This will result in all subsequent tests having WARN logging. Added new setLoggerLevel method to QTC to allow the setting of a Log4j logger level for a given test run. Reverting the changes when the test is complete git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@820606 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2121 : Correctly set the broker properties for the test, rather than ↵Martin Ritchie2009-10-011-1/+1
| | | | | | using the currently defined System value. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@820573 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2121 : Update to QTC to allow the setting of System Properties for just ↵Martin Ritchie2009-09-303-15/+84
| | | | | | | | | | the Test run or the External Broker or both. renamed _setProperties as it was confusing. Now two maps are used _propertiesSetForTestOnly and _propertiesSetForBroker calls to setSystemProperty puts the value in to both maps so test VM and the external VM will have a system property defined to have that value. If a test is configured to run against an external broker then two new methods help control how each vm is setup. setTestClientSystemProperty is used to set a value in the TestVM that is not copied to any external VM. setBrokerOnlySystemProperty can now be used to set a System property value in the external broker VM only. As before all values are reverted at the end of the test run. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@820323 13f79535-47bb-0310-9956-ffa450edef68
* Correct order of log4j entries so our parser doesn't print an errorMartin Ritchie2009-09-303-1/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@820322 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2118 : Corrected 010Exclude for runtime selector exception. Tidied up ↵Martin Ritchie2009-09-303-100/+33
| | | | | | SelectorTest so that it uses more of QTC functionality and stops creating random queue names. The init() methods could be totally removed with a bit more work. Updated test() to be testOnMessage() to better identify what test was supposed to be using onMessage() previously they all were! JMSMessageID test should now pass again on CPP profile. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@820321 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2120 : Updated SimpleAMQQueue to ensure that the sub.isSuspended() ↵Martin Ritchie2009-09-304-72/+118
| | | | | | | | check is done before any attempt to retrieve the getLastSeenNode(). This and the commits for QPID-1871,QPID-2116 are tested by RollbackOrderTest that now can be enabled for the Java profile. Additional changes were done to SAMQQ to improve readability and add some debug loggging. Performance testing should be done to identify any penality for this additional logging. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@820320 13f79535-47bb-0310-9956-ffa450edef68
* Add debug logging to see what the next message the Subscription is going to ↵Martin Ritchie2009-09-301-1/+9
| | | | | | look at. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@820319 13f79535-47bb-0310-9956-ffa450edef68
* Prevent NPE in QueueEntryImpl.debugIdentityMartin Ritchie2009-09-301-1/+9
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@820318 13f79535-47bb-0310-9956-ffa450edef68
* Add toString to AbstractActor to allow actors to be used in debug log messagesMartin Ritchie2009-09-301-0/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@820317 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2116 : Ensure that AMQChannel correctly notifies all running ↵Martin Ritchie2009-09-301-4/+51
| | | | | | Subscription deliveries that the Channel has been suspended. This is down by taking out the subcription sendLock on each subscription on this Channel. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@820316 13f79535-47bb-0310-9956-ffa450edef68
* Update QTC to allow the setting of debug logging for the external broker ↵Martin Ritchie2009-09-302-0/+28
| | | | | | process. Update BrokerStartupTest to ensure that these values are set to the default info as the test looks for the existence of DEBUG messages as a sign of failure. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@820315 13f79535-47bb-0310-9956-ffa450edef68
* Add logging of QPID_OPTS to startup in qpid-runMartin Ritchie2009-09-301-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@820314 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2118: exclude SelectorTest#testRuntimeSelectorError until it fails in ↵Robert Gemmell2009-09-291-0/+1
| | | | | | the same way git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@819975 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2028 : Augment BrokerActor to allow the setting of the broker name. ↵Martin Ritchie2009-09-287-12/+21
| | | | | | Updated ApplicationRegistries to pass the instanceID to the BrokerActor in an attempt to better identify what brokers are shutting down during our test runs. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@819605 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2118, exclude SelectorTest#testSelectorWithJMSMessageID until it fails ↵Martin Ritchie2009-09-281-0/+3
| | | | | | in the same way as 0-8/9 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@819604 13f79535-47bb-0310-9956-ffa450edef68
* Set apache.commons logging to warn to reduce the amount of commons debug ↵Martin Ritchie2009-09-281-0/+4
| | | | | | that appears during Java broker test runs git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@819594 13f79535-47bb-0310-9956-ffa450edef68
* Add INDEX property to created messagesMartin Ritchie2009-09-281-2/+8
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@819593 13f79535-47bb-0310-9956-ffa450edef68
* Improve error reporting when commit failedMartin Ritchie2009-09-281-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@819592 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1871 : Updated RollbackOrderTest to include an onMessage test. Fixed ↵Martin Ritchie2009-09-284-50/+191
| | | | | | | | deadlock issue with 0-10 rollback method and onMessage usage. Moved 0-10 rollback strategy to the abstract AMQSession and updated 0-8 to use that approach. 0-8 Still excluded from test runs as the race condition is not that the dispatcher would hold a message and reject after the TxRollback. The problem is the Java Broker sends a message out after the FlowOk message so the Dispatcher then sits on it, see QPID-2116. This exact problem was hidden due to the way the Dispatcher is stopped. This problem has not been addressed. The request to stop the dispatcher can only actually stop the dispatcher whilst it is in the middle of processing a message. The stop needs to interrupt the _queue.take() and hold the dispatcher AFTER the processing of any message that it needs to do: see QPID-2117. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@819590 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2115: add 'broker.clean.between.tests' to toggle whether QTC should ↵Robert Gemmell2009-09-252-0/+16
| | | | | | execute the 'broker.clean' command after every test method is run git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@818840 13f79535-47bb-0310-9956-ffa450edef68
* This is related to QPID-1956Rajith Muditha Attapattu2009-09-221-5/+5
| | | | | | | I had missed this bit when I committed last night. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@817867 13f79535-47bb-0310-9956-ffa450edef68
* This is a fix for QPID-1956Rajith Muditha Attapattu2009-09-221-2/+11
| | | | | | | | Added a check in the getNextBrokerDetails method to return null when the current broker equals the only remaining broker in the list A test case for this will be added once I finalized the test case for the failover exchange method git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@817487 13f79535-47bb-0310-9956-ffa450edef68
* This is a fix for QPID-2114 Rajith Muditha Attapattu2009-09-222-2/+4
| | | | | | | I have also added a simple check for the default message priority in an existing test in JMSPropertiesTest git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@817478 13f79535-47bb-0310-9956-ffa450edef68
* This is a fix for QPID-2113Rajith Muditha Attapattu2009-09-221-0/+36
| | | | | | | | | | | I didn't meddle with the existing log4j.properties file present in the common module as it maybe used in the broker. However a cursory glance at the etc directory revealed that the the broker too has a log4j.xml file. So perhaps the log4j.properties files in the common module is not really needed. (The settings given i the log4j.xml under the client module could be overriden by explicitly specifying a log4.xml file using -Dlog.configuration property) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@817457 13f79535-47bb-0310-9956-ffa450edef68
* FailoverBaseCase has not been using the testprofile defined test.port.alt ↵Martin Ritchie2009-09-213-5/+11
| | | | | | for the failover server. As a result the connection has been failing. Updated to use correct system property and added text to both default.testprofile and test-provider.properties to ensure that the changes are made in both locations, Ideally JNDI connection would use the same system property that is used by QTC for starting the broker. However I don't believe that it is currently doing that. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@817295 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2111 SelectorTest Unify selector tests into one class. AddAidan Skinner2009-09-182-314/+322
| | | | | | | testRuntimeSelectorError git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@816579 13f79535-47bb-0310-9956-ffa450edef68
* Update to QpidTestCase to only check for broker.stopped lines until we have ↵Martin Ritchie2009-09-173-3/+5
| | | | | | found the ready line. Added broker.stopped line to cpp.testprofile 'Exception constructed' this identifies port conflict issues. Local testing has shown that this works as expected. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@816150 13f79535-47bb-0310-9956-ffa450edef68
* Fix line endingsAidan Skinner2009-09-161-35/+35
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@815771 13f79535-47bb-0310-9956-ffa450edef68
* Reveted changes to QPID-2099, QPID-2100. The value of PNAME must not be changed.Martin Ritchie2009-09-153-15/+8
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@815206 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2099 : Updated QTC now that QPID_PNAME will wrap its value QTC doesn't ↵Martin Ritchie2009-09-141-1/+1
| | | | | | need to do it aswell. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@814670 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2100 : Updated qpid.stop to use QPID_PNAME variable as the search. This ↵Martin Ritchie2009-09-141-4/+12
| | | | | | | | | | brings it in line with qpid-run. If QPID_PNAME is not set then it will fall back to QPID_STOP_SERVER so as to main backward compatibility. If neither are set then it will only use -DPNAME=" as the search. Thus allowing the value to have been changed and this script still to detect QPID processes. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@814545 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2099 : Updated qpid-run to use QPID_PNAME as the value for the system ↵Martin Ritchie2009-09-141-2/+2
| | | | | | | | property -DPNAME="". Ensured value is quoted to allow spaces in QPID_PNAME. i.e QPID_PNAME="Production Broker" git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@814544 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2002 : Update ManagementLoggingTest to cope with relative paths.Martin Ritchie2009-09-111-1/+1
| | | | | | Just check for the file name rather than the path. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@813856 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2093: Updated AMQBRokerManagerMBean to check if the queue is durable ↵Martin Ritchie2009-09-116-348/+701
| | | | | | | | | | | before performing store.deleteQueue(). Created ModelTest to validate the change, (testDeletionDurableViaJMX). To facility the testing, extracted JMX Operations from ManagementActorLoggingTest to a new JMXTestUtils and updated both ModelTest and MALT to use this interface. Updated 010(cpp) and 08(Java-InVM) excludes as the CPP does not have JMX and the InVM JMX is unreliable (see QPID-2097) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@813801 13f79535-47bb-0310-9956-ffa450edef68