Tidy up various badly named tests

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@985259 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 5 insertions, 59 deletions

diff --git a/java/broker/src/test/java/org/apache/qpid/server/configuration/TestPropertyUtils.java b/java/broker/src/test/java/org/apache/qpid/server/configuration/TestPropertyUtils.java
deleted file mode 100644
index 3b83190e42..0000000000
--- a/java/broker/src/test/java/org/apache/qpid/server/configuration/TestPropertyUtils.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.configuration;
-
-import org.apache.qpid.configuration.PropertyException;
-import org.apache.qpid.configuration.PropertyUtils;
-
-import junit.framework.TestCase;
-
-// TODO: This belongs in the "common" module.
-public class TestPropertyUtils extends TestCase
-{
-    public void testSimpleExpansion() throws PropertyException
-    {
-        System.setProperty("banana", "fruity");
-        String expandedProperty = PropertyUtils.replaceProperties("${banana}");
-        assertEquals(expandedProperty, "fruity");
-    }
-
-    public void testDualExpansion() throws PropertyException
-    {
-        System.setProperty("banana", "fruity");
-        System.setProperty("concrete", "horrible");
-        String expandedProperty = PropertyUtils.replaceProperties("${banana}xyz${concrete}");
-        assertEquals(expandedProperty, "fruityxyzhorrible");
-    }
-
-    public static junit.framework.Test suite()
-    {
-        return new junit.framework.TestSuite(TestPropertyUtils.class);
-    }
-}
diff --git a/java/broker/src/test/java/org/apache/qpid/server/store/TestReferenceCounting.java b/java/broker/src/test/java/org/apache/qpid/server/store/ReferenceCountingTest.java
index c5b1ba7868..a75cbe8662 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/store/TestReferenceCounting.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/store/ReferenceCountingTest.java
@@ -20,28 +20,26 @@
  */
 package org.apache.qpid.server.store;
 
-import junit.framework.TestCase;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.BasicContentHeaderProperties;
 import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
 import org.apache.qpid.server.message.AMQMessage;
 import org.apache.qpid.server.message.MessageMetaData;
+import org.apache.qpid.test.utils.QpidTestCase;
 
 /**
  * Tests that reference counting works correctly with AMQMessage and the message store
  */
-public class TestReferenceCounting extends TestCase
+public class ReferenceCountingTest extends QpidTestCase
 {
     private TestMemoryMessageStore _store;
 
 
     protected void setUp() throws Exception
     {
-        super.setUp();
         _store = new TestMemoryMessageStore();
-
     }
 
     /**
@@ -96,7 +94,7 @@ public class TestReferenceCounting extends TestCase
 
         assertEquals(1, _store.getMessageCount());
         message.decrementReference();
-        assertEquals(1, _store.getMessageCount());
+        assertEquals(0, _store.getMessageCount());
     }
 
     private ContentHeaderBody createPersistentContentHeader()
@@ -152,8 +150,6 @@ public class TestReferenceCounting extends TestCase
         // we call routing complete to set up the handle
      //   message.routingComplete(_store, _storeContext, new MessageHandleFactory());
 
-
-
         assertEquals(1, _store.getMessageCount());
         message = message.takeReference();
         message.decrementReference();
@@ -162,6 +158,6 @@ public class TestReferenceCounting extends TestCase
 
     public static junit.framework.Test suite()
     {
-        return new junit.framework.TestSuite(TestReferenceCounting.class);
+        return new junit.framework.TestSuite(ReferenceCountingTest.class);
     }
 }