[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rhq-commits
Subject:    [rhq] Branch 'rhq-on-as7' - modules/enterprise modules/integration-tests
From:       mazz () fedoraproject ! org (mazz)
Date:       2012-09-27 16:19:19
Message-ID: 20120927161919.6CA55A2966 () fedorahosted ! org
[Download RAW message or body]

 modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java \
|   20 +++++++---  modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java \
|    3 +  2 files changed, 16 insertions(+), 7 deletions(-)

New commits:
commit 28f51ee2c5cf6362cd30546471b5393f9c202e80
Author: John Mazzitelli <mazz at redhat.com>
Date:   Thu Sep 27 12:19:10 2012 -0400

    have no idea if these tests work anymore, but we know for sure the JNDI names are \
different in AS7

diff --git a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java \
b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java
 index 302fa10..b35a939 100644
--- a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java
                
+++ b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java
 @@ -36,6 +36,8 @@ import org.rhq.bindings.StandardScriptPermissions;
 import org.rhq.bindings.util.PackageFinder;
 import org.rhq.core.domain.auth.Subject;
 import org.rhq.enterprise.client.LocalClient;
+import org.rhq.enterprise.server.RHQConstants;
+import org.rhq.enterprise.server.auth.SubjectManagerBean;
 import org.rhq.enterprise.server.test.AbstractEJB3Test;
 import org.rhq.enterprise.server.util.LookupUtil;
 import org.rhq.jndi.AllowRhqServerInternalsAccessPermission;
@@ -65,10 +67,13 @@ public class JndiAccessTest extends AbstractEJB3Test {
         
         ScriptEngine engine = getEngine(overlord);
         
+        String jndiName = "java:global/rhq/rhq-enterprise-server-ejb3/" + \
SubjectManagerBean.class.getSimpleName() +            + "!" + \
SubjectManagerBean.class.getName().replace("Bean", "Local"); +
         try {
             engine.eval(""
                 + "var ctx = new javax.naming.InitialContext();\n"
-                + "var subjectManager = ctx.lookup('SubjectManagerBean/local');\n"
+                + "var subjectManager = ctx.lookup('" + jndiName + "');\n"
                 + "subjectManager.getOverlord();");
             
             Assert.fail("The script shouldn't have been able to call local SLSB \
method."); @@ -81,11 +86,14 @@ public class JndiAccessTest extends AbstractEJB3Test {
         Subject overlord = LookupUtil.getSubjectManager().getOverlord();
         
         ScriptEngine engine = getEngine(overlord);
-        
+
+        String jndiName = "java:global/rhq/rhq-enterprise-server-ejb3/" + \
SubjectManagerBean.class.getSimpleName() +            + "!" + \
SubjectManagerBean.class.getName().replace("Bean", "Remote"); +
         try {
             engine.eval(""
                 + "var ctx = new javax.naming.InitialContext();\n"
-                + "var subjectManager = ctx.lookup('SubjectManagerBean/remote');\n"
+                + "var subjectManager = ctx.lookup('" + jndiName + "');\n"
                 + "subjectManager.getSubjectByName('rhqadmin');");
             
             Assert.fail("The script shouldn't have been able to call remote SLSB \
method directly."); @@ -134,7 +142,7 @@ public class JndiAccessTest extends \
AbstractEJB3Test {  try {
             engine.eval(""
                 + "var ctx = new javax.naming.InitialContext();\n"
-                + "var datasource = ctx.lookup('java:/RHQDS');\n"
+                + "var datasource = ctx.lookup('" + \
RHQConstants.DATASOURCE_JNDI_NAME + "');\n"  + "con = datasource.getConnection();");
             
             Assert.fail("The script shouldn't have been able to obtain the \
datasource from the JNDI."); @@ -151,7 +159,7 @@ public class JndiAccessTest extends \
AbstractEJB3Test {  try {
             engine.eval(""
                 + "var ctx = new javax.naming.InitialContext();\n"
-                + "var entityManagerFactory = \
ctx.lookup('java:/RHQEntityManagerFactory');\n" +                + "var \
entityManagerFactory = ctx.lookup('" + RHQConstants.ENTITY_MANAGER_JNDI_NAME + \
                "');\n"
                 + "var entityManager = \
                entityManagerFactory.createEntityManager();\n"
                 + "entityManager.find(java.lang.Class.forName('org.rhq.core.domain.resource.Resource'), \
java.lang.Integer.valueOf('10001'));");  
@@ -167,7 +175,7 @@ public class JndiAccessTest extends AbstractEJB3Test {
                 + "env.put('java.naming.factory.initial', \
                'org.jnp.interfaces.LocalOnlyContextFactory');"
                 + "env.put('java.naming.factory.url.pkgs', \
'org.jboss.naming:org.jnp.interfaces');"  + "var ctx = new \
                javax.naming.InitialContext(env);\n"
-                + "var entityManagerFactory = \
ctx.lookup('java:/RHQEntityManagerFactory');\n" +                + "var \
entityManagerFactory = ctx.lookup('" + RHQConstants.ENTITY_MANAGER_JNDI_NAME + \
                "');\n"
                 + "var entityManager = \
                entityManagerFactory.createEntityManager();\n"
                 + "entityManager.find(java.lang.Class.forName('org.rhq.core.domain.resource.Resource'), \
java.lang.Integer.valueOf('10001'));");  
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java \
b/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java
 index 3c4f530..9a422b4 100644
--- a/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java
                
+++ b/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java
 @@ -45,6 +45,7 @@ import org.rhq.bindings.StandardScriptPermissions;
 import org.rhq.bindings.util.PackageFinder;
 import org.rhq.core.domain.auth.Subject;
 import org.rhq.enterprise.client.LocalClient;
+import org.rhq.enterprise.server.RHQConstants;
 import org.rhq.enterprise.server.test.AbstractEJB3Test;
 import org.rhq.enterprise.server.util.LookupUtil;
 import org.rhq.jndi.AllowRhqServerInternalsAccessPermission;
@@ -143,7 +144,7 @@ public class JndiAccessTest extends AbstractEJB3Test {
         try {
             engine.eval(""
                 + "var ctx = new javax.naming.InitialContext();\n"
-                + "var entityManagerFactory = \
ctx.lookup('java:/RHQEntityManagerFactory');\n" +                + "var \
                entityManagerFactory = ctx.lookup('" + \
                RHQConstants.ENTITY_MANAGER_JNDI_NAME +"');\n"
                 + "var entityManager = \
                entityManagerFactory.createEntityManager();\n"
                 + "entityManager.find(java.lang.Class.forName('org.rhq.core.domain.resource.Resource'), \
java.lang.Integer.valueOf('10001'));");  


[prev in list] [next in list] [prev in thread] [next in thread]