You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/02/03 12:14:20 UTC
camel git commit: CAMEL-10780 Add test for DefaultFactoryFinder
Repository: camel
Updated Branches:
refs/heads/master 031570bad -> 0f9b93b03
CAMEL-10780 Add test for DefaultFactoryFinder
I was hoping on doing some refactoring of `DefaultFactoryFinder` but,
the functionality I was hoping on doing turned out not to need it. So at
the end I was left with this unit test for DefaultFactoryFinder that
could help someone refactoring in the future.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0f9b93b0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0f9b93b0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0f9b93b0
Branch: refs/heads/master
Commit: 0f9b93b037e8ebe7021d235b4bf03ded24c99b9f
Parents: 031570b
Author: Zoran Regvart <zo...@regvart.com>
Authored: Fri Feb 3 11:24:56 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Feb 3 13:14:13 2017 +0100
----------------------------------------------------------------------
camel-core/pom.xml | 6 +
.../camel/impl/DefaultFactoryFinderTest.java | 189 +++++++++++++++++++
.../resources/org/apache/camel/impl/TestImplA | 18 ++
.../resources/org/apache/camel/impl/TestImplB | 17 ++
.../org/apache/camel/impl/TestImplNoProperty | 17 ++
5 files changed, 247 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0f9b93b0/camel-core/pom.xml
----------------------------------------------------------------------
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index 1c55c61..e8bbbf4 100644
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -163,6 +163,12 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>java-hamcrest</artifactId>
+ <version>${hamcrest-version}</version>
+ <scope>test</scope>
+ </dependency>
<!-- logging -->
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/0f9b93b0/camel-core/src/test/java/org/apache/camel/impl/DefaultFactoryFinderTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/impl/DefaultFactoryFinderTest.java b/camel-core/src/test/java/org/apache/camel/impl/DefaultFactoryFinderTest.java
new file mode 100644
index 0000000..1d95049
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/impl/DefaultFactoryFinderTest.java
@@ -0,0 +1,189 @@
+/**
+ * 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.camel.impl;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.camel.NoFactoryAvailableException;
+import org.apache.camel.spi.ClassResolver;
+import org.apache.camel.spi.Injector;
+import org.junit.Test;
+
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.mock;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.hamcrest.Matchers.matchesPattern;
+import static org.hamcrest.core.IsCollectionContaining.hasItem;
+import static org.hamcrest.core.IsCollectionContaining.hasItems;
+import static org.hamcrest.core.IsInstanceOf.instanceOf;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+
+public class DefaultFactoryFinderTest {
+
+ public static class TestImplA implements TestType {
+ }
+
+ public static class TestImplB implements TestType {
+ }
+
+ public interface TestType {
+ }
+
+ private static final String TEST_RESOURCE_PATH = "/org/apache/camel/impl/";
+
+ final DefaultFactoryFinder factoryFinder = new DefaultFactoryFinder(new DefaultClassResolver(), TEST_RESOURCE_PATH);
+
+ @Test
+ public void shouldComplainIfClassResolverCannotResolveClass() throws IOException {
+ final ClassResolver classResolver = mock(ClassResolver.class);
+
+ final String properties = "class=" + TestImplA.class.getName();
+
+ expect(classResolver.loadResourceAsStream("/org/apache/camel/impl/TestImplA"))
+ .andReturn(new ByteArrayInputStream(properties.getBytes()));
+
+ expect(classResolver.resolveClass(TestImplA.class.getName())).andReturn(null);
+
+ replay(classResolver);
+
+ final DefaultFactoryFinder factoryFinder = new DefaultFactoryFinder(classResolver, TEST_RESOURCE_PATH);
+
+ try {
+ factoryFinder.findClass("TestImplA", null);
+ fail("Should have thrown ClassNotFoundException");
+ } catch (final ClassNotFoundException e) {
+ verify(classResolver);
+ assertEquals(TestImplA.class.getName(), e.getMessage());
+ }
+
+ }
+
+ @Test
+ public void shouldComplainIfInstanceTypeIsNotAsExpected() throws ClassNotFoundException, IOException {
+ final Injector injector = createMock(Injector.class);
+
+ final TestImplA expected = new TestImplA();
+ expect(injector.newInstance(TestImplA.class)).andReturn(expected);
+
+ replay(injector);
+
+ try {
+ factoryFinder.newInstances("TestImplA", injector, TestImplB.class);
+ fail("ClassCastException should have been thrown");
+ } catch (final ClassCastException e) {
+ final String message = e.getMessage();
+ assertThat(message,
+ matchesPattern("Not instanceof org\\.apache\\.camel\\.impl\\.DefaultFactoryFinderTest\\$TestImplB "
+ + "value: org\\.apache\\.camel\\.impl\\.DefaultFactoryFinderTest\\$TestImplA.*"));
+ }
+ }
+
+ @Test
+ public void shouldComplainIfUnableToCreateNewInstances() throws ClassNotFoundException, IOException {
+ try {
+ factoryFinder.newInstance("TestImplX");
+ fail("NoFactoryAvailableException should have been thrown");
+ } catch (final NoFactoryAvailableException e) {
+ assertEquals("Could not find factory class for resource: TestImplX", e.getMessage());
+ }
+ }
+
+ @Test
+ public void shouldComplainNoClassKeyInPropertyFile() throws ClassNotFoundException {
+ try {
+ factoryFinder.findClass("TestImplNoProperty");
+ fail("NoFactoryAvailableException should have been thrown");
+ } catch (final IOException e) {
+ assertEquals("Expected property is missing: class", e.getMessage());
+ }
+ }
+
+ @Test
+ public void shouldCreateNewInstances() throws ClassNotFoundException, IOException {
+ final Object instance = factoryFinder.newInstance("TestImplA");
+
+ assertThat(instance, instanceOf(TestImplA.class));
+ }
+
+ @Test
+ public void shouldCreateNewInstancesWithInjector() throws ClassNotFoundException, IOException {
+ final Injector injector = createMock(Injector.class);
+
+ final TestImplA expected = new TestImplA();
+ expect(injector.newInstance(TestImplA.class)).andReturn(expected);
+
+ replay(injector);
+
+ final List<TestType> instances = factoryFinder.newInstances("TestImplA", injector, TestType.class);
+
+ verify(injector);
+
+ assertEquals(1, instances.size());
+ assertThat(instances, hasItem(expected));
+
+ assertSame(expected, instances.get(0));
+ }
+
+ @Test
+ public void shouldFindSingleClass() throws ClassNotFoundException, IOException {
+ final Class<?> clazz = factoryFinder.findClass("TestImplA");
+
+ assertEquals(TestImplA.class, clazz);
+ }
+
+ @Test
+ public void shouldFindSingleClassFromClassMap() throws ClassNotFoundException, IOException {
+ final DefaultFactoryFinder factoryFinder = new DefaultFactoryFinder(null, null);
+ factoryFinder.classMap.putIfAbsent("prefixkey", TestImplA.class);
+
+ final Class<?> clazz = factoryFinder.findClass("key", "prefix");
+
+ assertEquals(TestImplA.class, clazz);
+ }
+
+ @Test
+ public void shouldFindSingleClassWithPropertyPrefix() throws ClassNotFoundException, IOException {
+ final Class<?> clazz = factoryFinder.findClass("TestImplA", "prefix.");
+
+ assertEquals(TestImplA.class, clazz);
+ }
+
+ @Test
+ public void shouldFindSingleClassWithPropertyPrefixAndExpectedType() throws ClassNotFoundException, IOException {
+ final Class<?> clazz = factoryFinder.findClass("TestImplA", "prefix.", TestType.class);
+
+ assertEquals(TestImplA.class, clazz);
+ }
+
+ URL urlFor(final Class<?> clazz) {
+ final String resourceName = clazz.getPackage().getName().replace('.', '/') + "/" + clazz.getSimpleName()
+ + ".properties";
+ final ClassLoader classLoader = clazz.getClassLoader();
+
+ return classLoader.getResource(resourceName);
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/0f9b93b0/camel-core/src/test/resources/org/apache/camel/impl/TestImplA
----------------------------------------------------------------------
diff --git a/camel-core/src/test/resources/org/apache/camel/impl/TestImplA b/camel-core/src/test/resources/org/apache/camel/impl/TestImplA
new file mode 100644
index 0000000..4e3f729
--- /dev/null
+++ b/camel-core/src/test/resources/org/apache/camel/impl/TestImplA
@@ -0,0 +1,18 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+class=org.apache.camel.impl.DefaultFactoryFinderTest$TestImplA
+prefix.class=org.apache.camel.impl.DefaultFactoryFinderTest$TestImplA
http://git-wip-us.apache.org/repos/asf/camel/blob/0f9b93b0/camel-core/src/test/resources/org/apache/camel/impl/TestImplB
----------------------------------------------------------------------
diff --git a/camel-core/src/test/resources/org/apache/camel/impl/TestImplB b/camel-core/src/test/resources/org/apache/camel/impl/TestImplB
new file mode 100644
index 0000000..2c7bec54
--- /dev/null
+++ b/camel-core/src/test/resources/org/apache/camel/impl/TestImplB
@@ -0,0 +1,17 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+class=org.apache.camel.impl.DefaultFactoryFinderTest$TestImplA
http://git-wip-us.apache.org/repos/asf/camel/blob/0f9b93b0/camel-core/src/test/resources/org/apache/camel/impl/TestImplNoProperty
----------------------------------------------------------------------
diff --git a/camel-core/src/test/resources/org/apache/camel/impl/TestImplNoProperty b/camel-core/src/test/resources/org/apache/camel/impl/TestImplNoProperty
new file mode 100644
index 0000000..e80aa88
--- /dev/null
+++ b/camel-core/src/test/resources/org/apache/camel/impl/TestImplNoProperty
@@ -0,0 +1,17 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+# there is no class key in this property file
\ No newline at end of file