[webbeans-commits] Webbeans SVN: r2662 - in ri/trunk/tests/src/test/java/org/jboss: webbeans/test/unit/xml/javaeepkg/foo and 1 other directory.

[webbeans-commits at lists.jboss.org]

Author: vitold
Date: 2009-05-07 06:36:37 -0400 (Thu, 07 May 2009)
New Revision: 2662

Modified:
   ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
   ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/foo/Order.java
Log:
fix some tests by deleting jdk6 features

Modified: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java	2009-05-07 10:36:09 UTC (rev 2661)
+++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java	2009-05-07 10:36:37 UTC (rev 2662)
@@ -2,6 +2,7 @@
 
 import java.util.Arrays;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import javax.context.Context;
@@ -61,7 +62,10 @@
       assert anotherStadtInstance != stadtInstance : "create() should not return same bean as before";
       
       // Verify that the instance returned is a proxy by checking for all local interfaces
-      Set<Class<?>> interfaces = new HashSet<Class<?>>(Arrays.asList(stadtInstance.getClass().getInterfaces()));
+      Class<?>[] classes = stadtInstance.getClass().getInterfaces();
+      List<Class<?>> classesList = Arrays.asList(classes);
+      Set<Class<?>> interfaces = new HashSet<Class<?>>(classesList);
+      
       assert interfaces.contains(KleinStadt.class);
       assert interfaces.contains(SchoeneStadt.class);
       //frankfurt.dispose();

Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/foo/Order.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/foo/Order.java	2009-05-07 10:36:09 UTC (rev 2661)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/foo/Order.java	2009-05-07 10:36:37 UTC (rev 2662)
@@ -11,7 +11,7 @@
 import javax.interceptor.InvocationContext;
 import javax.jms.Connection;
 import javax.persistence.EntityManager;
-import javax.sql.CommonDataSource;
+import javax.sql.DataSource;
 import javax.xml.ws.Binding;
 
 @Named("orderBean")
@@ -28,7 +28,7 @@
       this(0, new Date(), null, null, null, null, null, null, null);
    }
    
-   public Order(Integer integer, Date date, CommonDataSource source, InvocationContext invocation, Event e, ScheduleExpression schedule, 
+   public Order(Integer integer, Date date, DataSource source, InvocationContext invocation, Event e, ScheduleExpression schedule, 
          EntityManager entityManager, Binding binding, Connection conn)
    {
       this.integer = integer;