svn commit: r1406476 - in /openejb/trunk/openejb/server/openejb-server/src: main/java/org/apache/openejb/server/ test/java/org/apache/openejb/server/

[rm...@apache.org]

Author: rmannibucau
Date: Wed Nov  7 06:49:33 2012
New Revision: 1406476

URL: http://svn.apache.org/viewvc?rev=1406476&view=rev
Log:
tests for filtered service manager

Added:
    openejb/trunk/openejb/server/openejb-server/src/test/java/org/apache/openejb/server/FilteredServiceManagerDefaultsTest.java
    openejb/trunk/openejb/server/openejb-server/src/test/java/org/apache/openejb/server/FilteredServiceManagerWithAdminTest.java
      - copied, changed from r1406475, openejb/trunk/openejb/server/openejb-server/src/test/java/org/apache/openejb/server/FilteredServiceManagerTest.java
Modified:
    openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/FilteredServiceManager.java
    openejb/trunk/openejb/server/openejb-server/src/test/java/org/apache/openejb/server/FilteredServiceManagerTest.java

Modified: openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/FilteredServiceManager.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/FilteredServiceManager.java?rev=1406476&r1=1406475&r2=1406476&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/FilteredServiceManager.java (original)
+++ openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/FilteredServiceManager.java Wed Nov  7 06:49:33 2012
@@ -16,7 +16,10 @@
  */
 package org.apache.openejb.server;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * This implementation is mainly used in the application composer to get the most from
@@ -56,6 +59,7 @@ public class FilteredServiceManager exte
         return services.isEmpty() || services.contains(serviceName);
     }
 
+    // used by reflection
     public static void initServiceManager(String[] services) {
         setServiceManager(new FilteredServiceManager(services));
     }

Added: openejb/trunk/openejb/server/openejb-server/src/test/java/org/apache/openejb/server/FilteredServiceManagerDefaultsTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-server/src/test/java/org/apache/openejb/server/FilteredServiceManagerDefaultsTest.java?rev=1406476&view=auto
==============================================================================
--- openejb/trunk/openejb/server/openejb-server/src/test/java/org/apache/openejb/server/FilteredServiceManagerDefaultsTest.java (added)
+++ openejb/trunk/openejb/server/openejb-server/src/test/java/org/apache/openejb/server/FilteredServiceManagerDefaultsTest.java Wed Nov  7 06:49:33 2012
@@ -0,0 +1,53 @@
+/*
+ *     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.openejb.server;
+
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.junit.ApplicationComposer;
+import org.apache.openejb.junit.EnableServices;
+import org.apache.openejb.junit.Module;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * This test aims at testing the filtering feature on services.
+ * Basically, this test does not do a lot of stuff except declaring only one service
+ * and looking through the service if there is only one service.
+ */
+@EnableServices
+@RunWith(ApplicationComposer.class)
+public class FilteredServiceManagerDefaultsTest {
+
+    @Module
+    public EjbJar jar() {
+        return new EjbJar();
+    }
+
+    @Test
+    public void numberOfServices () {
+        // when using @EnableServices with the application composer
+        // the return value should be a FilteredServiceManager
+        assertEquals(FilteredServiceManager.class, ServiceManager.get().getClass());
+
+        FilteredServiceManager manager = (FilteredServiceManager) ServiceManager.get();
+        assertEquals(1, manager.getDaemons().length);
+        assertEquals("admin", manager.getDaemons()[0].getName());
+    }
+
+}

Modified: openejb/trunk/openejb/server/openejb-server/src/test/java/org/apache/openejb/server/FilteredServiceManagerTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-server/src/test/java/org/apache/openejb/server/FilteredServiceManagerTest.java?rev=1406476&r1=1406475&r2=1406476&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-server/src/test/java/org/apache/openejb/server/FilteredServiceManagerTest.java (original)
+++ openejb/trunk/openejb/server/openejb-server/src/test/java/org/apache/openejb/server/FilteredServiceManagerTest.java Wed Nov  7 06:49:33 2012
@@ -16,41 +16,34 @@
  */
 package org.apache.openejb.server;
 
-import junit.framework.Assert;
-import org.apache.openejb.jee.EjbJar;
-import org.apache.openejb.junit.ApplicationComposer;
-import org.apache.openejb.junit.EnableServices;
-import org.apache.openejb.junit.Module;
-import org.junit.Ignore;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
-import javax.ws.rs.core.Application;
+import static org.junit.Assert.assertTrue;
 
