felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clem...@apache.org
Subject svn commit: r1467168 - /felix/trunk/ipojo/runtime/core/src/test/java/org/apache/felix/ipojo/handlers/dependency/SmartProxyTest.java
Date Fri, 12 Apr 2013 05:51:15 GMT
Author: clement
Date: Fri Apr 12 05:51:14 2013
New Revision: 1467168

URL: http://svn.apache.org/r1467168
Log:
Makes tests compatible with Java 5.

Modified:
    felix/trunk/ipojo/runtime/core/src/test/java/org/apache/felix/ipojo/handlers/dependency/SmartProxyTest.java

Modified: felix/trunk/ipojo/runtime/core/src/test/java/org/apache/felix/ipojo/handlers/dependency/SmartProxyTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core/src/test/java/org/apache/felix/ipojo/handlers/dependency/SmartProxyTest.java?rev=1467168&r1=1467167&r2=1467168&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core/src/test/java/org/apache/felix/ipojo/handlers/dependency/SmartProxyTest.java
(original)
+++ felix/trunk/ipojo/runtime/core/src/test/java/org/apache/felix/ipojo/handlers/dependency/SmartProxyTest.java
Fri Apr 12 05:51:14 2013
@@ -18,12 +18,8 @@
  */
 package org.apache.felix.ipojo.handlers.dependency;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import junit.framework.Assert;
 import junit.framework.TestCase;
-
 import org.apache.felix.ipojo.ComponentFactory;
 import org.apache.felix.ipojo.InstanceManager;
 import org.apache.felix.ipojo.test.MockBundle;
@@ -32,6 +28,9 @@ import org.mockito.Mockito;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class SmartProxyTest extends TestCase {
 
     public void setUp() {
@@ -122,12 +121,12 @@ public class SmartProxyTest extends Test
         dependency.stop();
 
         // Try with javax.sql.CommonDataSource
-        dependency = new Dependency(handler, "a_field", javax.sql.CommonDataSource.class,
null, false, false, false,
+        dependency = new Dependency(handler, "a_field", javax.sql.DataSource.class, null,
false, false, false,
                 true, "dep", context, Dependency.DYNAMIC_BINDING_POLICY, null, null);
         dependency.start();
         // OK
         Assert.assertNotNull(dependency.onGet(new Object(), "a_field", null));
-        Assert.assertTrue(dependency.onGet(new Object(), "a_field", null) instanceof javax.sql.CommonDataSource);
+        Assert.assertTrue(dependency.onGet(new Object(), "a_field", null) instanceof javax.sql.DataSource);
     }
 
 }



Mime
View raw message