camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r749573 - in /camel/branches/camel-1.x: ./ components/camel-osgi/src/test/java/org/apache/camel/osgi/ components/camel-osgi/src/test/java/org/apache/camel/osgi/test/
Date Tue, 03 Mar 2009 09:49:36 GMT
Author: ningjiang
Date: Tue Mar  3 09:49:35 2009
New Revision: 749573

URL: http://svn.apache.org/viewvc?rev=749573&view=rev
Log:
Merged revisions 749563-749564 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r749563 | ningjiang | 2009-03-03 16:20:30 +0800 (Tue, 03 Mar 2009) | 1 line
  
  Added the test for the OsgiAnnotationTypeConverterLoader
........
  r749564 | ningjiang | 2009-03-03 16:23:45 +0800 (Tue, 03 Mar 2009) | 1 line
  
  Fixed the test error with my last commit
........

Added:
    camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiAnnotationTypeConverterLoaderTest.java
      - copied, changed from r749564, camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiAnnotationTypeConverterLoaderTest.java
    camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/test/MockTypeConverterRegistry.java
      - copied, changed from r749564, camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/test/MockTypeConverterRegistry.java
Modified:
    camel/branches/camel-1.x/   (props changed)
    camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelOsgiTestSupport.java

Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  3 09:49:35 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564

Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelOsgiTestSupport.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelOsgiTestSupport.java?rev=749573&r1=749572&r2=749573&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelOsgiTestSupport.java
(original)
+++ camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelOsgiTestSupport.java
Tue Mar  3 09:49:35 2009
@@ -17,6 +17,7 @@
 package org.apache.camel.osgi;
 
 import junit.framework.TestCase;
+import org.osgi.framework.BundleContext;
 import org.springframework.osgi.mock.MockBundle;
 import org.springframework.osgi.mock.MockBundleContext;
 
@@ -38,5 +39,9 @@
     public Activator getActivator() {
         return testActivator;
     }
+    
+    public BundleContext getBundleContext() {
+        return bundleContext;
+    }
 
 }

Copied: camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiAnnotationTypeConverterLoaderTest.java
(from r749564, camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiAnnotationTypeConverterLoaderTest.java)
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiAnnotationTypeConverterLoaderTest.java?p2=camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiAnnotationTypeConverterLoaderTest.java&p1=camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiAnnotationTypeConverterLoaderTest.java&r1=749564&r2=749573&rev=749573&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiAnnotationTypeConverterLoaderTest.java
(original)
+++ camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiAnnotationTypeConverterLoaderTest.java
Tue Mar  3 09:49:35 2009
@@ -23,8 +23,7 @@
     public void testLoad() throws Exception {
         OsgiAnnotationTypeConverterLoader loader = new OsgiAnnotationTypeConverterLoader(getBundleContext());
         MockTypeConverterRegistry registry = new MockTypeConverterRegistry();
-        loader.load(registry);
-        assertEquals("There should have a fallback converter", registry.getFallbackTypeConverters().size(),
1);
+        loader.load(registry);        
         assertEquals("There should have a coverter", registry.getTypeConverters().size(),
1);
     }
 

Copied: camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/test/MockTypeConverterRegistry.java
(from r749564, camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/test/MockTypeConverterRegistry.java)
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/test/MockTypeConverterRegistry.java?p2=camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/test/MockTypeConverterRegistry.java&p1=camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/test/MockTypeConverterRegistry.java&r1=749564&r2=749573&rev=749573&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/test/MockTypeConverterRegistry.java
(original)
+++ camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/test/MockTypeConverterRegistry.java
Tue Mar  3 09:49:35 2009
@@ -20,29 +20,20 @@
 import java.util.List;
 
 import org.apache.camel.TypeConverter;
+import org.apache.camel.impl.converter.TypeConverterRegistry;
 import org.apache.camel.spi.Injector;
-import org.apache.camel.spi.TypeConverterRegistry;
 
 public class MockTypeConverterRegistry implements TypeConverterRegistry {
-    private List<TypeConverter> typeConverters = new ArrayList<TypeConverter>();
-    private List<TypeConverter> fallbackTypeConverters = new ArrayList<TypeConverter>();
+    private List<TypeConverter> typeConverters = new ArrayList<TypeConverter>();
   
     
     public List<TypeConverter> getTypeConverters() {
         return typeConverters;
     }
     
-    public List<TypeConverter> getFallbackTypeConverters() {
-        return fallbackTypeConverters;
-    }
-    
     public void addTypeConverter(Class toType, Class fromType, TypeConverter typeConverter)
{
         typeConverters.add(typeConverter);
     }
-
-    public void addFallbackTypeConverter(TypeConverter typeConverter) {
-        fallbackTypeConverters.add(typeConverter);
-    }
-
+    
     public TypeConverter lookup(Class toType, Class fromType) {       
         return null;
     }



Mime
View raw message