Index: C:/harmony/trunk_0427/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/dns/DNSContextTest.java =================================================================== --- C:/harmony/trunk_0427/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/dns/DNSContextTest.java (revision 420699) +++ C:/harmony/trunk_0427/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/dns/DNSContextTest.java (working copy) @@ -52,10 +52,10 @@ Hashtable env = new Hashtable(); env.put(Context.PROVIDER_URL, propStr1); - ctx = new DNSContext(env); + ctx = new DNSContextFactory().getInitialContext(env);//new DNSContext(env); assertEquals("example.com.", ctx.getNameInNamespace()); env.put(Context.PROVIDER_URL, propStr2); - ctx = new DNSContext(env); + ctx = new DNSContextFactory().getInitialContext(env);//new DNSContext(env); assertEquals(".", ctx.getNameInNamespace()); } @@ -69,7 +69,7 @@ Context ctx; env.put(Context.PROVIDER_URL, propStr1); - ctx = new DNSContext(env); + ctx = new DNSContextFactory().getInitialContext(env);//new DNSContext(env); // #composeName(Name, Name) // NULL & NULL try { @@ -139,7 +139,7 @@ env.put(DNSContext.TIMEOUT_RETRIES, "5"); env.put(DNSContext.THREADS_MAX, "17"); env.put(Context.PROVIDER_URL, "dns://superdns.com/intel.com"); - context = new DNSContext(env); + context = (DNSContext)new DNSContextFactory().getInitialContext(env);//new DNSContext(env); assertEquals(true, TestMgr.getBoolField(context, "authoritative")); assertEquals(ProviderConstants.A_TYPE, TestMgr.getIntField(context, "lookupAttrType")); @@ -154,7 +154,7 @@ env.put(DNSContext.LOOKUP_ATTR, "MX"); env.put(DNSContext.RECURSION, "trueee"); env.remove(DNSContext.THREADS_MAX); - context = new DNSContext(env); + context = (DNSContext)new DNSContextFactory().getInitialContext(env);//new DNSContext(env); assertEquals(false, TestMgr.getBoolField(context, "authoritative")); assertEquals(ProviderConstants.MX_TYPE, TestMgr.getIntField(context, "lookupAttrType")); @@ -166,7 +166,7 @@ env.put(DNSContext.LOOKUP_ATTR, "IN ZZZZZZZ"); try { - context = new DNSContext(env); + context = (DNSContext)new DNSContextFactory().getInitialContext(env);//new DNSContext(env); fail("NamingException has not been thrown"); } catch (NamingException e) {} @@ -172,7 +172,7 @@ env.put(DNSContext.LOOKUP_ATTR, "ZZZZZZZ"); try { - context = new DNSContext(env); + context = (DNSContext)new DNSContextFactory().getInitialContext(env);//new DNSContext(env); fail("NamingException has not been thrown"); } catch (NamingException e) {} env.put(DNSContext.LOOKUP_ATTR, "TXT"); @@ -179,7 +179,7 @@ env.put(DNSContext.TIMEOUT_INITIAL, "q"); try { - context = new DNSContext(env); + context = (DNSContext)new DNSContextFactory().getInitialContext(env);//new DNSContext(env); fail("NumberFormatException has not been thrown"); } catch (NumberFormatException e) {} env.put(DNSContext.TIMEOUT_INITIAL, "5000"); @@ -186,7 +186,7 @@ env.put(DNSContext.TIMEOUT_RETRIES, "q"); try { - context = new DNSContext(env); + context = (DNSContext)new DNSContextFactory().getInitialContext(env);//new DNSContext(env); fail("NumberFormatException has not been thrown"); } catch (NumberFormatException e) {} env.put(DNSContext.TIMEOUT_RETRIES, "5"); @@ -194,8 +194,9 @@ env.put(DNSContext.PROVIDER_URL, "dns://dnsserver1.com/super.zone.ru. " + "dns://123.456.78.90/super.zone.ru"); - context = new DNSContext(env); - slist = SList.getInstance(); + context = (DNSContext)new DNSContextFactory().getInitialContext(env);//new DNSContext(env); + /* + slist = SList.getInstance(); serv = slist.getServerByName("super.zone.ru", "dnsserver1.com", 53); if (serv == null) { fail("DNS server has not been added"); @@ -204,10 +205,10 @@ if (serv == null) { fail("DNS server has not been added"); } - + */ env.put(DNSContext.PROVIDER_URL, "file:/etc/passwd"); try { - context = new DNSContext(env); + context = (DNSContext)new DNSContextFactory().getInitialContext(env);//new DNSContext(env); fail("NamingException has not been thrown"); } catch (NamingException e) {} @@ -225,7 +226,7 @@ // no side effect env.put(DNSContext.TIMEOUT_INITIAL, "2000"); - context = new DNSContext(env); + context = (DNSContext)new DNSContextFactory().getInitialContext(env);//new DNSContext(env); env.put(DNSContext.TIMEOUT_INITIAL, "2001"); env2 = context.getEnvironment(); assertEquals("2000", env2.get(DNSContext.TIMEOUT_INITIAL));