-/**
- * This test aims at testing the filtering feature on services.
- * Basically, this test does not do a lot of stuff except declaring only one service
- * and looking through the service if there is only one service.
- */
-@EnableServices("cxf-rs")
-@RunWith(ApplicationComposer.class)
 public class FilteredServiceManagerTest {
+    @Test
+    public void checkJaxRs() {
+        final FilteredServiceManager fsm = new FilteredServiceManager(new String[] { "jaxrs" });
+        assertTrue(fsm.accept("httpejbd"));
+        assertTrue(fsm.accept("cxf-rs"));
+    }
 
-    @Module
-    public EjbJar war() {
-        return new EjbJar();
+    @Test
+    public void checkJaxWs() {
+        final FilteredServiceManager fsm = new FilteredServiceManager(new String[] { "jaxws" });
+        assertTrue(fsm.accept("httpejbd"));
+        assertTrue(fsm.accept("cxf"));
     }
 
-    //@Test
-    @Ignore
-    public void numberOfServices () {
-        // when using @EnableServices with the application composer
-        // the return value should be a FilteredServiceManager
-        Assert.assertEquals(FilteredServiceManager.class, ServiceManager.get().getClass());
-
-        FilteredServiceManager manager = (FilteredServiceManager) ServiceManager.get();
-        Assert.assertEquals(1, manager.getDaemons().length);
-        Assert.assertEquals("jax-rs", manager.getDaemons()[0].getName());
+    @Test
+    public void checkEjbd() {
+        final FilteredServiceManager fsm = new FilteredServiceManager(new String[] { "ejbd" });
+        assertTrue(fsm.accept("httpejbd"));
     }
 
+    @Test
+    public void checkDefault() {
+        final FilteredServiceManager fsm = new FilteredServiceManager(new String[] { "foo" });
+        assertTrue(fsm.accept("foo"));
+    }
 }

Copied: openejb/trunk/openejb/server/openejb-server/src/test/java/org/apache/openejb/server/FilteredServiceManagerWithAdminTest.java (from r1406475, openejb/trunk/openejb/server/openejb-server/src/test/java/org/apache/openejb/server/FilteredServiceManagerTest.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-server/src/test/java/org/apache/openejb/server/FilteredServiceManagerWithAdminTest.java?p2=openejb/trunk/openejb/server/openejb-server/src/test/java/org/apache/openejb/server/FilteredServiceManagerWithAdminTest.java&p1=openejb/trunk/openejb/server/openejb-server/src/test/java/org/apache/openejb/server/FilteredServiceManagerTest.java&r1=1406475&r2=1406476&rev=1406476&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-server/src/test/java/org/apache/openejb/server/FilteredServiceManagerTest.java (original)
+++ openejb/trunk/openejb/server/openejb-server/src/test/java/org/apache/openejb/server/FilteredServiceManagerWithAdminTest.java Wed Nov  7 06:49:33 2012
@@ -16,41 +16,38 @@
  */
 package org.apache.openejb.server;
 
-import junit.framework.Assert;
 import org.apache.openejb.jee.EjbJar;
 import org.apache.openejb.junit.ApplicationComposer;
 import org.apache.openejb.junit.EnableServices;
 import org.apache.openejb.junit.Module;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import javax.ws.rs.core.Application;
+import static org.junit.Assert.assertEquals;
 
 /**
  * This test aims at testing the filtering feature on services.
  * Basically, this test does not do a lot of stuff except declaring only one service
  * and looking through the service if there is only one service.
  */
-@EnableServices("cxf-rs")
+@EnableServices("admin")
 @RunWith(ApplicationComposer.class)
-public class FilteredServiceManagerTest {
+public class FilteredServiceManagerWithAdminTest {
 
     @Module
-    public EjbJar war() {
+    public EjbJar jar() {
         return new EjbJar();
     }
 
-    //@Test
-    @Ignore
+    @Test
     public void numberOfServices () {
         // when using @EnableServices with the application composer
         // the return value should be a FilteredServiceManager
-        Assert.assertEquals(FilteredServiceManager.class, ServiceManager.get().getClass());
+        assertEquals(FilteredServiceManager.class, ServiceManager.get().getClass());
 
         FilteredServiceManager manager = (FilteredServiceManager) ServiceManager.get();
-        Assert.assertEquals(1, manager.getDaemons().length);
-        Assert.assertEquals("jax-rs", manager.getDaemons()[0].getName());
+        assertEquals(1, manager.getDaemons().length);
+        assertEquals("admin", manager.getDaemons()[0].getName());
     }
 
 }