Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2014-12-31 10:16:57 -0500
committerGreg Wilkins2014-12-31 10:16:57 -0500
commit2e3c2239179ad18a23d0c110a6c8e98ab6e58122 (patch)
tree0ba9d1f411f69a87a56067dc05c050a47c655ef9 /jetty-plus
parent58faca9e093749ee2c6101ab7b79f21d817d0e52 (diff)
parentd2cd28f7fad7327a7a2aebc4df019cfa1b790e18 (diff)
downloadorg.eclipse.jetty.project-2e3c2239179ad18a23d0c110a6c8e98ab6e58122.tar.gz
org.eclipse.jetty.project-2e3c2239179ad18a23d0c110a6c8e98ab6e58122.tar.xz
org.eclipse.jetty.project-2e3c2239179ad18a23d0c110a6c8e98ab6e58122.zip
Merge remote-tracking branch 'origin/jetty-9.2.x'
Diffstat (limited to 'jetty-plus')
-rw-r--r--jetty-plus/src/test/java/org/eclipse/jetty/plus/jndi/TestNamingEntries.java10
1 files changed, 5 insertions, 5 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 0ed095012c..e1deb8223f 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
@@ -246,14 +246,14 @@ public class TestNamingEntries
{
ScopeA scope = new ScopeA();
InitialContext icontext = new InitialContext();
- Link link = new Link ("resourceA", "resourceB");
- NamingEntry ne = NamingEntryUtil.lookupNamingEntry(null, "resourceA");
+ Link link = new Link ("linked-resourceA", "resourceB");
+ NamingEntry ne = NamingEntryUtil.lookupNamingEntry(null, "linked-resourceA");
assertNotNull(ne);
assertTrue(ne instanceof Link);
- assertEquals(icontext.lookup("resourceA"), "resourceB");
+ assertEquals(icontext.lookup("linked-resourceA"), "resourceB");
- link = new Link (scope, "jdbc/resourceX", "jdbc/resourceY");
- ne = NamingEntryUtil.lookupNamingEntry(scope, "jdbc/resourceX");
+ link = new Link (scope, "jdbc/linked-resourceX", "jdbc/linked-resourceY");
+ ne = NamingEntryUtil.lookupNamingEntry(scope, "jdbc/linked-resourceX");
assertNotNull(ne);
assertTrue(ne instanceof Link);
}

Back to the top