[prev in list] [next in list] [prev in thread] [next in thread] 

List:       activemq-commits
Subject:    svn commit: r1341950 - in /activemq/activemq-apollo/trunk/apollo-stomp/src/test:
From:       chirino () apache ! org
Date:       2012-05-23 17:10:51
Message-ID: 20120523171051.A404923889EC () eris ! apache ! org
[Download RAW message or body]

Author: chirino
Date: Wed May 23 17:10:51 2012
New Revision: 1341950

URL: http://svn.apache.org/viewvc?rev=1341950&view=rev
Log:
Test case cleanup.

Modified:
    activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-bdb.xml
  activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-leveldb.xml
  activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp.xml
    activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/StompTest.scala


Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-bdb.xml
                
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-bdb.xml?rev=1341950&r1=1341949&r2=1341950&view=diff
 ==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-bdb.xml \
                (original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-bdb.xml \
Wed May 23 17:10:51 2012 @@ -27,7 +27,7 @@
     <bdb_store directory="${testdatadir}"/>
   </virtual_host>
 
-  <web_admin bind="http://127.0.0.1:0"/>
+  <!--<web_admin bind="http://0.0.0.0:61680"/>-->
   <connector id="tcp" bind="tcp://0.0.0.0:0"/>
 
 </broker>
\ No newline at end of file

Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-leveldb.xml
                
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-leveldb.xml?rev=1341950&r1=1341949&r2=1341950&view=diff
 ==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-leveldb.xml \
                (original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-leveldb.xml \
Wed May 23 17:10:51 2012 @@ -32,7 +32,7 @@
     <leveldb_store directory="${testdatadir}"/>
   </virtual_host>
 
-  <web_admin bind="http://127.0.0.1:0"/>
+  <!--<web_admin bind="http://0.0.0.0:61680"/>-->
   <connector id="tcp" bind="tcp://0.0.0.0:0"/>
 
 </broker>
\ No newline at end of file

Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp.xml
                
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp.xml?rev=1341950&r1=1341949&r2=1341950&view=diff
 ==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp.xml \
                (original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp.xml \
Wed May 23 17:10:51 2012 @@ -29,7 +29,7 @@
 
   </virtual_host>
 
-  <web_admin bind="http://0.0.0.0:61680"/>
+  <!--<web_admin bind="http://0.0.0.0:61680"/>-->
   <connector id="tcp" bind="tcp://0.0.0.0:0"/>
   <connector id="udp" bind="udp://0.0.0.0:0" protocol="udp"/>
 

Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/StompTest.scala
                
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test \
/scala/org/apache/activemq/apollo/stomp/StompTest.scala?rev=1341950&r1=1341949&r2=1341950&view=diff
 ==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/StompTest.scala \
                (original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/StompTest.scala \
Wed May 23 17:10:51 2012 @@ -31,7 +31,7 @@ import org.apache.activemq.apollo.broker
 
 class StompTestSupport extends BrokerFunSuiteSupport with ShouldMatchers with \
BeforeAndAfterEach {  
-  override val broker_config_uri = "xml:classpath:apollo-stomp.xml"
+  override def broker_config_uri = "xml:classpath:apollo-stomp.xml"
 
   var client = new StompClient
   var clients = List[StompClient]()
@@ -530,7 +530,7 @@ class Stomp11HeartBeatTest extends Stomp
 
 class StompPersistentQueueTest extends StompTestSupport {
 
-  override val broker_config_uri: String = "xml:classpath:apollo-stomp-leveldb.xml"
+  override def broker_config_uri: String = "xml:classpath:apollo-stomp-leveldb.xml"
 
   test("(APLO-198) Apollo sometimes does not send all the messages in a queue") {
     connect("1.1")
@@ -1241,7 +1241,7 @@ class StompDestinationTest extends Stomp
 
 class DurableSubscriptionOnLevelDBTest extends StompTestSupport {
 
-  override val broker_config_uri: String = "xml:classpath:apollo-stomp-leveldb.xml"
+  override def broker_config_uri: String = "xml:classpath:apollo-stomp-leveldb.xml"
 
   test("Can directly send an recieve from a durable sub") {
     connect("1.1")
@@ -1525,7 +1525,7 @@ class DurableSubscriptionOnLevelDBTest e
 }
 
 class DurableSubscriptionOnBDBTest extends DurableSubscriptionOnLevelDBTest {
-  override val broker_config_uri: String = "xml:classpath:apollo-stomp-bdb.xml"
+  override def broker_config_uri: String = "xml:classpath:apollo-stomp-bdb.xml"
 }
 
 class StompMirroredQueueTest extends StompTestSupport {
@@ -1604,7 +1604,7 @@ class StompMirroredQueueTest extends Sto
 }
 
 class StompSslDestinationTest extends StompDestinationTest {
-  override val broker_config_uri: String = "xml:classpath:apollo-stomp-ssl.xml"
+  override def broker_config_uri: String = "xml:classpath:apollo-stomp-ssl.xml"
 
   val config = new KeyStorageDTO
   config.file = basedir/"src"/"test"/"resources"/"client.ks"
@@ -1896,7 +1896,7 @@ class StompAckModeTest extends StompTest
 
 class StompSecurityTest extends StompTestSupport {
 
-  override val broker_config_uri: String = "xml:classpath:apollo-stomp-secure.xml"
+  override def broker_config_uri: String = "xml:classpath:apollo-stomp-secure.xml"
 
   override protected def beforeAll = {
     try {
@@ -2100,7 +2100,7 @@ class StompSecurityTest extends StompTes
 
 class StompSslSecurityTest extends StompTestSupport {
 
-  override val broker_config_uri: String = \
"xml:classpath:apollo-stomp-ssl-secure.xml" +  override def broker_config_uri: String \
= "xml:classpath:apollo-stomp-ssl-secure.xml"  
   override protected def beforeAll = {
     // System.setProperty("javax.net.debug", "all")
@@ -2170,7 +2170,7 @@ class StompWildcardTest extends StompTes
 }
 
 class CustomStompWildcardTest extends StompWildcardTest {
-  override val broker_config_uri: String = \
"xml:classpath:apollo-stomp-custom-dest-delimiters.xml" +  override def \
broker_config_uri: String = "xml:classpath:apollo-stomp-custom-dest-delimiters.xml"  \
override def path_separator = "/"  }
 
@@ -2459,12 +2459,12 @@ class StompNackTest extends StompTestSup
 }
 
 class StompNackTestOnLevelDBTest extends StompNackTest {
-  override val broker_config_uri: String = "xml:classpath:apollo-stomp-leveldb.xml"
+  override def broker_config_uri: String = "xml:classpath:apollo-stomp-leveldb.xml"
 }
 
 class StompDropPolicyTest extends StompTestSupport {
 
-  override val broker_config_uri: String = "xml:classpath:apollo-stomp-leveldb.xml"
+  override def broker_config_uri: String = "xml:classpath:apollo-stomp-leveldb.xml"
 
   test("Head Drop Policy: Persistent") {
     connect("1.1")


[prev in list] [next in list] [prev in thread] [next in thread]