You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by nd...@apache.org on 2006/09/25 05:33:32 UTC
svn commit: r449555 [3/6] - in
/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java:
com/sun/jndi/url/dir2/ com/sun/jndi/url/nntp/ dazzle/jndi/testing/spi/
org/apache/harmony/jndi/provider/dns/
org/apache/harmony/jndi/tests/javax/namin...
Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/ControlFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/ControlFactoryTest.java?view=diff&rev=449555&r1=449554&r2=449555
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/ControlFactoryTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/ControlFactoryTest.java Sun Sep 24 20:33:27 2006
@@ -24,17 +24,16 @@
import javax.naming.ldap.ControlFactory;
import javax.naming.ldap.LdapContext;
-import org.apache.harmony.jndi.tests.javax.naming.ldap.ctx1.MockContextOne;
-import org.apache.harmony.jndi.tests.javax.naming.ldap.ctx2.MockContextTwo;
-
import junit.framework.TestCase;
public class ControlFactoryTest extends TestCase {
- protected void setUp() {
+ @Override
+ protected void setUp() {
}
- protected void tearDown() {
+ @Override
+ protected void tearDown() {
}
@@ -47,13 +46,13 @@
public void testGetControlInstance_NoFactory() throws NamingException {
Control control = new MockControl("Original control", new byte[] { 1,
2, 3, 4 }, true);
- Hashtable env = new Hashtable();
+ Hashtable<String, String> env = new Hashtable<String, String>();
env.put(Context.INITIAL_CONTEXT_FACTORY,
"org.apache.harmony.jndi.tests.javax.naming.spi.mock.MockContextFactory");
Context context = new InitialContext(env);
Control newControl = ControlFactory.getControlInstance(control,
- context, new Hashtable());
+ context, new Hashtable<Object, Object>());
assertEquals(control, newControl);
assertSame(control, newControl);
@@ -68,7 +67,7 @@
public void testGetControlInstance_HashtableNull() throws NamingException {
Control control = new MockControl("Original control", new byte[] { 1,
2, 3, 4 }, true);
- Hashtable env = new Hashtable();
+ Hashtable<String, String> env = new Hashtable<String, String>();
env.put(Context.INITIAL_CONTEXT_FACTORY,
"org.apache.harmony.jndi.tests.javax.naming.spi.mock.MockContextFactory");
Context context = new InitialContext(env);
@@ -88,12 +87,12 @@
public void testGetControlInstance_ContextNull() throws NamingException {
Control control = new MockControl("Original control", new byte[] { 1,
2, 3, 4 }, true);
- Hashtable env = new Hashtable();
+ Hashtable<String, String> env = new Hashtable<String, String>();
env.put(Context.INITIAL_CONTEXT_FACTORY,
"org.apache.harmony.jndi.tests.javax.naming.spi.mock.MockContextFactory");
Control newControl = ControlFactory.getControlInstance(control, null,
- new Hashtable());
+ new Hashtable<Object, Object>());
assertEquals(control, newControl);
assertSame(control, newControl);
@@ -106,13 +105,13 @@
* 4. Input Context == null Expected: return value == input control
*/
public void testGetControlInstance_ControlNull() throws NamingException {
- Hashtable env = new Hashtable();
+ Hashtable<String, String> env = new Hashtable<String, String>();
env.put(Context.INITIAL_CONTEXT_FACTORY,
"org.apache.harmony.jndi.tests.javax.naming.spi.mock.MockContextFactory");
Context context = new InitialContext(env);
Control newControl = ControlFactory.getControlInstance(null, context,
- new Hashtable());
+ new Hashtable<Object, Object>());
assertEquals(null, newControl);
assertSame(null, newControl);
@@ -128,12 +127,12 @@
throws NamingException {
MockControl control = new MockControl("Original control", new byte[] {
1, 2, 3, 4 }, true);
- Hashtable env = new Hashtable();
+ Hashtable<String, String> env = new Hashtable<String, String>();
env.put(Context.INITIAL_CONTEXT_FACTORY,
"org.apache.harmony.jndi.tests.javax.naming.spi.mock.MockContextFactory");
Context context = new InitialContext(env);
- Hashtable controlEnv = new Hashtable();
+ Hashtable<String, String> controlEnv = new Hashtable<String, String>();
controlEnv.put(LdapContext.CONTROL_FACTORIES,
"org.apache.harmony.jndi.tests.javax.naming.ldap.MockControlFactory");
Control newControl = ControlFactory.getControlInstance(control,
@@ -154,17 +153,17 @@
throws NamingException {
MockControl control = new MockControl("Original control", new byte[] {
1, 2, 3, 4 }, true);
- Hashtable env = new Hashtable();
+ Hashtable<String, String> env = new Hashtable<String, String>();
env.put(Context.INITIAL_CONTEXT_FACTORY,
"org.apache.harmony.jndi.tests.javax.naming.spi.mock.MockContextFactory");
Context context = new InitialContext(env);
- Hashtable controlEnv = new Hashtable();
+ Hashtable<String, String> controlEnv = new Hashtable<String, String>();
controlEnv
.put(LdapContext.CONTROL_FACTORIES,
"org.apache.harmony.jndi.tests.javax.naming.ldap.ControlFactoryTest$MockInvalidControlFactory");
try {
- Control newControl = ControlFactory.getControlInstance(control,
+ ControlFactory.getControlInstance(control,
context, controlEnv);
fail("Should throw a exception as designed.");
} catch (NamingException e) {
@@ -182,12 +181,12 @@
public void testGetControlInstance_InvalidFactory() throws NamingException {
MockControl control = new MockControl("Original control", new byte[] {
1, 2, 3, 4 }, true);
- Hashtable env = new Hashtable();
+ Hashtable<String, String> env = new Hashtable<String, String>();
env.put(Context.INITIAL_CONTEXT_FACTORY,
"org.apache.harmony.jndi.tests.javax.naming.spi.mock.MockContextFactory");
Context context = new InitialContext(env);
- Hashtable controlEnv = new Hashtable();
+ Hashtable<String, String> controlEnv = new Hashtable<String, String>();
controlEnv.put(LdapContext.CONTROL_FACTORIES, "");
Control newControl = ControlFactory.getControlInstance(control,
context, controlEnv);
@@ -206,12 +205,12 @@
throws NamingException {
MockControl control = new MockControl("Original control", new byte[] {
1, 2, 3, 4 }, true);
- Hashtable env = new Hashtable();
+ Hashtable<String, String> env = new Hashtable<String, String>();
env.put(Context.INITIAL_CONTEXT_FACTORY,
"org.apache.harmony.jndi.tests.javax.naming.spi.mock.MockContextFactory");
Context context = new InitialContext(env);
- Hashtable controlEnv = new Hashtable();
+ Hashtable<Object, Object> controlEnv = new Hashtable<Object, Object>();
controlEnv
.put(
LdapContext.CONTROL_FACTORIES,
@@ -271,7 +270,8 @@
public static class MockInvalidControlFactory extends ControlFactory {
- public Control getControlInstance(Control c) throws NamingException {
+ @Override
+ public Control getControlInstance(Control c) throws NamingException {
throw new NamingException(
"Throw Exception as designed for test ControlFactory.");
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/InitialLdapContextTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/InitialLdapContextTest.java?view=diff&rev=449555&r1=449554&r2=449555
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/InitialLdapContextTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/InitialLdapContextTest.java Sun Sep 24 20:33:27 2006
@@ -34,9 +34,10 @@
public class InitialLdapContextTest extends TestCase {
InitialLdapContext ldapContext;
- protected void setUp() throws Exception {
+ @Override
+ protected void setUp() throws Exception {
super.setUp();
- Hashtable env = new Hashtable();
+ Hashtable<String, String> env = new Hashtable<String, String>();
env.put(Context.INITIAL_CONTEXT_FACTORY,
"org.apache.harmony.jndi.tests.javax.naming.spi.mock.MockLdapContextFactory");
Control[] cs = { new MyControl("c1", new byte[] { 1, 2, 3, 4 }, false),
@@ -45,7 +46,8 @@
}
- protected void tearDown() throws Exception {
+ @Override
+ protected void tearDown() throws Exception {
super.tearDown();
}
@@ -60,7 +62,7 @@
}
public void testConstructor_Controls() throws NamingException {
- Hashtable env = new Hashtable();
+ Hashtable<String, String> env = new Hashtable<String, String>();
env.put(Context.INITIAL_CONTEXT_FACTORY,
"org.apache.harmony.jndi.tests.javax.naming.spi.mock.MockLdapContextFactory");
Control[] cs = { new MyControl("c1", new byte[] { 1, 2, 3, 4 }, false),
@@ -71,7 +73,7 @@
Object objCs = defaultCtx.getProps().get(
"java.naming.ldap.control.connect");
Object version = defaultCtx.getProps().get("java.naming.ldap.version");
-
+ assertNotNull(version);
Control[] cs2 = (Control[]) objCs;
for (int i = 0; i < cs.length; i++) {
@@ -84,7 +86,7 @@
}
public void testConstructor_notldapContext() throws NamingException {
- Hashtable env = new Hashtable();
+ Hashtable<String, String> env = new Hashtable<String, String>();
env.put(Context.INITIAL_CONTEXT_FACTORY,
"org.apache.harmony.jndi.tests.javax.naming.spi.mock.MockContextFactory");
Control[] cs = { new MyControl("c1", new byte[] { 1, 2, 3, 4 }, false),
@@ -104,6 +106,7 @@
}
Context defaultContext = ctx.getDefaultContext();
+ assertNotNull(defaultContext);
}
public void testExtendedOperation() throws NamingException {
@@ -177,7 +180,7 @@
class MyInitialLdapContext extends InitialLdapContext {
- public MyInitialLdapContext(Hashtable h, Control[] cs)
+ public MyInitialLdapContext(Hashtable<String, String> h, Control[] cs)
throws NamingException {
super(h, cs);
}
@@ -188,7 +191,9 @@
}
class MyControl implements Control {
- boolean isCritical;
+ private static final long serialVersionUID = 1L;
+
+ boolean isCritical;
byte[] encodedValue;
@@ -214,7 +219,8 @@
return this.isCritical;
}
- public boolean equals(Object arg0) {
+ @Override
+ public boolean equals(Object arg0) {
if (arg0 instanceof MyControl) {
MyControl a = (MyControl) arg0;
return this.id.equals(a.getID())
@@ -227,7 +233,9 @@
}
class MyExtendedRequest implements ExtendedRequest {
- byte[] encodedValue;
+ private static final long serialVersionUID = 1L;
+
+ byte[] encodedValue;
String id;
Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/LdapReferralExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/LdapReferralExceptionTest.java?view=diff&rev=449555&r1=449554&r2=449555
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/LdapReferralExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/LdapReferralExceptionTest.java Sun Sep 24 20:33:27 2006
@@ -27,34 +27,8 @@
public class LdapReferralExceptionTest extends TestCase {
- /*
- * -------------------------------------------------------------------
- * Constants
- * -------------------------------------------------------------------
- */
-
- private static Log log = new Log(LdapReferralExceptionTest.class);
-
- /*
- * -------------------------------------------------------------------
- * Constructors
- * -------------------------------------------------------------------
- */
-
- /**
- * Constructor for LdapReferralExceptionTest.
- *
- * @param arg0
- */
- public LdapReferralExceptionTest(String arg0) {
- super(arg0);
- }
- /*
- * -------------------------------------------------------------------
- * Methods
- * -------------------------------------------------------------------
- */
+ private static final Log log = new Log(LdapReferralExceptionTest.class);
public void testAllCoveragePurpose() throws NamingException {
log.setMethod("testAllCoveragePurpose()");
@@ -70,73 +44,43 @@
}
public static class MockLdapReferralException extends LdapReferralException {
+ private static final long serialVersionUID = 1L;
- /**
- *
- */
public MockLdapReferralException() {
super();
}
- /**
- * @param s
- */
public MockLdapReferralException(String s) {
super(s);
}
- /*
- * (non-Javadoc)
- *
- * @see javax.naming.ldap.LdapReferralException#getReferralContext()
- */
- public Context getReferralContext() {
+ @Override
+ public Context getReferralContext() {
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.naming.ldap.LdapReferralException#getReferralContext(java.util.Hashtable)
- */
- public Context getReferralContext(Hashtable h) {
+ @Override
+ public Context getReferralContext(Hashtable<?, ?> h) {
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.naming.ldap.LdapReferralException#getReferralContext(java.util.Hashtable,
- * javax.naming.ldap.Control[])
- */
- public Context getReferralContext(Hashtable h, Control[] cs) {
+ @Override
+ public Context getReferralContext(Hashtable<?, ?> h, Control[] cs) {
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.naming.ReferralException#getReferralInfo()
- */
- public Object getReferralInfo() {
+ @Override
+ public Object getReferralInfo() {
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.naming.ReferralException#skipReferral()
- */
- public boolean skipReferral() {
+ @Override
+ public boolean skipReferral() {
return false;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.naming.ReferralException#retryReferral()
- */
- public void retryReferral() {
+ @Override
+ public void retryReferral() {
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/MockControl.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/MockControl.java?view=diff&rev=449555&r1=449554&r2=449555
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/MockControl.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/MockControl.java Sun Sep 24 20:33:27 2006
@@ -21,7 +21,9 @@
public class MockControl implements Control {
- boolean isCritical;
+ private static final long serialVersionUID = 1L;
+
+ boolean isCritical;
byte[] encodedValue;
@@ -57,7 +59,8 @@
return this.isCritical;
}
- public boolean equals(Object arg0) {
+ @Override
+ public boolean equals(Object arg0) {
if (arg0 instanceof MockControl) {
MockControl a = (MockControl) arg0;
return this.id.equals(a.getID())
Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/MockControlFactory.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/MockControlFactory.java?view=diff&rev=449555&r1=449554&r2=449555
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/MockControlFactory.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/MockControlFactory.java Sun Sep 24 20:33:27 2006
@@ -26,13 +26,15 @@
public static String ID_PREFIX_SPI2 = "LDAPv3 Control(SPI2):";
- public Control getControlInstance(Control c) throws NamingException {
+ @Override
+ public Control getControlInstance(Control c) throws NamingException {
return new MockControl(ID_PREFIX + c.getID(), c.getEncodedValue(), c
.isCritical());
}
public static class ControlFactorySPI1 extends ControlFactory {
- public Control getControlInstance(Control c) throws NamingException {
+ @Override
+ public Control getControlInstance(Control c) throws NamingException {
return new MockControl(ID_PREFIX_SPI1 + c.getID(), c
.getEncodedValue(), c.isCritical());
}
@@ -40,7 +42,8 @@
}
public static class ControlFactorySPI2 extends ControlFactory {
- public Control getControlInstance(Control c) throws NamingException {
+ @Override
+ public Control getControlInstance(Control c) throws NamingException {
return new MockControl(ID_PREFIX_SPI2 + c.getID(), c
.getEncodedValue(), c.isCritical());
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/MockExtendedRequest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/MockExtendedRequest.java?view=diff&rev=449555&r1=449554&r2=449555
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/MockExtendedRequest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/MockExtendedRequest.java Sun Sep 24 20:33:27 2006
@@ -21,7 +21,12 @@
public class MockExtendedRequest implements ExtendedRequest {
- /*
+ /**
+ * <p></p>
+ */
+ private static final long serialVersionUID = 1L;
+
+ /*
* (non-Javadoc)
*
* @see javax.naming.ldap.ExtendedRequest#getID()
Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/MockExtendedResponse.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/MockExtendedResponse.java?view=diff&rev=449555&r1=449554&r2=449555
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/MockExtendedResponse.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/MockExtendedResponse.java Sun Sep 24 20:33:27 2006
@@ -18,7 +18,12 @@
public class MockExtendedResponse implements ExtendedResponse {
- /*
+ /**
+ * <p></p>
+ */
+ private static final long serialVersionUID = 1L;
+
+ /*
* (non-Javadoc)
*
* @see javax.naming.ldap.ExtendedResponse#getID()
Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/MockHasControls.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/MockHasControls.java?view=diff&rev=449555&r1=449554&r2=449555
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/MockHasControls.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/MockHasControls.java Sun Sep 24 20:33:27 2006
@@ -21,7 +21,12 @@
public class MockHasControls implements HasControls {
- /*
+ /**
+ * <p></p>
+ */
+ private static final long serialVersionUID = 1L;
+
+ /*
* (non-Javadoc)
*
* @see javax.naming.ldap.HasControls#getControls()
Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/MockUnsolicitedNotification.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/MockUnsolicitedNotification.java?view=diff&rev=449555&r1=449554&r2=449555
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/MockUnsolicitedNotification.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/MockUnsolicitedNotification.java Sun Sep 24 20:33:27 2006
@@ -20,7 +20,12 @@
public class MockUnsolicitedNotification implements UnsolicitedNotification {
- /*
+ /**
+ * <p></p>
+ */
+ private static final long serialVersionUID = 1L;
+
+ /*
* (non-Javadoc)
*
* @see javax.naming.ldap.UnsolicitedNotification#getReferrals()
Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/UnsolicitedNotificationEventTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/UnsolicitedNotificationEventTest.java?view=diff&rev=449555&r1=449554&r2=449555
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/UnsolicitedNotificationEventTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/UnsolicitedNotificationEventTest.java Sun Sep 24 20:33:27 2006
@@ -29,11 +29,13 @@
public class UnsolicitedNotificationEventTest extends TestCase {
- protected void setUp() throws Exception {
+ @Override
+ protected void setUp() throws Exception {
super.setUp();
}
- protected void tearDown() throws Exception {
+ @Override
+ protected void tearDown() throws Exception {
super.tearDown();
}
@@ -62,7 +64,7 @@
referral, exception);
Object src = null;
try {
- UnsolicitedNotificationEvent event = new UnsolicitedNotificationEvent(
+ new UnsolicitedNotificationEvent(
src, notification);
} catch (IllegalArgumentException e) {
}
@@ -92,7 +94,12 @@
}
class MockUnsolicitedNotification implements UnsolicitedNotification {
- String[] referrals;
+ /**
+ * <p></p>
+ */
+ private static final long serialVersionUID = 1L;
+
+ String[] referrals;
NamingException exception;
@@ -123,7 +130,8 @@
return null;
}
- public boolean equals(Object arg0) {
+ @Override
+ public boolean equals(Object arg0) {
if (arg0 instanceof MockUnsolicitedNotification) {
MockUnsolicitedNotification a = (MockUnsolicitedNotification) arg0;
return this.exception.equals(a.exception)
@@ -135,10 +143,10 @@
class MockUnsolicitedNotificationListener implements
UnsolicitedNotificationListener {
- Vector events;
+ Vector<UnsolicitedNotificationEvent> events;
public MockUnsolicitedNotificationListener() {
- events = new Vector();
+ events = new Vector<UnsolicitedNotificationEvent>();
}
public void notificationReceived(UnsolicitedNotificationEvent e) {
Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/ctx1/MockContextOne.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/ctx1/MockContextOne.java?view=diff&rev=449555&r1=449554&r2=449555
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/ctx1/MockContextOne.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/ctx1/MockContextOne.java Sun Sep 24 20:33:27 2006
@@ -17,8 +17,10 @@
import java.util.Hashtable;
+import javax.naming.Binding;
import javax.naming.Context;
import javax.naming.Name;
+import javax.naming.NameClassPair;
import javax.naming.NameParser;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
@@ -126,7 +128,7 @@
*
* @see javax.naming.Context#getEnvironment()
*/
- public Hashtable getEnvironment() throws NamingException {
+ public Hashtable<?,?> getEnvironment() throws NamingException {
return null;
}
@@ -166,7 +168,7 @@
*
* @see javax.naming.Context#list(javax.naming.Name)
*/
- public NamingEnumeration list(Name n) throws NamingException {
+ public NamingEnumeration<NameClassPair> list(Name n) throws NamingException {
return null;
}
@@ -176,7 +178,7 @@
*
* @see javax.naming.Context#list(java.lang.String)
*/
- public NamingEnumeration list(String s) throws NamingException {
+ public NamingEnumeration<NameClassPair> list(String s) throws NamingException {
return null;
}
@@ -186,7 +188,7 @@
*
* @see javax.naming.Context#listBindings(javax.naming.Name)
*/
- public NamingEnumeration listBindings(Name n) throws NamingException {
+ public NamingEnumeration<Binding> listBindings(Name n) throws NamingException {
return null;
}
@@ -196,7 +198,7 @@
*
* @see javax.naming.Context#listBindings(java.lang.String)
*/
- public NamingEnumeration listBindings(String s) throws NamingException {
+ public NamingEnumeration<Binding> listBindings(String s) throws NamingException {
return null;
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/ctx2/MockContextTwo.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/ctx2/MockContextTwo.java?view=diff&rev=449555&r1=449554&r2=449555
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/ctx2/MockContextTwo.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/ctx2/MockContextTwo.java Sun Sep 24 20:33:27 2006
@@ -17,8 +17,10 @@
import java.util.Hashtable;
+import javax.naming.Binding;
import javax.naming.Context;
import javax.naming.Name;
+import javax.naming.NameClassPair;
import javax.naming.NameParser;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
@@ -121,7 +123,7 @@
*
* @see javax.naming.Context#getEnvironment()
*/
- public Hashtable getEnvironment() throws NamingException {
+ public Hashtable<?,?> getEnvironment() throws NamingException {
return null;
}
@@ -157,7 +159,7 @@
*
* @see javax.naming.Context#list(javax.naming.Name)
*/
- public NamingEnumeration list(Name n) throws NamingException {
+ public NamingEnumeration<NameClassPair> list(Name n) throws NamingException {
return null;
}
@@ -166,7 +168,7 @@
*
* @see javax.naming.Context#list(java.lang.String)
*/
- public NamingEnumeration list(String s) throws NamingException {
+ public NamingEnumeration<NameClassPair> list(String s) throws NamingException {
return null;
}
@@ -175,7 +177,7 @@
*
* @see javax.naming.Context#listBindings(javax.naming.Name)
*/
- public NamingEnumeration listBindings(Name n) throws NamingException {
+ public NamingEnumeration<Binding> listBindings(Name n) throws NamingException {
return null;
}
@@ -184,7 +186,7 @@
*
* @see javax.naming.Context#listBindings(java.lang.String)
*/
- public NamingEnumeration listBindings(String s) throws NamingException {
+ public NamingEnumeration<Binding> listBindings(String s) throws NamingException {
return null;
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/spi/DirectoryManagerBuilderTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/spi/DirectoryManagerBuilderTest.java?view=diff&rev=449555&r1=449554&r2=449555
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/spi/DirectoryManagerBuilderTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/spi/DirectoryManagerBuilderTest.java Sun Sep 24 20:33:27 2006
@@ -32,6 +32,7 @@
import javax.naming.spi.ObjectFactoryBuilder;
import junit.framework.TestCase;
+
import org.apache.harmony.jndi.tests.javax.naming.util.Log;
public class DirectoryManagerBuilderTest extends TestCase {
@@ -102,7 +103,7 @@
obj = DirectoryManager.getObjectInstance(null, null, cxt, null, a);
assertSame(OBJ, obj);
- Hashtable env = new Hashtable();
+ Hashtable<Object, Object> env = new Hashtable<Object, Object>();
env.put(Context.INITIAL_CONTEXT_FACTORY,
"dazzle.jndi.testing.spi.DazzleContextFactory");
env.put(Context.STATE_FACTORIES,
@@ -119,7 +120,7 @@
throws Exception {
log
.setMethod("myTestGetObjectInstance_HasBuilder_BuilderNullPointerException");
- Hashtable env = new Hashtable();
+ Hashtable<Object, Object> env = new Hashtable<Object, Object>();
NamingManagerTest.indicateNullPointerException(env, 1);
env.put(Context.INITIAL_CONTEXT_FACTORY,
"dazzle.jndi.testing.spi.DazzleContextFactory");
@@ -127,7 +128,7 @@
"org.apache.harmony.jndi.tests.javax.naming.spi.mock.MockDirObjectFactoryNoException");
Attributes a = new BasicAttributes();
try {
- Object obj = DirectoryManager.getObjectInstance(null, null, null,
+ DirectoryManager.getObjectInstance(null, null, null,
env, a);
fail("Should throw NullPointerException.");
} catch (NullPointerException e) {
@@ -142,7 +143,7 @@
throws Exception {
log
.setMethod("myTestGetObjectInstance_HasBuilder_BuilderNamingException");
- Hashtable env = new Hashtable();
+ Hashtable<Object, Object> env = new Hashtable<Object, Object>();
NamingManagerTest.indicateNamingException(env, 1);
env.put(Context.INITIAL_CONTEXT_FACTORY,
"dazzle.jndi.testing.spi.DazzleContextFactory");
@@ -150,7 +151,7 @@
"org.apache.harmony.jndi.tests.javax.naming.spi.mock.MockDirObjectFactoryNoException");
Attributes a = new BasicAttributes();
try {
- Object obj = DirectoryManager.getObjectInstance(null, null, null,
+ DirectoryManager.getObjectInstance(null, null, null,
env, a);
fail("Should throw NamingException.");
} catch (NamingException e) {
@@ -165,7 +166,7 @@
throws Exception {
log
.setMethod("myTestGetObjectInstance_HasBuilder_FactoryRuntimeException");
- Hashtable env = new Hashtable();
+ Hashtable<Object, Object> env = new Hashtable<Object, Object>();
NamingManagerTest.indicateRuntimeException(env, 2);
env.put(Context.INITIAL_CONTEXT_FACTORY,
"dazzle.jndi.testing.spi.DazzleContextFactory");
@@ -173,7 +174,7 @@
"org.apache.harmony.jndi.tests.javax.naming.spi.mock.MockDirObjectFactoryNoException");
Attributes a = new BasicAttributes();
try {
- Object obj = DirectoryManager.getObjectInstance(null, null, null,
+ DirectoryManager.getObjectInstance(null, null, null,
env, a);
fail("Should throw RuntimeException.");
} catch (RuntimeException e) {
@@ -188,7 +189,7 @@
throws Exception {
log
.setMethod("myTestGetObjectInstance_HasBuilder_FactoryNamingException");
- Hashtable env = new Hashtable();
+ Hashtable<Object, Object> env = new Hashtable<Object, Object>();
NamingManagerTest.indicateNamingException(env, 2);
env.put(Context.INITIAL_CONTEXT_FACTORY,
"dazzle.jndi.testing.spi.DazzleContextFactory");
@@ -196,7 +197,7 @@
"org.apache.harmony.jndi.tests.javax.naming.spi.mock.MockDirObjectFactoryNoException");
Attributes a = new BasicAttributes();
try {
- Object obj = DirectoryManager.getObjectInstance(null, null, null,
+ DirectoryManager.getObjectInstance(null, null, null,
env, a);
fail("Should throw NamingException.");
} catch (NamingException e) {
@@ -210,7 +211,7 @@
public void myTestGetObjectInstance_HasBuilder_BuilderReturnNull()
throws Exception {
log.setMethod("myTestGetObjectInstance_HasBuilder_BuilderReturnNull");
- Hashtable env = new Hashtable();
+ Hashtable<Object, Object> env = new Hashtable<Object, Object>();
NamingManagerTest.indicateReturnNull(env, 1);
env.put(Context.INITIAL_CONTEXT_FACTORY,
"dazzle.jndi.testing.spi.DazzleContextFactory");
@@ -218,7 +219,7 @@
"org.apache.harmony.jndi.tests.javax.naming.spi.mock.MockDirObjectFactoryNoException");
Attributes a = new BasicAttributes();
try {
- Object obj = DirectoryManager.getObjectInstance(null, null, null,
+ DirectoryManager.getObjectInstance(null, null, null,
env, a);
fail("Should throw NullPointerException.");
} catch (NullPointerException e) {
@@ -232,7 +233,7 @@
public void myTestGetObjectInstance_HasBuilder_FactoryReturnNull()
throws Exception {
log.setMethod("myTestGetObjectInstance_HasBuilder_FactoryReturnNull");
- Hashtable env = new Hashtable();
+ Hashtable<Object, Object> env = new Hashtable<Object, Object>();
NamingManagerTest.indicateReturnNull(env, 2);
env.put(Context.INITIAL_CONTEXT_FACTORY,
"dazzle.jndi.testing.spi.DazzleContextFactory");
@@ -254,7 +255,7 @@
log.setMethod("myTestSetObjectFactoryBuilder_SetNormal");
ObjectFactoryBuilder objectFactoryBuilder = MockObjectFactoryBuilder
.getInstance();
- DirectoryManager.setObjectFactoryBuilder(objectFactoryBuilder);
+ NamingManager.setObjectFactoryBuilder(objectFactoryBuilder);
// NamingManager.setObjectFactoryBuilder(objectFactoryBuilder);
}
@@ -283,13 +284,13 @@
public static class MockObjectFactoryBuilder implements
ObjectFactoryBuilder {
- private static MockObjectFactoryBuilder _builder = new MockObjectFactoryBuilder();
+ private static final MockObjectFactoryBuilder _builder = new MockObjectFactoryBuilder();
public static MockObjectFactoryBuilder getInstance() {
return _builder;
}
- public ObjectFactory createObjectFactory(Object o, Hashtable envmt)
+ public ObjectFactory createObjectFactory(Object o, Hashtable<?, ?> envmt)
throws NamingException {
NamingManagerTest.issueIndicatedExceptions(envmt);
if (NamingManagerTest.returnNullIndicated(envmt)) {
@@ -302,7 +303,7 @@
public static class MockDirObjectFactory implements DirObjectFactory {
public Object getObjectInstance(Object o, Name n, Context c,
- Hashtable envmt, Attributes a) throws Exception {
+ Hashtable<?, ?> envmt, Attributes a) throws Exception {
NamingManagerTest.issueIndicatedExceptions(envmt);
if (NamingManagerTest.returnNullIndicated(envmt)) {
return null;
@@ -310,14 +311,8 @@
return OBJ;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.naming.spi.ObjectFactory#getObjectInstance(java.lang.Object,
- * javax.naming.Name, javax.naming.Context, java.util.Hashtable)
- */
public Object getObjectInstance(Object o, Name n, Context c,
- Hashtable envmt) throws Exception {
+ Hashtable<?, ?> envmt) throws Exception {
log.setMethod("getObjectInstance");
log.log("wrong method call");
return getObjectInstance(o, n, c, envmt, null);
Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/spi/DirectoryManagerJCKTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/spi/DirectoryManagerJCKTest.java?view=diff&rev=449555&r1=449554&r2=449555
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/spi/DirectoryManagerJCKTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/spi/DirectoryManagerJCKTest.java Sun Sep 24 20:33:27 2006
@@ -17,10 +17,12 @@
import java.util.Hashtable;
+import javax.naming.Binding;
import javax.naming.CannotProceedException;
import javax.naming.Context;
import javax.naming.InvalidNameException;
import javax.naming.Name;
+import javax.naming.NameClassPair;
import javax.naming.NameParser;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
@@ -28,6 +30,7 @@
import javax.naming.directory.DirContext;
import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
import javax.naming.ldap.Control;
import javax.naming.ldap.ExtendedRequest;
import javax.naming.ldap.ExtendedResponse;
@@ -37,12 +40,9 @@
import javax.naming.spi.ObjectFactory;
import junit.framework.TestCase;
-import org.apache.harmony.jndi.tests.javax.naming.util.Log;
public class DirectoryManagerJCKTest extends TestCase {
- private static Log log = new Log(DirectoryManagerJCKTest.class);
-
public void testGetContinuationDirContext() throws NamingException {
// Step 1: Write a simple class which implements
// LdapContext and InitialContextFactory.
@@ -99,7 +99,7 @@
}
try {
- Attributes attributes = newContext.getAttributes("test");
+ newContext.getAttributes("test");
} catch (Exception e) {
// System.out.println(e);
}
@@ -112,7 +112,7 @@
CannotProceedException cpe = new CannotProceedException(
"TestGetContinuationDirContext3");
DirContext ctx = DirectoryManager.getContinuationDirContext(cpe);
- // System.out.println(ctx instanceof DirContext);
+ assertNotNull(ctx);
}
/*
@@ -186,66 +186,34 @@
}
- /*
- * (non-Javadoc)
- *
- * @see javax.naming.spi.InitialContextFactory#getInitialContext(java.util.Hashtable)
- */
- public Context getInitialContext(Hashtable envmt)
+ public Context getInitialContext(Hashtable<?, ?> envmt)
throws NamingException {
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.naming.directory.DirContext#bind(javax.naming.Name,
- * java.lang.Object, javax.naming.directory.Attributes)
- */
public void bind(Name name, Object obj, Attributes attributes)
throws NamingException {
}
- /*
- * (non-Javadoc)
- *
- * @see javax.naming.directory.DirContext#bind(java.lang.String,
- * java.lang.Object, javax.naming.directory.Attributes)
- */
public void bind(String s, Object obj, Attributes attributes)
throws NamingException {
}
- /*
- * (non-Javadoc)
- *
- * @see javax.naming.directory.DirContext#createSubcontext(javax.naming.Name,
- * javax.naming.directory.Attributes)
- */
+
public DirContext createSubcontext(Name name, Attributes attributes)
throws NamingException {
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.naming.directory.DirContext#createSubcontext(java.lang.String,
- * javax.naming.directory.Attributes)
- */
+
public DirContext createSubcontext(String s, Attributes attributes)
throws NamingException {
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.naming.directory.DirContext#getAttributes(javax.naming.Name)
- */
public Attributes getAttributes(Name name) throws NamingException {
return null;
@@ -399,7 +367,7 @@
* @see javax.naming.directory.DirContext#search(javax.naming.Name,
* javax.naming.directory.Attributes)
*/
- public NamingEnumeration search(Name name, Attributes attributes)
+ public NamingEnumeration<SearchResult> search(Name name, Attributes attributes)
throws NamingException {
return null;
@@ -411,7 +379,7 @@
* @see javax.naming.directory.DirContext#search(javax.naming.Name,
* javax.naming.directory.Attributes, java.lang.String[])
*/
- public NamingEnumeration search(Name name, Attributes attributes,
+ public NamingEnumeration<SearchResult> search(Name name, Attributes attributes,
String[] as) throws NamingException {
return null;
@@ -424,7 +392,7 @@
* java.lang.String, java.lang.Object[],
* javax.naming.directory.SearchControls)
*/
- public NamingEnumeration search(Name name, String filter,
+ public NamingEnumeration<SearchResult> search(Name name, String filter,
Object[] objs, SearchControls searchControls)
throws NamingException {
@@ -437,7 +405,7 @@
* @see javax.naming.directory.DirContext#search(javax.naming.Name,
* java.lang.String, javax.naming.directory.SearchControls)
*/
- public NamingEnumeration search(Name name, String filter,
+ public NamingEnumeration<SearchResult> search(Name name, String filter,
SearchControls searchControls) throws NamingException {
return null;
@@ -449,7 +417,7 @@
* @see javax.naming.directory.DirContext#search(java.lang.String,
* javax.naming.directory.Attributes)
*/
- public NamingEnumeration search(String name, Attributes attributes)
+ public NamingEnumeration<SearchResult> search(String name, Attributes attributes)
throws NamingException {
return null;
@@ -461,7 +429,7 @@
* @see javax.naming.directory.DirContext#search(java.lang.String,
* javax.naming.directory.Attributes, java.lang.String[])
*/
- public NamingEnumeration search(String name, Attributes attributes,
+ public NamingEnumeration<SearchResult> search(String name, Attributes attributes,
String[] as) throws NamingException {
return null;
@@ -474,7 +442,7 @@
* java.lang.String, java.lang.Object[],
* javax.naming.directory.SearchControls)
*/
- public NamingEnumeration search(String name, String filter,
+ public NamingEnumeration<SearchResult> search(String name, String filter,
Object[] objs, SearchControls searchControls)
throws NamingException {
@@ -487,7 +455,7 @@
* @see javax.naming.directory.DirContext#search(java.lang.String,
* java.lang.String, javax.naming.directory.SearchControls)
*/
- public NamingEnumeration search(String name, String filter,
+ public NamingEnumeration<SearchResult> search(String name, String filter,
SearchControls searchControls) throws NamingException {
return null;
@@ -597,7 +565,7 @@
*
* @see javax.naming.Context#getEnvironment()
*/
- public Hashtable getEnvironment() throws NamingException {
+ public Hashtable<?, ?> getEnvironment() throws NamingException {
return null;
}
@@ -637,7 +605,7 @@
*
* @see javax.naming.Context#list(javax.naming.Name)
*/
- public NamingEnumeration list(Name n) throws NamingException {
+ public NamingEnumeration<NameClassPair> list(Name n) throws NamingException {
return null;
}
@@ -647,7 +615,7 @@
*
* @see javax.naming.Context#list(java.lang.String)
*/
- public NamingEnumeration list(String s) throws NamingException {
+ public NamingEnumeration<NameClassPair> list(String s) throws NamingException {
return null;
}
@@ -657,7 +625,7 @@
*
* @see javax.naming.Context#listBindings(javax.naming.Name)
*/
- public NamingEnumeration listBindings(Name n) throws NamingException {
+ public NamingEnumeration<Binding> listBindings(Name n) throws NamingException {
return null;
}
@@ -667,7 +635,7 @@
*
* @see javax.naming.Context#listBindings(java.lang.String)
*/
- public NamingEnumeration listBindings(String s) throws NamingException {
+ public NamingEnumeration<Binding> listBindings(String s) throws NamingException {
return null;
}
@@ -876,7 +844,7 @@
*
* @see javax.naming.Context#getEnvironment()
*/
- public Hashtable getEnvironment() throws NamingException {
+ public Hashtable<?, ?> getEnvironment() throws NamingException {
return null;
}
@@ -912,7 +880,7 @@
*
* @see javax.naming.Context#list(javax.naming.Name)
*/
- public NamingEnumeration list(Name n) throws NamingException {
+ public NamingEnumeration<NameClassPair> list(Name n) throws NamingException {
return null;
}
@@ -921,7 +889,7 @@
*
* @see javax.naming.Context#list(java.lang.String)
*/
- public NamingEnumeration list(String s) throws NamingException {
+ public NamingEnumeration<NameClassPair> list(String s) throws NamingException {
return null;
}
@@ -930,7 +898,7 @@
*
* @see javax.naming.Context#listBindings(javax.naming.Name)
*/
- public NamingEnumeration listBindings(Name n) throws NamingException {
+ public NamingEnumeration<Binding> listBindings(Name n) throws NamingException {
return null;
}
@@ -939,7 +907,7 @@
*
* @see javax.naming.Context#listBindings(java.lang.String)
*/
- public NamingEnumeration listBindings(String s) throws NamingException {
+ public NamingEnumeration<Binding> listBindings(String s) throws NamingException {
return null;
}
@@ -1052,7 +1020,7 @@
*
* @see javax.naming.spi.InitialContextFactory#getInitialContext(java.util.Hashtable)
*/
- public Context getInitialContext(Hashtable envmt)
+ public Context getInitialContext(Hashtable<?, ?> envmt)
throws NamingException {
return null;
}
@@ -1064,7 +1032,7 @@
* javax.naming.Name, javax.naming.Context, java.util.Hashtable)
*/
public Object getObjectInstance(Object o, Name n, Context c,
- Hashtable envmt) throws Exception {
+ Hashtable<?, ?> envmt) throws Exception {
return null;
}