svn commit: r355757 - /geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java

[jg...@apache.org]

Author: jgenender
Date: Sat Dec 10 09:53:43 2005
New Revision: 355757

URL: http://svn.apache.org/viewcvs?rev=355757&view=rev
Log:
Fixed the test

Modified:
    geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java

Modified: geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java?rev=355757&r1=355756&r2=355757&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java (original)
+++ geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java Sat Dec 10 09:53:43 2005
@@ -25,6 +25,7 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Properties;
+import java.util.ArrayList;
 import java.util.Set;
 import javax.management.ObjectName;
 
@@ -49,6 +50,10 @@
 import org.apache.geronimo.tomcat.app.MockWebServiceContainer;
 import org.apache.geronimo.webservices.WebServiceContainer;
 
+import org.apache.geronimo.gbean.ReferenceCollection;
+import org.apache.geronimo.gbean.ReferenceCollectionEvent;
+import org.apache.geronimo.gbean.ReferenceCollectionListener;
+
 
 /**
  * @version $Rev$ $Date$
@@ -113,7 +118,7 @@
         tearDownWeb();
     }
 
-    public void XtestSecureWebServiceHandler() throws Exception {
+    public void testSecureWebServiceHandler() throws Exception {
 
         setUpWeb();
 
@@ -216,7 +221,7 @@
         propertiesRealmGBean.setReferencePattern("LoginModuleConfiguration", testUseName);
         propertiesRealmGBean.setReferencePattern("LoginService", loginServiceName);
         PrincipalInfo.PrincipalEditor principalEditor = new PrincipalInfo.PrincipalEditor();
-        principalEditor.setAsText("metro=org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal");
+        principalEditor.setAsText("metro,org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal,false");
         propertiesRealmGBean.setAttribute("defaultPrincipal", principalEditor.getValue());
 
         start(loginConfigurationGBean);
@@ -267,8 +272,8 @@
         start(host);
 
         //Default Engine
-//       ReferenceCollection hosts = new TestReferenceCollection();
-//       hosts.add(host);
+        ReferenceCollection hosts = new TestReferenceCollection();
+        hosts.add(host);
 
         initParams.clear();
         initParams.put("name", "Geronimo");
@@ -301,8 +306,8 @@
         stop(serverInfoName);
         kernel.shutdown();
     }
-/*
-   private static class TestReferenceCollection extends ArrayList implements ReferenceCollection {
+
+   private class TestReferenceCollection extends ArrayList implements ReferenceCollection {
 
        ReferenceCollectionListener referenceCollectionListener;
 
@@ -330,6 +335,15 @@
            return result;
        }
 
+        public ObjectName[] getMemberObjectNames() {
+            ObjectName names[] = new ObjectName[this.size()];
+            for(int i=0; i < this.size(); i++){
+                GBeanData data = (GBeanData)this.get(i);
+                names[i] = data.getName();
+            }
+            return names;
+    }
+
    }
-*/
+
 }