You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/06/18 04:56:24 UTC
svn commit: r785878 - in /camel/trunk/components/camel-osgi: ./
src/test/java/org/apache/camel/osgi/
Author: ningjiang
Date: Thu Jun 18 02:56:24 2009
New Revision: 785878
URL: http://svn.apache.org/viewvc?rev=785878&view=rev
Log:
CAMEL-1712 Upgraded the camel-osgi to JUnit4
Modified:
camel/trunk/components/camel-osgi/pom.xml
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/ActivatorTest.java
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelOsgiTestSupport.java
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiAnnotationTypeConverterLoaderTest.java
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiFactoryFinderTest.java
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiLanguageResolverTest.java
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiPackageScanClassResolverTest.java
Modified: camel/trunk/components/camel-osgi/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/pom.xml?rev=785878&r1=785877&r2=785878&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/pom.xml (original)
+++ camel/trunk/components/camel-osgi/pom.xml Thu Jun 18 02:56:24 2009
@@ -73,12 +73,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<scope>test</scope>
Modified: camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/ActivatorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/ActivatorTest.java?rev=785878&r1=785877&r2=785878&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/ActivatorTest.java (original)
+++ camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/ActivatorTest.java Thu Jun 18 02:56:24 2009
@@ -17,12 +17,14 @@
package org.apache.camel.osgi;
import junit.framework.TestCase;
+import org.junit.Test;
import org.springframework.osgi.mock.MockBundle;
import org.springframework.osgi.mock.MockBundleContext;
public class ActivatorTest extends CamelOsgiTestSupport {
-
+
+ @Test
public void testGetComponent() throws Exception {
Class clazz = Activator.getComponent("timer");
assertNull("Here should not find the timer component", clazz);
@@ -33,6 +35,7 @@
}
+ @Test
public void testGetLanaguge() throws Exception {
Class clazz = Activator.getLanguage("bean_test");
assertNotNull("The bean_test component should not be null", clazz);
@@ -47,6 +50,7 @@
return false;
}
+ @Test
public void testFindTypeConverterPackageNames() throws Exception {
String[] packages = Activator.findTypeConverterPackageNames();
assertTrue("We should find some converter packages here", packages.length > 0);
Modified: camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelOsgiTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelOsgiTestSupport.java?rev=785878&r1=785877&r2=785878&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelOsgiTestSupport.java (original)
+++ camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelOsgiTestSupport.java Thu Jun 18 02:56:24 2009
@@ -17,22 +17,27 @@
package org.apache.camel.osgi;
import junit.framework.TestCase;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
import org.osgi.framework.BundleContext;
import org.springframework.osgi.mock.MockBundle;
import org.springframework.osgi.mock.MockBundleContext;
-public class CamelOsgiTestSupport extends TestCase {
+public class CamelOsgiTestSupport extends Assert {
private Activator testActivator;
private MockBundleContext bundleContext = new MockBundleContext();
private OsgiPackageScanClassResolver resolver = new OsgiPackageScanClassResolver(bundleContext);
private MockBundle bundle = new CamelMockBundle();
+ @Before
public void setUp() throws Exception {
bundleContext.setBundle(bundle);
testActivator = new Activator();
testActivator.start(bundleContext);
}
+ @After
public void tearDown() throws Exception {
testActivator.stop(bundleContext);
}
Modified: camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiAnnotationTypeConverterLoaderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiAnnotationTypeConverterLoaderTest.java?rev=785878&r1=785877&r2=785878&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiAnnotationTypeConverterLoaderTest.java (original)
+++ camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiAnnotationTypeConverterLoaderTest.java Thu Jun 18 02:56:24 2009
@@ -17,9 +17,11 @@
package org.apache.camel.osgi;
import org.apache.camel.osgi.test.MockTypeConverterRegistry;
+import org.junit.Test;
public class OsgiAnnotationTypeConverterLoaderTest extends CamelOsgiTestSupport {
+ @Test
public void testLoad() throws Exception {
OsgiAnnotationTypeConverterLoader loader = new OsgiAnnotationTypeConverterLoader(getResolver());
MockTypeConverterRegistry registry = new MockTypeConverterRegistry();
Modified: camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiFactoryFinderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiFactoryFinderTest.java?rev=785878&r1=785877&r2=785878&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiFactoryFinderTest.java (original)
+++ camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiFactoryFinderTest.java Thu Jun 18 02:56:24 2009
@@ -20,8 +20,10 @@
import org.apache.camel.NoFactoryAvailableException;
import org.apache.camel.impl.DefaultClassResolver;
+import org.junit.Test;
public class OsgiFactoryFinderTest extends CamelOsgiTestSupport {
+ @Test
public void testFindClass() throws Exception {
OsgiFactoryFinder finder = new OsgiFactoryFinder(new DefaultClassResolver(), "META-INF/services/org/apache/camel/component/");
Class clazz = finder.findClass("file_test", "strategy.factory.");
Modified: camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiLanguageResolverTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiLanguageResolverTest.java?rev=785878&r1=785877&r2=785878&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiLanguageResolverTest.java (original)
+++ camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiLanguageResolverTest.java Thu Jun 18 02:56:24 2009
@@ -21,9 +21,11 @@
import org.apache.camel.CamelContext;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.spi.Language;
+import org.junit.Test;
import org.osgi.framework.BundleContext;
public class OsgiLanguageResolverTest extends CamelOsgiTestSupport {
+ @Test
public void testOsgiResolverFindLanguageTest() throws IOException {
BundleContext context = getActivator().getBundle().getBundleContext();
CamelContext camelContext = new DefaultCamelContext();
Modified: camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiPackageScanClassResolverTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiPackageScanClassResolverTest.java?rev=785878&r1=785877&r2=785878&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiPackageScanClassResolverTest.java (original)
+++ camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiPackageScanClassResolverTest.java Thu Jun 18 02:56:24 2009
@@ -23,9 +23,11 @@
import org.apache.camel.Routes;
import org.apache.camel.osgi.test.MyRouteBuilder;
import org.apache.camel.osgi.test.MyTypeConverter;
+import org.junit.Test;
import org.osgi.framework.BundleContext;
public class OsgiPackageScanClassResolverTest extends CamelOsgiTestSupport {
+ @Test
public void testOsgiResolverFindAnnotatedTest() throws IOException {
BundleContext context = getActivator().getBundle().getBundleContext();
OsgiPackageScanClassResolver resolver = new OsgiPackageScanClassResolver(context);
@@ -35,7 +37,8 @@
assertEquals("There should find a class", classes.size(), 1);
assertTrue("Find a wrong class", classes.contains(MyTypeConverter.class));
}
-
+
+ @Test
public void testOsgiResolverFindImplementationTest() {
BundleContext context = getActivator().getBundle().getBundleContext();
OsgiPackageScanClassResolver resolver = new OsgiPackageScanClassResolver(context);