[jboss-cvs] JBossAS SVN: r81246 - in projects/naming/trunk/jnpserver/src/test/java/org/jnp/test: support and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Nov 18 12:34:01 EST 2008
Author: adrian at jboss.org
Date: 2008-11-18 12:34:00 -0500 (Tue, 18 Nov 2008)
New Revision: 81246
Modified:
projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/NamingEventsUnitTest.java
projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/NamingMCUnitTest.java
projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/NamingServerSecurityManagerUnitTest.java
projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/NamingTestSuite.java
projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/SecurityUtil.java
projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/support/ClientSocketFactoryBean.java
projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/support/QueueEventListener.java
projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/support/ServerSocketFactoryBean.java
projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/support/TestSecurityManager.java
Log:
More tidyup
Modified: projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/NamingEventsUnitTest.java
===================================================================
--- projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/NamingEventsUnitTest.java 2008-11-18 17:33:47 UTC (rev 81245)
+++ projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/NamingEventsUnitTest.java 2008-11-18 17:34:00 UTC (rev 81246)
@@ -81,12 +81,12 @@
env.setProperty("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
env.setProperty("java.naming.factory.url.pkgs", "org.jnp.interfaces");
InitialContext ic = new InitialContext(env);
- System.out.println("Created InitialContext");
+ log.info("Created InitialContext");
Context ctx = (Context) ic.lookup("");
assertTrue("Context is an EventContext", ctx instanceof EventContext);
EventContext ectx = (EventContext) ctx;
ectx.addNamingListener("", EventContext.ONELEVEL_SCOPE, listener);
- System.out.println("Added NamingListener");
+ log.info("Added NamingListener");
ctx.bind("testAddObject", "testAddObject.bind");
assertTrue("Saw bind event", listener.waitOnEvent());
NamingEvent event = listener.getEvent(0);
@@ -129,12 +129,12 @@
env.setProperty("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
env.setProperty("java.naming.factory.url.pkgs", "org.jnp.interfaces");
InitialContext ic = new InitialContext(env);
- System.out.println("Created InitialContext");
+ log.info("Created InitialContext");
Context ctx = (Context) ic.lookup("");
assertTrue("Context is an EventContext", ctx instanceof EventContext);
EventContext ectx = (EventContext) ctx;
ectx.addNamingListener("", EventContext.SUBTREE_SCOPE, listener);
- System.out.println("Added NamingListener");
+ log.info("Added NamingListener");
ctx.bind("testAddObject", "testAddObject.bind");
assertTrue("Saw bind event", listener.waitOnEvent());
NamingEvent event = listener.getEvent(0);
Modified: projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/NamingMCUnitTest.java
===================================================================
--- projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/NamingMCUnitTest.java 2008-11-18 17:33:47 UTC (rev 81245)
+++ projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/NamingMCUnitTest.java 2008-11-18 17:34:00 UTC (rev 81246)
@@ -253,7 +253,7 @@
{
if(p instanceof JndiPermission)
{
- System.out.println(p);
+ getLog().info(p);
assertTrue(p+" is in expectedPerms", expectedPerms.contains(p));
}
}
Modified: projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/NamingServerSecurityManagerUnitTest.java
===================================================================
--- projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/NamingServerSecurityManagerUnitTest.java 2008-11-18 17:33:47 UTC (rev 81245)
+++ projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/NamingServerSecurityManagerUnitTest.java 2008-11-18 17:34:00 UTC (rev 81246)
@@ -66,7 +66,7 @@
protected void setUp() throws Exception
{
super.setUp();
- System.out.println("+++ setUp, creating NamingBean");
+ getLog().info("+++ setUp, creating NamingBean");
namingBean = new NamingBeanImpl();
namingBean.setInstallGlobalService(true);
namingBean.setUseGlobalService(false);
@@ -124,7 +124,7 @@
{
if(p instanceof JndiPermission)
{
- System.out.println(p);
+ getLog().info(p);
assertTrue(p+" is in expectedPerms", expectedPerms.contains(p));
}
}
Modified: projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/NamingTestSuite.java
===================================================================
--- projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/NamingTestSuite.java 2008-11-18 17:33:47 UTC (rev 81245)
+++ projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/NamingTestSuite.java 2008-11-18 17:34:00 UTC (rev 81246)
@@ -40,7 +40,7 @@
public static Test suite()
{
- TestSuite suite = new TestSuite("Controller Tests");
+ TestSuite suite = new TestSuite("Naming Tests");
suite.addTest(JndiPermissionUnitTest.suite());
suite.addTest(NamingEventsUnitTest.suite());
Modified: projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/SecurityUtil.java
===================================================================
--- projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/SecurityUtil.java 2008-11-18 17:33:47 UTC (rev 81245)
+++ projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/SecurityUtil.java 2008-11-18 17:34:00 UTC (rev 81246)
@@ -88,9 +88,9 @@
if(expectFailure)
fail("Was able to lookup path1x subcontext");
}
- catch(AccessControlException e)
+ catch(Exception e)
{
- System.out.println(e);
+ AbstractTestCase.checkThrowable(AccessControlException.class, e);
}
try
Modified: projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/support/ClientSocketFactoryBean.java
===================================================================
--- projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/support/ClientSocketFactoryBean.java 2008-11-18 17:33:47 UTC (rev 81245)
+++ projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/support/ClientSocketFactoryBean.java 2008-11-18 17:34:00 UTC (rev 81246)
@@ -26,6 +26,8 @@
import java.net.Socket;
import java.rmi.server.RMIClientSocketFactory;
+import org.jboss.logging.Logger;
+
/**
* @author Scott.Stark at jboss.org
* @version $Revision:$
@@ -33,11 +35,12 @@
public class ClientSocketFactoryBean
implements RMIClientSocketFactory, Serializable
{
+ private static final Logger log = Logger.getLogger(ClientSocketFactoryBean.class);
private static final long serialVersionUID = 1;
public Socket createSocket(String host, int port) throws IOException
{
- System.out.println("ClientSocketFactoryBean, createSocket host:"+host+", port:"+port);
+ log.info("ClientSocketFactoryBean, createSocket host:"+host+", port:"+port);
Socket s = new Socket(host, port);
s.setSoTimeout(5000);
return s;
Modified: projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/support/QueueEventListener.java
===================================================================
--- projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/support/QueueEventListener.java 2008-11-18 17:33:47 UTC (rev 81245)
+++ projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/support/QueueEventListener.java 2008-11-18 17:34:00 UTC (rev 81246)
@@ -30,6 +30,8 @@
import javax.naming.event.NamingExceptionEvent;
import javax.naming.event.ObjectChangeListener;
+import org.jboss.logging.Logger;
+
/**
* @author Scott.Stark at jboss.org
* @version $Revision:$
@@ -37,8 +39,10 @@
public class QueueEventListener implements ObjectChangeListener,
NamespaceChangeListener
{
+ private static final Logger log = Logger.getLogger(QueueEventListener.class);
private ArrayList<NamingEvent> events = new ArrayList<NamingEvent>();
private Semaphore eventCount = new Semaphore(0);
+ @SuppressWarnings("unused")
private NamingExceptionEvent ex;
public boolean waitOnEvent() throws InterruptedException
@@ -52,10 +56,10 @@
public void objectChanged(NamingEvent evt)
{
- System.out.println("Begin objectChanged, "+evt);
+ log.info("Begin objectChanged, "+evt);
events.add(evt);
eventCount.release();
- System.out.println("End objectChanged, "+evt);
+ log.info("End objectChanged, "+evt);
}
public void namingExceptionThrown(NamingExceptionEvent evt)
@@ -65,10 +69,10 @@
public void objectAdded(NamingEvent evt)
{
- System.out.println("Begin objectAdded, "+evt);
+ log.info("Begin objectAdded, "+evt);
events.add(evt);
eventCount.release();
- System.out.println("End objectAdded, "+evt);
+ log.info("End objectAdded, "+evt);
}
public void objectRemoved(NamingEvent evt)
Modified: projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/support/ServerSocketFactoryBean.java
===================================================================
--- projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/support/ServerSocketFactoryBean.java 2008-11-18 17:33:47 UTC (rev 81245)
+++ projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/support/ServerSocketFactoryBean.java 2008-11-18 17:34:00 UTC (rev 81246)
@@ -26,12 +26,15 @@
import java.net.ServerSocket;
import java.rmi.server.RMIServerSocketFactory;
+import org.jboss.logging.Logger;
+
/**
* @author Scott.Stark at jboss.org
* @version $Revision:$
*/
public class ServerSocketFactoryBean implements RMIServerSocketFactory
{
+ private static final Logger log = Logger.getLogger(ServerSocketFactoryBean.class);
private InetAddress rmiBindAddress;
private int backlog = 0;
@@ -59,7 +62,7 @@
public ServerSocket createServerSocket(int port) throws IOException
{
- System.out.println("ServerSocketFactoryBean, createServerSocket port: "+port+", bindAddr: "+rmiBindAddress);
+ log.info("ServerSocketFactoryBean, createServerSocket port: "+port+", bindAddr: "+rmiBindAddress);
ServerSocket ss = new ServerSocket(port, backlog, rmiBindAddress);
return ss;
}
Modified: projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/support/TestSecurityManager.java
===================================================================
--- projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/support/TestSecurityManager.java 2008-11-18 17:33:47 UTC (rev 81245)
+++ projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/support/TestSecurityManager.java 2008-11-18 17:34:00 UTC (rev 81246)
@@ -25,12 +25,15 @@
import java.util.HashSet;
import java.util.Set;
+import org.jboss.logging.Logger;
+
/**
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
public class TestSecurityManager extends SecurityManager
{
+ private static final Logger log = Logger.getLogger(TestSecurityManager.class);
/** The set of allowed test permissions */
HashSet<Permission> testPermissions = new HashSet<Permission>();
@@ -54,7 +57,7 @@
if(p.implies(perm))
return;
}
- System.out.println("checkPermission, "+perm);
+ log.info("checkPermission, "+perm);
super.checkPermission(perm);
}
}
More information about the jboss-cvs-commits
mailing list