LOGBACK-1604 fix tests

Signed-off-by: Ceki Gulcu <ceki@qos.ch>

Author: ceki

logback-classic/src/test/java/ch/qos/logback/classic/selector/ContextDetachingSCLTest.java

@@ -25,8 +25,8 @@
 import ch.qos.logback.classic.ClassicConstants;
 import ch.qos.logback.classic.selector.servlet.ContextDetachingSCL;
 import ch.qos.logback.classic.util.ContextSelectorStaticBinder;
-import ch.qos.logback.classic.util.MockInitialContext;
-import ch.qos.logback.classic.util.MockInitialContextFactory;
+import ch.qos.logback.core.testUtil.MockInitialContext;
+import ch.qos.logback.core.testUtil.MockInitialContextFactory;
 
 @Ignore
 public class ContextDetachingSCLTest {

logback-classic/src/test/java/ch/qos/logback/classic/selector/ContextJNDISelectorTest.java

@@ -24,9 +24,9 @@
 
 import ch.qos.logback.classic.ClassicConstants;
 import ch.qos.logback.classic.util.ContextSelectorStaticBinder;
-import ch.qos.logback.classic.util.MockInitialContext;
-import ch.qos.logback.classic.util.MockInitialContextFactory;
 import ch.qos.logback.core.Context;
+import ch.qos.logback.core.testUtil.MockInitialContext;
+import ch.qos.logback.core.testUtil.MockInitialContextFactory;
 
 @Ignore
 public class ContextJNDISelectorTest {

logback-core/src/main/java/ch/qos/logback/core/util/JNDIUtil.java

@@ -15,6 +15,8 @@
 
 import static ch.qos.logback.core.CoreConstants.JNDI_JAVA_NAMESPACE;
 
+import java.util.Hashtable;
+
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
@@ -36,10 +38,14 @@ public static Context getInitialContext() throws NamingException {
         return new InitialContext();
     }
 
-    public static Object lookupObject(Context ctx, String name) throws NamingException {
-    	  if (ctx == null) {
-              return null;
-          }
+	public static Context getInitialContext(Hashtable<?,?> props) throws NamingException {
+		return new InitialContext(props);
+	}
+
+	public static Object lookupObject(Context ctx, String name) throws NamingException {
+		if (ctx == null) {
+			return null;
+		}
 
           if (OptionHelper.isNullOrEmpty(name)) {
               return null;
@@ -59,7 +65,7 @@ public static void jndiNameSecurityCheck(String name) throws NamingException {
 
 	public static String lookupString(Context ctx, String name) throws NamingException {
 		Object lookup = lookupObject(ctx, name);
-		return lookup == null ? null : lookup.toString();
+		return (String) lookup;
 	}
 
 }

logback-core/src/test/java/ch/qos/logback/core/testUtil/CoreTestConstants.java

@@ -12,7 +12,7 @@
  * as published by the Free Software Foundation.
  */
 package ch.qos.logback.core.testUtil;
-
+ 
 public class CoreTestConstants {
 
     public static final String TEST_SRC_PREFIX = "src/test/";
@@ -29,4 +29,5 @@ public class CoreTestConstants {
     public static final String BASH_PATH_ON_LINUX = "bash";
 
     public static final String SLOW_JENKINS = "slowJenkins";
+    public static final String JAVA_NAMING_FACTORY_INITIAL = "java.naming.factory.initial";
 }

logback-classic/src/test/java/ch/qos/logback/classic/util/MockInitialContext.java renamed to logback-core/src/test/java/ch/qos/logback/core/testUtil/MockInitialContext.java

@@ -11,7 +11,7 @@
  * under the terms of the GNU Lesser General Public License version 2.1
  * as published by the Free Software Foundation.
  */
-package ch.qos.logback.classic.util;
+package ch.qos.logback.core.testUtil;
 
 import java.util.HashMap;
 import java.util.Map;

logback-classic/src/test/java/ch/qos/logback/classic/util/MockInitialContextFactory.java renamed to logback-core/src/test/java/ch/qos/logback/core/testUtil/MockInitialContextFactory.java

@@ -11,7 +11,7 @@
  * under the terms of the GNU Lesser General Public License version 2.1
  * as published by the Free Software Foundation.
  */
-package ch.qos.logback.classic.util;
+package ch.qos.logback.core.testUtil;
 
 import java.util.Hashtable;
 

logback-core/src/test/java/ch/qos/logback/core/util/JNDIUtilTest.java

@@ -1,23 +1,29 @@
 package ch.qos.logback.core.util;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
+import java.util.Hashtable;
 
 import javax.naming.Context;
 import javax.naming.NamingException;
 
 import org.junit.Test;
 
+import ch.qos.logback.core.testUtil.CoreTestConstants;
+import ch.qos.logback.core.testUtil.MockInitialContextFactory;
+
 public class JNDIUtilTest {
 
 	@Test
 	public void ensureJavaNameSpace() throws NamingException {
-		Context ctxt = JNDIUtil.getInitialContext();
 
 		try {
-			JNDIUtil.lookupObject(ctxt, "ldap:...");
+			Context ctxt = JNDIUtil.getInitialContext();
+			JNDIUtil.lookupString(ctxt, "ldap:...");
 		} catch (NamingException e) {
 			String excaptionMsg = e.getMessage();
-			if(excaptionMsg.startsWith(JNDIUtil.RESTRICTION_MSG)) 
+			if (excaptionMsg.startsWith(JNDIUtil.RESTRICTION_MSG))
 				return;
 			else {
 				fail("unexpected exception " + e);
@@ -27,4 +33,19 @@ public void ensureJavaNameSpace() throws NamingException {
 		fail("Should aNot yet implemented");
 	}
 
-}
+	@Test
+	public void testToStringCast() throws NamingException {
+		Hashtable<String, String> props = new Hashtable<String, String>();
+		props.put(CoreTestConstants.JAVA_NAMING_FACTORY_INITIAL, MockInitialContextFactory.class.getCanonicalName());
+		Context ctxt = JNDIUtil.getInitialContext(props);
+		String x = JNDIUtil.lookupString(ctxt, "java:comp:/inexistent");
+		assertNull(x);
+	}
+
+	public String castToString(Object input) {
+		String a = (String) input;
+		return a;
+	}
+
+}
+

logback-site/src/site/pages/manual/loggingSeparation.html

@@ -496,7 +496,7 @@ <h2 class="doAnchor" name="tamingStaticRefs">Taming static
    <p>If you were able to keep up with the discussion thus far and
    have actually tried the logback-starwars examples, then you must be
    truly obsessed with logging. You should consider seeking <a
-   href="http://www.qos.ch/shop/products/professionalSupport">professional
+   href="https://www.qos.ch/support.html">professional
    help</a>.</p>