Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'jetty-plus/src/test/java/org/eclipse/jetty/plus/jndi/TestNamingEntries.java')
-rw-r--r--jetty-plus/src/test/java/org/eclipse/jetty/plus/jndi/TestNamingEntries.java160
1 files changed, 62 insertions, 98 deletions
diff --git a/jetty-plus/src/test/java/org/eclipse/jetty/plus/jndi/TestNamingEntries.java b/jetty-plus/src/test/java/org/eclipse/jetty/plus/jndi/TestNamingEntries.java
index b2a85af440..d18998b5b2 100644
--- a/jetty-plus/src/test/java/org/eclipse/jetty/plus/jndi/TestNamingEntries.java
+++ b/jetty-plus/src/test/java/org/eclipse/jetty/plus/jndi/TestNamingEntries.java
@@ -4,19 +4,17 @@
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
-// The Eclipse Public License is available at
+// The Eclipse Public License is available at
// http://www.eclipse.org/legal/epl-v10.html
// The Apache License v2.0 is available at
// http://www.opensource.org/licenses/apache2.0.php
-// You may elect to redistribute this code under either of these licenses.
+// You may elect to redistribute this code under either of these licenses.
// ========================================================================
package org.eclipse.jetty.plus.jndi;
-
import java.util.Hashtable;
import java.util.List;
-
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.Name;
@@ -27,138 +25,110 @@ import javax.naming.Referenceable;
import javax.naming.StringRefAddr;
import javax.naming.spi.ObjectFactory;
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
/**
- * TestEnvEntry
- *
*
*/
-public class TestNamingEntries extends TestCase
+public class TestNamingEntries
{
- public class ScopeA extends Object
+ public class ScopeA
{
public String toString()
{
return this.getClass().getName()+"@"+super.hashCode();
}
}
-
+
public class ScopeB extends ScopeA
- {}
-
-
-
+ {
+ }
+
public static class SomeObject
{
private int value;
public SomeObject (int value)
{this.value = value;}
-
+
public int getValue ()
{
return this.value;
}
}
-
+
public static class SomeObjectFactory implements ObjectFactory
{
-
public SomeObjectFactory()
{
-
}
- /**
- * @see javax.naming.spi.ObjectFactory#getObjectInstance(java.lang.Object, javax.naming.Name, javax.naming.Context, java.util.Hashtable)
- * @param arg0
- * @param arg1
- * @param arg2
- * @param arg3
- * @return the object instance
- * @throws Exception
- */
+
public Object getObjectInstance(Object arg0, Name arg1, Context arg2, Hashtable arg3) throws Exception
{
Reference ref = (Reference)arg0;
-
+
RefAddr refAddr = ref.get(0);
String valueName = refAddr.getType();
if (!valueName.equalsIgnoreCase("val"))
throw new RuntimeException("Unrecognized refaddr type = "+valueName);
-
+
String value = (String)refAddr.getContent();
-
+
return new SomeObject(Integer.parseInt(value.trim()));
-
}
-
}
-
+
public static class SomeOtherObject extends SomeObject implements Referenceable
{
-
- private String svalue;
public SomeOtherObject (String value)
{
super(Integer.parseInt(value.trim()));
-
}
-
- /**
- * @see javax.naming.Referenceable#getReference()
- * @return the reference
- * @throws NamingException
- */
+
public Reference getReference() throws NamingException
{
RefAddr refAddr = new StringRefAddr("val", String.valueOf(getValue()));
- Reference ref = new Reference(SomeOtherObject.class.getName(), refAddr, SomeOtherObjectFactory.class.getName(), null);
- return ref;
+ return new Reference(SomeOtherObject.class.getName(), refAddr, SomeOtherObjectFactory.class.getName(), null);
}
}
-
+
public static class SomeOtherObjectFactory implements ObjectFactory
{
-
public SomeOtherObjectFactory()
{
-
}
- /**
- * @see javax.naming.spi.ObjectFactory#getObjectInstance(java.lang.Object, javax.naming.Name, javax.naming.Context, java.util.Hashtable)
- * @param arg0
- * @param arg1
- * @param arg2
- * @param arg3
- * @return the object instance
- * @throws Exception
- */
+
public Object getObjectInstance(Object arg0, Name arg1, Context arg2, Hashtable arg3) throws Exception
{
- Reference ref = (Reference)arg0;
-
+ Reference ref = (Reference)arg0;
+
RefAddr refAddr = ref.get(0);
String valueName = refAddr.getType();
if (!valueName.equalsIgnoreCase("val"))
throw new RuntimeException("Unrecognized refaddr type = "+valueName);
-
+
String value = (String)refAddr.getContent();
-
+
return new SomeOtherObject(value.trim());
}
-
}
-
- public SomeObject someObject;
-
- public void setUp ()
+ private SomeObject someObject;
+
+ @Before
+ public void init()
{
this.someObject = new SomeObject(4);
}
- public void testEnvEntryNoScope ()
- throws Exception
+ @Test
+ public void testEnvEntryNoScope() throws Exception
{
EnvEntry ee = new EnvEntry("nameZ", "zstring", true);
List list = NamingEntryUtil.lookupNamingEntries(null, EnvEntry.class);
@@ -170,10 +140,10 @@ public class TestNamingEntries extends TestCase
EnvEntry eo = (EnvEntry)o;
assertEquals ("nameZ", eo.getJndiName());
}
-
- public void testEnvEntryOverride ()
- throws Exception
- {
+
+ @Test
+ public void testEnvEntryOverride() throws Exception
+ {
ScopeA scope = new ScopeA();
EnvEntry ee = new EnvEntry (scope, "nameA", someObject, true);
@@ -188,10 +158,9 @@ public class TestNamingEntries extends TestCase
assertNotNull(namingEntriesContext);
assertEquals(someObject, scopeContext.lookup("nameA"));
}
-
- public void testEnvEntryNonOverride ()
- throws Exception
+ @Test
+ public void testEnvEntryNonOverride() throws Exception
{
ScopeA scope = new ScopeA();
EnvEntry ee = new EnvEntry (scope, "nameA", someObject, false);
@@ -208,34 +177,32 @@ public class TestNamingEntries extends TestCase
assertEquals(someObject, scopeContext.lookup("nameA"));
}
-
- public void testResource ()
- throws Exception
+ @Test
+ public void testResource () throws Exception
{
InitialContext icontext = new InitialContext();
-
+
Resource resource = new Resource (null, "resourceA/b/c", someObject);
NamingEntry ne = NamingEntryUtil.lookupNamingEntry(null, "resourceA/b/c");
assertNotNull(ne);
assertTrue(ne instanceof Resource);
assertEquals(icontext.lookup("resourceA/b/c"), someObject);
-
+
Object scope = new ScopeA();
Resource resource2 = new Resource (scope, "resourceB", someObject);
ne = NamingEntryUtil.lookupNamingEntry(scope, "resourceB");
assertNotNull(ne);
assertTrue(ne instanceof Resource);
-
+
ne = NamingEntryUtil.lookupNamingEntry(null, "resourceB");
assertNull(ne);
-
+
ne = NamingEntryUtil.lookupNamingEntry(new ScopeB(), "resourceB");
assertNull(ne);
}
-
-
- public void testLink ()
- throws Exception
+
+ @Test
+ public void testLink () throws Exception
{
ScopeA scope = new ScopeA();
InitialContext icontext = new InitialContext();
@@ -246,15 +213,13 @@ public class TestNamingEntries extends TestCase
assertEquals(icontext.lookup("resourceA"), "resourceB");
link = new Link (scope, "jdbc/resourceX", "jdbc/resourceY");
- ne = NamingEntryUtil.lookupNamingEntry(scope, "jdbc/resourceX");
+ ne = NamingEntryUtil.lookupNamingEntry(scope, "jdbc/resourceX");
assertNotNull(ne);
assertTrue(ne instanceof Link);
}
-
-
-
- public void testResourceReferenceable ()
- throws Exception
+
+ @Test
+ public void testResourceReferenceable() throws Exception
{
SomeOtherObject someOtherObj = new SomeOtherObject("100");
InitialContext icontext = new InitialContext();
@@ -263,25 +228,24 @@ public class TestNamingEntries extends TestCase
assertNotNull(o);
assertTrue (o instanceof SomeOtherObject);
assertEquals(((SomeOtherObject)o).getValue(), 100);
-
}
-
- public void testResourceReference ()
- throws Exception
+
+ @Test
+ public void testResourceReference () throws Exception
{
RefAddr refAddr = new StringRefAddr("val", "10");
Reference ref = new Reference(SomeObject.class.getName(), refAddr, SomeObjectFactory.class.getName(), null);
-
+
InitialContext icontext = new InitialContext();
Resource resource = new Resource (null, "resourceByRef", ref);
NamingEntry ne = NamingEntryUtil.lookupNamingEntry(null, "resourceByRef");
assertNotNull(ne);
assertTrue (ne instanceof Resource);
-
+
Object o = icontext.lookup("resourceByRef");
assertNotNull (o);
assertTrue (o instanceof SomeObject);
-
+
assertEquals(((SomeObject)o).getValue(), 10);
}
}

Back to the top