modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java
| 26 +++++-----
modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java
| 15 ++---
2 files changed, 19 insertions(+), 22 deletions(-)
New commits:
commit cb78bd893aa614d0fcc5760f2a25a73175fe6c2e
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Fri Feb 3 14:12:51 2012 +0100
update the JNDI access tests to not use the "context" variable which seems
to be predefined.
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 f6772e5..06fc76a 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
@@ -67,8 +67,8 @@ public class JndiAccessTest extends AbstractEJB3Test {
try {
engine.eval(""
- + "context = new javax.naming.InitialContext();\n"
- + "subjectManager =
context.lookup('SubjectManagerBean/local');\n"
+ + "var ctx = new javax.naming.InitialContext();\n"
+ + "var subjectManager =
ctx.lookup('SubjectManagerBean/local');\n"
+ "subjectManager.getOverlord();");
Assert.fail("The script shouldn't have been able to call local SLSB
method.");
@@ -84,8 +84,8 @@ public class JndiAccessTest extends AbstractEJB3Test {
try {
engine.eval(""
- + "context = new javax.naming.InitialContext();\n"
- + "subjectManager =
context.lookup('SubjectManagerBean/remote');\n"
+ + "var ctx = new javax.naming.InitialContext();\n"
+ + "var subjectManager =
ctx.lookup('SubjectManagerBean/remote');\n"
+ "subjectManager.getSubjectByName('rhqadmin');");
Assert.fail("The script shouldn't have been able to call remote SLSB
method directly.");
@@ -133,8 +133,8 @@ public class JndiAccessTest extends AbstractEJB3Test {
try {
engine.eval(""
- + "context = new javax.naming.InitialContext();\n"
- + "datasource = context.lookup('java:/RHQDS');\n"
+ + "var ctx = new javax.naming.InitialContext();\n"
+ + "var datasource = ctx.lookup('java:/RHQDS');\n"
+ "con = datasource.getConnection();");
Assert.fail("The script shouldn't have been able to obtain the
datasource from the JNDI.");
@@ -150,9 +150,9 @@ public class JndiAccessTest extends AbstractEJB3Test {
try {
engine.eval(""
- + "context = new javax.naming.InitialContext();\n"
- + "entityManagerFactory =
context.lookup('java:/RHQEntityManagerFactory');\n"
- + "entityManager =
entityManagerFactory.createEntityManager();\n"
+ + "var ctx = new javax.naming.InitialContext();\n"
+ + "var entityManagerFactory =
ctx.lookup('java:/RHQEntityManagerFactory');\n"
+ + "var entityManager =
entityManagerFactory.createEntityManager();\n"
+
"entityManager.find(java.lang.Class.forName('org.rhq.core.domain.resource.Resource'),
java.lang.Integer.valueOf('10001'));");
Assert.fail("The script shouldn't have been able to use the
EntityManager.");
@@ -163,12 +163,12 @@ public class JndiAccessTest extends AbstractEJB3Test {
//try harder with manually specifying the initial context factory
try {
engine.eval(""
- + "env = new java.util.Hashtable();"
+ + "var env = new java.util.Hashtable();"
+ "env.put('java.naming.factory.initial',
'org.jnp.interfaces.LocalOnlyContextFactory');"
+ "env.put('java.naming.factory.url.pkgs',
'org.jboss.naming:org.jnp.interfaces');"
- + "context = new javax.naming.InitialContext(env);\n"
- + "entityManagerFactory =
context.lookup('java:/RHQEntityManagerFactory');\n"
- + "entityManager =
entityManagerFactory.createEntityManager();\n"
+ + "var ctx = new javax.naming.InitialContext(env);\n"
+ + "var entityManagerFactory =
ctx.lookup('java:/RHQEntityManagerFactory');\n"
+ + "var entityManager =
entityManagerFactory.createEntityManager();\n"
+
"entityManager.find(java.lang.Class.forName('org.rhq.core.domain.resource.Resource'),
java.lang.Integer.valueOf('10001'));");
Assert.fail("The script shouldn't have been able to use the
EntityManager even using custom initial context factory.");
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 c6140a0..3c4f530 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
@@ -24,8 +24,6 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintWriter;
-import java.io.SerializablePermission;
-import java.security.PermissionCollection;
import java.util.Collections;
import java.util.Properties;
@@ -41,7 +39,6 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.Parameters;
import org.testng.annotations.Test;
-import org.rhq.bindings.SandboxedScriptEngine;
import org.rhq.bindings.ScriptEngineFactory;
import org.rhq.bindings.StandardBindings;
import org.rhq.bindings.StandardScriptPermissions;
@@ -145,9 +142,9 @@ public class JndiAccessTest extends AbstractEJB3Test {
try {
engine.eval(""
- + "context = new javax.naming.InitialContext();\n"
- + "entityManagerFactory =
context.lookup('java:/RHQEntityManagerFactory');\n"
- + "entityManager =
entityManagerFactory.createEntityManager();\n"
+ + "var ctx = new javax.naming.InitialContext();\n"
+ + "var entityManagerFactory =
ctx.lookup('java:/RHQEntityManagerFactory');\n"
+ + "var entityManager =
entityManagerFactory.createEntityManager();\n"
+
"entityManager.find(java.lang.Class.forName('org.rhq.core.domain.resource.Resource'),
java.lang.Integer.valueOf('10001'));");
Assert.fail("The script shouldn't have been able to use the
EntityManager.");
@@ -164,11 +161,11 @@ public class JndiAccessTest extends AbstractEJB3Test {
try {
engine.eval(""
- + "env = new java.util.Hashtable();"
+ + "var env = new java.util.Hashtable();"
+ "env.put('java.naming.factory.initial',
'org.jboss.naming.NamingContextFactory');"
+ "env.put('java.naming.provider.url',
'jnp://localhost:" + jnpPort + "');"
- + "context = new javax.naming.InitialContext(env);\n"
- + "kachny = context.lookup('kachny');\n"
+ + "var ctx = new javax.naming.InitialContext(env);\n"
+ + "var kachny = ctx.lookup('kachny');\n"
+ "assertNotNull(kachny);\n");
} catch (ScriptException e) {
Assert.fail("The script should have been able to access a remote JNDI
server.", e);
Show replies by date