svn commit: r1705319 - in /oodt/branches/dependency-update: ./ commons/src/test/java/org/apache/oodt/commons/object/jndi/

[magicaltrout]

Author: magicaltrout
Date: Fri Sep 25 15:13:42 2015
New Revision: 1705319

URL: http://svn.apache.org/viewvc?rev=1705319&view=rev
Log:
fix context

Added:
    
oodt/branches/dependency-update/commons/src/test/java/org/apache/oodt/commons/object/jndi/TContext.java
   (contents, props changed)
      - copied, changed from r1705317, 
oodt/branches/dependency-update/commons/src/test/java/org/apache/oodt/commons/object/jndi/TestContext.java
Removed:
    
oodt/branches/dependency-update/commons/src/test/java/org/apache/oodt/commons/object/jndi/TestContext.java
Modified:
    oodt/branches/dependency-update/   (props changed)
    
oodt/branches/dependency-update/commons/src/test/java/org/apache/oodt/commons/object/jndi/ObjectContextTest.java
    
oodt/branches/dependency-update/commons/src/test/java/org/apache/oodt/commons/object/jndi/TestContextTest.java

Modified: 
oodt/branches/dependency-update/commons/src/test/java/org/apache/oodt/commons/object/jndi/ObjectContextTest.java
URL: 
http://svn.apache.org/viewvc/oodt/branches/dependency-update/commons/src/test/java/org/apache/oodt/commons/object/jndi/ObjectContextTest.java?rev=1705319&r1=1705318&r2=1705319&view=diff
==============================================================================
--- 
oodt/branches/dependency-update/commons/src/test/java/org/apache/oodt/commons/object/jndi/ObjectContextTest.java
 (original)
+++ 
oodt/branches/dependency-update/commons/src/test/java/org/apache/oodt/commons/object/jndi/ObjectContextTest.java
 Fri Sep 25 15:13:42 2015
@@ -24,7 +24,7 @@ import javax.naming.Binding;
 import javax.naming.NameClassPair;
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
-import org.apache.oodt.commons.object.jndi.ObjectContext;
+
 import junit.framework.TestCase;
 
 /**
@@ -54,9 +54,9 @@ public class ObjectContextTest extends T
                aliases.save(out, "Temporary properties");
                out.close();
 
-               a1 = new TestContext("urn:a");
-               a2 = new TestContext("urn:a");
-               b = new TestContext("urn:b");
+               a1 = new TContext("urn:a");
+               a2 = new TContext("urn:a");
+               b = new TContext("urn:b");
 
                oldValue = 
System.getProperty("org.apache.oodt.commons.object.jndi.aliases");
                
System.setProperty("org.apache.oodt.commons.object.jndi.aliases", 
aliasFile.toString());
@@ -184,13 +184,13 @@ public class ObjectContextTest extends T
        }
 
        /** First delegate context for "urn:a" namespace. */
-       private TestContext a1;
+       private TContext a1;
 
        /** Second delegate context for "urn:a" namespace. */
-       private TestContext a2;
+       private TContext a2;
 
        /** Delegate context for "urn:b" namespace. */
-       private TestContext b;
+       private TContext b;
 
        /** Test subject: the object context. */
        private ObjectContext context;

Copied: 
oodt/branches/dependency-update/commons/src/test/java/org/apache/oodt/commons/object/jndi/TContext.java
 (from r1705317, 
oodt/branches/dependency-update/commons/src/test/java/org/apache/oodt/commons/object/jndi/TestContext.java)
URL: 
http://svn.apache.org/viewvc/oodt/branches/dependency-update/commons/src/test/java/org/apache/oodt/commons/object/jndi/TContext.java?p2=oodt/branches/dependency-update/commons/src/test/java/org/apache/oodt/commons/object/jndi/TContext.java&p1=oodt/branches/dependency-update/commons/src/test/java/org/apache/oodt/commons/object/jndi/TestContext.java&r1=1705317&r2=1705319&rev=1705319&view=diff
==============================================================================
--- 
oodt/branches/dependency-update/commons/src/test/java/org/apache/oodt/commons/object/jndi/TestContext.java
 (original)
+++ 
oodt/branches/dependency-update/commons/src/test/java/org/apache/oodt/commons/object/jndi/TContext.java
 Fri Sep 25 15:13:42 2015
@@ -40,18 +40,14 @@ import javax.naming.OperationNotSupporte
  * @author Kelly
  * @version $Revision: 1.1 $
  */
-public class TestContext implements Context {
-
-
-       public TestContext() {
-       }
+public class TContext implements Context {
 
   /**
         * Creates a new <code>TestContext</code> instance.
         *
         * @param prefix What every name must start with.
         */
-       public TestContext(String prefix) {
+       public TContext(String prefix) {
                this.prefix = prefix;
        }
 

Propchange: 
oodt/branches/dependency-update/commons/src/test/java/org/apache/oodt/commons/object/jndi/TContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: 
oodt/branches/dependency-update/commons/src/test/java/org/apache/oodt/commons/object/jndi/TestContextTest.java
URL: 
http://svn.apache.org/viewvc/oodt/branches/dependency-update/commons/src/test/java/org/apache/oodt/commons/object/jndi/TestContextTest.java?rev=1705319&r1=1705318&r2=1705319&view=diff
==============================================================================
--- 
oodt/branches/dependency-update/commons/src/test/java/org/apache/oodt/commons/object/jndi/TestContextTest.java
 (original)
+++ 
oodt/branches/dependency-update/commons/src/test/java/org/apache/oodt/commons/object/jndi/TestContextTest.java
 Fri Sep 25 15:13:42 2015
@@ -46,7 +46,7 @@ public class TestContextTest extends Tes
         * @throws NamingException if an error occurs.
         */
        public void testTestContext() throws NamingException {
-               TestContext ctx = new TestContext("urn:x:");                    
       // Make it
+               TContext ctx = new TContext("urn:x:");                         
// Make it
                try {
                        ctx.lookup("urn:x:y");                                  
       // Lookup a nonexistent binding
                        fail("Got a binding that doesn't exist");               
       // Got something?  Yikes.