Author: tveronezi
Date: Thu Mar 29 11:44:44 2012
New Revision: 1306790
URL: http://svn.apache.org/viewvc?rev=1306790&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-142
(in progress task)
-improving unit test
Added:
openejb/trunk/openejb/tomee/tomee-loader/src/test/java/org/apache/tomee/loader/test/EmptyEjb.java
- copied, changed from r1306283,
openejb/trunk/openejb/tomee/tomee-loader/src/test/java/org/apache/tomee/loader/test/DummyEjb.java
Modified:
openejb/trunk/openejb/tomee/tomee-loader/src/test/java/org/apache/tomee/loader/test/DummyEjb.java
openejb/trunk/openejb/tomee/tomee-loader/src/test/java/org/apache/tomee/loader/test/UserSessionTest.java
Modified:
openejb/trunk/openejb/tomee/tomee-loader/src/test/java/org/apache/tomee/loader/test/DummyEjb.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-loader/src/test/java/org/apache/tomee/loader/test/DummyEjb.java?rev=1306790&r1=1306789&r2=1306790&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-loader/src/test/java/org/apache/tomee/loader/test/DummyEjb.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-loader/src/test/java/org/apache/tomee/loader/test/DummyEjb.java
Thu Mar 29 11:44:44 2012
@@ -1,3 +1,19 @@
+/**
+ * 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.tomee.loader.test;
import javax.ejb.Stateless;
Copied:
openejb/trunk/openejb/tomee/tomee-loader/src/test/java/org/apache/tomee/loader/test/EmptyEjb.java
(from r1306283,
openejb/trunk/openejb/tomee/tomee-loader/src/test/java/org/apache/tomee/loader/test/DummyEjb.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-loader/src/test/java/org/apache/tomee/loader/test/EmptyEjb.java?p2=openejb/trunk/openejb/tomee/tomee-loader/src/test/java/org/apache/tomee/loader/test/EmptyEjb.java&p1=openejb/trunk/openejb/tomee/tomee-loader/src/test/java/org/apache/tomee/loader/test/DummyEjb.java&r1=1306283&r2=1306790&rev=1306790&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-loader/src/test/java/org/apache/tomee/loader/test/DummyEjb.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-loader/src/test/java/org/apache/tomee/loader/test/EmptyEjb.java
Thu Mar 29 11:44:44 2012
@@ -1,11 +1,27 @@
+/**
+ * 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.tomee.loader.test;
import javax.ejb.Stateless;
@Stateless
-public class DummyEjb {
+public class EmptyEjb {
- public String sayHi() {
- return "Hi, buddy!";
+ public void voidMethod() {
+ //really nothing to do.
}
}
Modified:
openejb/trunk/openejb/tomee/tomee-loader/src/test/java/org/apache/tomee/loader/test/UserSessionTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-loader/src/test/java/org/apache/tomee/loader/test/UserSessionTest.java?rev=1306790&r1=1306789&r2=1306790&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-loader/src/test/java/org/apache/tomee/loader/test/UserSessionTest.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-loader/src/test/java/org/apache/tomee/loader/test/UserSessionTest.java
Thu Mar 29 11:44:44 2012
@@ -23,6 +23,8 @@ import org.junit.Test;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -46,9 +48,75 @@ public class UserSessionTest {
org.junit.Assert.assertNotNull(result);
org.junit.Assert.assertFalse(result.isEmpty());
+ final List<String> names = new ArrayList<String>();
+ mountPathsList(names, new ArrayList<String>(), result);
+
System.out.println("*******************************************");
System.out.println(result);
System.out.println("*******************************************");
+ for (String name : names) {
+ System.out.println(name);
+ }
+ System.out.println("*******************************************");
+ for (String name : names) {
+ Object srv = null;
+ try {
+ srv = service.getOpenEJBHelper().lookup(name);
+ } catch (NamingException e) {
+ System.out.println(name + " (NOT FOUND) ");
+ }
+
+ if (DummyEjb.class.isInstance(srv)) {
+ final DummyEjb dummyEjb = DummyEjb.class.cast(srv);
+
+ System.out.println(name + " -> " + dummyEjb.sayHi());
+ } else {
+ if (srv != null) {
+ System.out.println(name);
+ }
+ }
+ }
+ System.out.println("*******************************************");
+ }
+
+ private void mountPathsList(final List<String> names, final List<String>
path, final Map<String, Object> jndiEntry) {
+ if ("module".equals(jndiEntry.get("type"))) {
+ return;
+ }
+
+ final List<String> innerPath = new ArrayList<String>(path);
+
+ if ("context".equals(jndiEntry.get("type"))) {
+ innerPath.add((String) jndiEntry.get("path"));
+
+ } else if ("leaf".equals(jndiEntry.get("type"))) {
+ if ("/AppName".equals(jndiEntry.get("path"))
+ || "/ModuleName".equals(jndiEntry.get("path"))) {
+ return;
+ }
+
+ String[] entryPaths = ((String) jndiEntry.get("path")).split("/");
+ String leafName = entryPaths[entryPaths.length - 1];
+
+ StringBuffer resultingPath = new StringBuffer();
+ for (String pathEntry : path) {
+ resultingPath.append(pathEntry);
+ resultingPath.append("/");
+ }
+ resultingPath.append(leafName);
+
+ names.add(resultingPath.toString());
+ return;
+ }
+
+ List<Map<String, Object>> jndiEntries = (List<Map<String, Object>>)
jndiEntry.get("children");
+ if (jndiEntries != null && !jndiEntries.isEmpty()) {
+
+ for (Map<String, Object> child : jndiEntries) {
+ mountPathsList(names, innerPath, child);
+ }
+ }
+
}
}
