directory moves required for maven merge

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

7 files changed, 492 insertions, 0 deletions

diff --git a/java/broker/src/test/java/org/apache/qpid/server/UnitTests.java b/java/broker/src/test/java/org/apache/qpid/server/UnitTests.java
new file mode 100644
index 0000000000..fcae268288
--- /dev/null
+++ b/java/broker/src/test/java/org/apache/qpid/server/UnitTests.java
@@ -0,0 +1,39 @@
+/*
+ *
+ * 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;
+
+import junit.framework.JUnit4TestAdapter;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+        org.apache.qpid.server.configuration.UnitTests.class,
+        org.apache.qpid.server.exchange.UnitTests.class,
+        org.apache.qpid.server.util.UnitTests.class
+        })
+public class UnitTests
+{
+    public static junit.framework.Test suite()
+    {
+        return new JUnit4TestAdapter(UnitTests.class);
+    }
+}
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
new file mode 100644
index 0000000000..8bab0fbc12
--- /dev/null
+++ b/java/broker/src/test/java/org/apache/qpid/server/configuration/TestPropertyUtils.java
@@ -0,0 +1,53 @@
+/*
+ *
+ * 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 junit.framework.JUnit4TestAdapter;
+import org.apache.qpid.configuration.PropertyException;
+import org.apache.qpid.configuration.PropertyUtils;
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+
+// TODO: This belongs in the "common" module.
+public class TestPropertyUtils
+{
+    @Test
+    public void testSimpleExpansion() throws PropertyException
+    {
+        System.setProperty("banana", "fruity");
+        String expandedProperty = PropertyUtils.replaceProperties("${banana}");
+        assertEquals(expandedProperty, "fruity");
+    }
+
+    @Test
+    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 JUnit4TestAdapter(TestPropertyUtils.class);
+    }
+}
diff --git a/java/broker/src/test/java/org/apache/qpid/server/configuration/UnitTests.java b/java/broker/src/test/java/org/apache/qpid/server/configuration/UnitTests.java
new file mode 100644
index 0000000000..6e39e9efd1
--- /dev/null
+++ b/java/broker/src/test/java/org/apache/qpid/server/configuration/UnitTests.java
@@ -0,0 +1,35 @@
+/*
+ *
+ * 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 junit.framework.JUnit4TestAdapter;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({TestPropertyUtils.class})
+public class UnitTests
+{
+    public static junit.framework.Test suite()
+    {
+        return new JUnit4TestAdapter(UnitTests.class);
+    }
+}
diff --git a/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java b/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
new file mode 100644
index 0000000000..0e7ab10c59
--- /dev/null
+++ b/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
@@ -0,0 +1,203 @@
+/*
+ *
+ * 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.exchange;
+
+import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+
+
+import java.util.Map;
+import java.util.HashMap;
+
+import junit.framework.JUnit4TestAdapter;
+
+/**
+ */
+public class HeadersBindingTest
+{
+    private Map<String, String> bindHeaders = new HashMap<String, String>();
+    private Map<String, String> matchHeaders = new HashMap<String, String>();
+
+    @Test public void default_1()
+    {
+        bindHeaders.put("A", "Value of A");
+
+        matchHeaders.put("A", "Value of A");
+
+        assertTrue(new HeadersBinding(bindHeaders).matches(matchHeaders));
+    }
+
+    @Test public void default_2()
+    {
+        bindHeaders.put("A", "Value of A");
+
+        matchHeaders.put("A", "Value of A");
+        matchHeaders.put("B", "Value of B");
+
+        assertTrue(new HeadersBinding(bindHeaders).matches(matchHeaders));
+    }
+
+    @Test public void default_3()
+    {
+        bindHeaders.put("A", "Value of A");
+
+        matchHeaders.put("A", "Altered value of A");
+
+        assertFalse(new HeadersBinding(bindHeaders).matches(matchHeaders));
+    }
+
+    @Test public void all_1()
+    {
+        bindHeaders.put("X-match", "all");
+        bindHeaders.put("A", "Value of A");
+
+        matchHeaders.put("A", "Value of A");
+
+        assertTrue(new HeadersBinding(bindHeaders).matches(matchHeaders));
+    }
+
+    @Test public void all_2()
+    {
+        bindHeaders.put("X-match", "all");
+        bindHeaders.put("A", "Value of A");
+        bindHeaders.put("B", "Value of B");
+
+        matchHeaders.put("A", "Value of A");
+
+        assertFalse(new HeadersBinding(bindHeaders).matches(matchHeaders));
+    }
+
+    @Test public void all_3()
+    {
+        bindHeaders.put("X-match", "all");
+        bindHeaders.put("A", "Value of A");
+        bindHeaders.put("B", "Value of B");
+
+        matchHeaders.put("A", "Value of A");
+        matchHeaders.put("B", "Value of B");
+
+        assertTrue(new HeadersBinding(bindHeaders).matches(matchHeaders));
+    }
+
+    @Test public void all_4()
+    {
+        bindHeaders.put("X-match", "all");
+        bindHeaders.put("A", "Value of A");
+        bindHeaders.put("B", "Value of B");
+
+        matchHeaders.put("A", "Value of A");
+        matchHeaders.put("B", "Value of B");
+        matchHeaders.put("C", "Value of C");
+
+        assertTrue(new HeadersBinding(bindHeaders).matches(matchHeaders));
+    }
+
+    @Test public void all_5()
+    {
+        bindHeaders.put("X-match", "all");
+        bindHeaders.put("A", "Value of A");
+        bindHeaders.put("B", "Value of B");
+
+        matchHeaders.put("A", "Value of A");
+        matchHeaders.put("B", "Altered value of B");
+        matchHeaders.put("C", "Value of C");
+
+        assertFalse(new HeadersBinding(bindHeaders).matches(matchHeaders));
+    }
+
+    @Test public void any_1()
+    {
+        bindHeaders.put("X-match", "any");
+        bindHeaders.put("A", "Value of A");
+
+        matchHeaders.put("A", "Value of A");
+
+        assertTrue(new HeadersBinding(bindHeaders).matches(matchHeaders));
+    }
+
+    @Test public void any_2()
+    {
+        bindHeaders.put("X-match", "any");
+        bindHeaders.put("A", "Value of A");
+        bindHeaders.put("B", "Value of B");
+
+        matchHeaders.put("A", "Value of A");
+
+        assertTrue(new HeadersBinding(bindHeaders).matches(matchHeaders));
+    }
+
+    @Test public void any_3()
+    {
+        bindHeaders.put("X-match", "any");
+        bindHeaders.put("A", "Value of A");
+        bindHeaders.put("B", "Value of B");
+
+        matchHeaders.put("A", "Value of A");
+        matchHeaders.put("B", "Value of B");
+
+        assertTrue(new HeadersBinding(bindHeaders).matches(matchHeaders));
+    }
+
+    @Test public void any_4()
+    {
+        bindHeaders.put("X-match", "any");
+        bindHeaders.put("A", "Value of A");
+        bindHeaders.put("B", "Value of B");
+
+        matchHeaders.put("A", "Value of A");
+        matchHeaders.put("B", "Value of B");
+        matchHeaders.put("C", "Value of C");
+
+        assertTrue(new HeadersBinding(bindHeaders).matches(matchHeaders));
+    }
+
+    @Test public void any_5()
+    {
+        bindHeaders.put("X-match", "any");
+        bindHeaders.put("A", "Value of A");
+        bindHeaders.put("B", "Value of B");
+
+        matchHeaders.put("A", "Value of A");
+        matchHeaders.put("B", "Altered value of B");
+        matchHeaders.put("C", "Value of C");
+
+        assertTrue(new HeadersBinding(bindHeaders).matches(matchHeaders));
+    }
+
+    @Test public void any_6()
+    {
+        bindHeaders.put("X-match", "any");
+        bindHeaders.put("A", "Value of A");
+        bindHeaders.put("B", "Value of B");
+
+        matchHeaders.put("A", "Altered value of A");
+        matchHeaders.put("B", "Altered value of B");
+        matchHeaders.put("C", "Value of C");
+
+        assertFalse(new HeadersBinding(bindHeaders).matches(matchHeaders));
+    }
+    public static junit.framework.Test suite()
+    {
+        return new JUnit4TestAdapter(HeadersBindingTest.class);
+    }
+
+}
diff --git a/java/broker/src/test/java/org/apache/qpid/server/exchange/UnitTests.java b/java/broker/src/test/java/org/apache/qpid/server/exchange/UnitTests.java
new file mode 100644
index 0000000000..ce3812be7f
--- /dev/null
+++ b/java/broker/src/test/java/org/apache/qpid/server/exchange/UnitTests.java
@@ -0,0 +1,35 @@
+/*
+ *
+ * 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.exchange;
+
+import junit.framework.JUnit4TestAdapter;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({HeadersBindingTest.class})
+public class UnitTests
+{
+    public static junit.framework.Test suite()
+    {
+        return new JUnit4TestAdapter(UnitTests.class);
+    }
+}
diff --git a/java/broker/src/test/java/org/apache/qpid/server/util/LoggingProxyTest.java b/java/broker/src/test/java/org/apache/qpid/server/util/LoggingProxyTest.java
new file mode 100644
index 0000000000..878500689a
--- /dev/null
+++ b/java/broker/src/test/java/org/apache/qpid/server/util/LoggingProxyTest.java
@@ -0,0 +1,92 @@
+/*
+ *
+ * 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.util;
+
+import junit.framework.JUnit4TestAdapter;
+import org.junit.Assert;
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+public class LoggingProxyTest
+{
+    static interface IFoo {
+        void foo();
+        void foo(int i, Collection c);
+        String bar();
+        String bar(String s, List l);
+    }
+
+    static class Foo implements IFoo {
+        public void foo()
+        {
+        }
+
+        public void foo(int i, Collection c)
+        {
+        }
+
+        public String bar()
+        {
+            return null;
+        }
+
+        public String bar(String s, List l)
+        {
+            return "ha";
+        }
+    }
+
+    @Test
+    public void simple() {
+        LoggingProxy proxy = new LoggingProxy(new Foo(), 20);
+        IFoo foo = (IFoo)proxy.getProxy(IFoo.class);
+        foo.foo();
+        assertEquals(2, proxy.getBufferSize());
+        Assert.assertTrue(proxy.getBuffer().get(0).toString().matches(".*: foo\\(\\) entered$"));
+        Assert.assertTrue(proxy.getBuffer().get(1).toString().matches(".*: foo\\(\\) returned$"));
+
+        foo.foo(3, Arrays.asList(0, 1, 2));
+        assertEquals(4, proxy.getBufferSize());
+        Assert.assertTrue(proxy.getBuffer().get(2).toString().matches(".*: foo\\(\\[3, \\[0, 1, 2\\]\\]\\) entered$"));
+        Assert.assertTrue(proxy.getBuffer().get(3).toString().matches(".*: foo\\(\\) returned$"));
+
+        foo.bar();
+        assertEquals(6, proxy.getBufferSize());
+        Assert.assertTrue(proxy.getBuffer().get(4).toString().matches(".*: bar\\(\\) entered$"));
+        Assert.assertTrue(proxy.getBuffer().get(5).toString().matches(".*: bar\\(\\) returned null$"));
+
+        foo.bar("hello", Arrays.asList(1, 2, 3));
+        assertEquals(8, proxy.getBufferSize());
+        Assert.assertTrue(proxy.getBuffer().get(6).toString().matches(".*: bar\\(\\[hello, \\[1, 2, 3\\]\\]\\) entered$"));
+        Assert.assertTrue(proxy.getBuffer().get(7).toString().matches(".*: bar\\(\\) returned ha$"));
+
+        proxy.dump();
+    }
+
+    public static junit.framework.Test suite()
+    {
+        return new JUnit4TestAdapter(LoggingProxyTest.class);
+    }
+}
diff --git a/java/broker/src/test/java/org/apache/qpid/server/util/UnitTests.java b/java/broker/src/test/java/org/apache/qpid/server/util/UnitTests.java
new file mode 100644
index 0000000000..5314fa0df8
--- /dev/null
+++ b/java/broker/src/test/java/org/apache/qpid/server/util/UnitTests.java
@@ -0,0 +1,35 @@
+/*
+ *
+ * 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.util;
+
+import junit.framework.JUnit4TestAdapter;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({LoggingProxyTest.class})
+public class UnitTests
+{
+    public static junit.framework.Test suite()
+    {
+        return new JUnit4TestAdapter(UnitTests.class);
+    }
+}