You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by sm...@apache.org on 2006/06/14 07:30:59 UTC
svn commit: r414080 - in
/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security:
auth/callback/serialization/ sasl/serialization/
Author: smishura
Date: Tue Jun 13 22:30:58 2006
New Revision: 414080
URL: http://svn.apache.org/viewvc?rev=414080&view=rev
Log:
Implementing SerializableAssert interface to provide class specific checks
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerChoiceCallbackTest.java
incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerConfirmationCallbackTest.java
incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerLanguageCallbackTest.java
incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerNameCallbackTest.java
incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerPasswordCallbackTest.java
incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerTextInputCallbackTest.java
incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerTextOutputCallbackTest.java
incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/AuthorizeCallbackTest.java
incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/RealmCallbackTest.java
incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/RealmChoiceCallbackTest.java
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerChoiceCallbackTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerChoiceCallbackTest.java?rev=414080&r1=414079&r2=414080&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerChoiceCallbackTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerChoiceCallbackTest.java Tue Jun 13 22:30:58 2006
@@ -21,6 +21,8 @@
package javax.security.auth.callback.serialization;
+import java.io.Serializable;
+
import javax.security.auth.callback.ChoiceCallback;
import org.apache.harmony.security.tests.support.SerializationTest;
@@ -30,7 +32,8 @@
* Serialization test for ChoiceCallback class
*/
-public class SerChoiceCallbackTest extends SerializationTest {
+public class SerChoiceCallbackTest extends SerializationTest implements
+ SerializationTest.SerializableAssert {
public static void main(String[] args) {
@@ -46,7 +49,7 @@
return new Object[] {new ChoiceCallback(prompt, choices, defaultChoice, true)};
}
- protected void assertDeserialized(Object golden, Object test) {
+ public void assertDeserialized(Serializable golden, Serializable test) {
assertTrue(golden instanceof ChoiceCallback);
assertEquals(((ChoiceCallback) golden).getPrompt(),
((ChoiceCallback) test).getPrompt());
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerConfirmationCallbackTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerConfirmationCallbackTest.java?rev=414080&r1=414079&r2=414080&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerConfirmationCallbackTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerConfirmationCallbackTest.java Tue Jun 13 22:30:58 2006
@@ -21,6 +21,8 @@
package javax.security.auth.callback.serialization;
+import java.io.Serializable;
+
import javax.security.auth.callback.ConfirmationCallback;
import org.apache.harmony.security.tests.support.SerializationTest;
@@ -30,7 +32,8 @@
* Serialization test for ConfirmationCallback class
*/
-public class SerConfirmationCallbackTest extends SerializationTest {
+public class SerConfirmationCallbackTest extends SerializationTest implements
+ SerializationTest.SerializableAssert {
public static void main(String[] args) {
junit.textui.TestRunner.run(SerConfirmationCallbackTest.class);
@@ -42,7 +45,7 @@
ConfirmationCallback.YES_NO_OPTION, 1) };
}
- protected void assertDeserialized(Object golden, Object test) {
+ public void assertDeserialized(Serializable golden, Serializable test) {
assertEquals(((ConfirmationCallback) golden).getDefaultOption(),
((ConfirmationCallback) test).getDefaultOption());
assertEquals(((ConfirmationCallback) golden).getPrompt(),
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerLanguageCallbackTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerLanguageCallbackTest.java?rev=414080&r1=414079&r2=414080&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerLanguageCallbackTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerLanguageCallbackTest.java Tue Jun 13 22:30:58 2006
@@ -21,6 +21,7 @@
package javax.security.auth.callback.serialization;
+import java.io.Serializable;
import java.util.Locale;
import javax.security.auth.callback.LanguageCallback;
@@ -31,7 +32,8 @@
* Serialization test for LanguageCallback class
*/
-public class SerLanguageCallbackTest extends SerializationTest {
+public class SerLanguageCallbackTest extends SerializationTest implements
+ SerializationTest.SerializableAssert {
public static void main(String[] args) {
junit.textui.TestRunner.run(SerLanguageCallbackTest.class);
@@ -43,7 +45,7 @@
return new Object[] { lc };
}
- protected void assertDeserialized(Object golden, Object test) {
+ public void assertDeserialized(Serializable golden, Serializable test) {
assertTrue(test instanceof LanguageCallback);
assertEquals(((LanguageCallback) golden).getLocale(),
((LanguageCallback) test).getLocale());
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerNameCallbackTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerNameCallbackTest.java?rev=414080&r1=414079&r2=414080&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerNameCallbackTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerNameCallbackTest.java Tue Jun 13 22:30:58 2006
@@ -21,6 +21,8 @@
package javax.security.auth.callback.serialization;
+import java.io.Serializable;
+
import javax.security.auth.callback.NameCallback;
import org.apache.harmony.security.tests.support.SerializationTest;
@@ -30,7 +32,8 @@
* Serialization test for NameCallback class
*/
-public class SerNameCallbackTest extends SerializationTest {
+public class SerNameCallbackTest extends SerializationTest implements
+ SerializationTest.SerializableAssert {
public static void main(String[] args) {
junit.textui.TestRunner.run(SerNameCallbackTest.class);
@@ -42,7 +45,7 @@
return new Object[] { new NameCallback("prompt", "defaultName"), nc };
}
- protected void assertDeserialized(Object golden, Object test) {
+ public void assertDeserialized(Serializable golden, Serializable test) {
assertTrue(test instanceof NameCallback);
assertEquals(((NameCallback) golden).getDefaultName(),
((NameCallback) test).getDefaultName());
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerPasswordCallbackTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerPasswordCallbackTest.java?rev=414080&r1=414079&r2=414080&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerPasswordCallbackTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerPasswordCallbackTest.java Tue Jun 13 22:30:58 2006
@@ -21,6 +21,8 @@
package javax.security.auth.callback.serialization;
+import java.io.Serializable;
+
import javax.security.auth.callback.PasswordCallback;
import org.apache.harmony.security.tests.support.SerializationTest;
@@ -30,7 +32,8 @@
* Serialization test for PasswordCallback class
*/
-public class SerPasswordCallbackTest extends SerializationTest {
+public class SerPasswordCallbackTest extends SerializationTest implements
+ SerializationTest.SerializableAssert {
public static void main(String[] args) {
junit.textui.TestRunner.run(SerPasswordCallbackTest.class);
@@ -44,7 +47,7 @@
}
- protected void assertDeserialized(Object golden, Object test) {
+ public void assertDeserialized(Serializable golden, Serializable test) {
assertTrue(test instanceof PasswordCallback);
assertEquals(((PasswordCallback) golden).getPrompt(),
((PasswordCallback) test).getPrompt());
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerTextInputCallbackTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerTextInputCallbackTest.java?rev=414080&r1=414079&r2=414080&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerTextInputCallbackTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerTextInputCallbackTest.java Tue Jun 13 22:30:58 2006
@@ -21,6 +21,8 @@
package javax.security.auth.callback.serialization;
+import java.io.Serializable;
+
import javax.security.auth.callback.TextInputCallback;
import org.apache.harmony.security.tests.support.SerializationTest;
@@ -30,7 +32,8 @@
* Serialization test for TextInputCallback class
*/
-public class SerTextInputCallbackTest extends SerializationTest {
+public class SerTextInputCallbackTest extends SerializationTest implements
+ SerializationTest.SerializableAssert {
public static void main(String[] args) {
junit.textui.TestRunner.run(SerTextInputCallbackTest.class);
@@ -42,7 +45,7 @@
return new Object[] { new TextInputCallback("prompt","defaultTextInput"), t };
}
- protected void assertDeserialized(Object golden, Object test) {
+ public void assertDeserialized(Serializable golden, Serializable test) {
assertTrue(test instanceof TextInputCallback);
assertEquals(((TextInputCallback) golden).getDefaultText(),
((TextInputCallback) test).getDefaultText());
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerTextOutputCallbackTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerTextOutputCallbackTest.java?rev=414080&r1=414079&r2=414080&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerTextOutputCallbackTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerTextOutputCallbackTest.java Tue Jun 13 22:30:58 2006
@@ -21,6 +21,8 @@
package javax.security.auth.callback.serialization;
+import java.io.Serializable;
+
import javax.security.auth.callback.TextOutputCallback;
import org.apache.harmony.security.tests.support.SerializationTest;
@@ -30,7 +32,8 @@
* Serialization test for TextOutputCallback class
*/
-public class SerTextOutputCallbackTest extends SerializationTest {
+public class SerTextOutputCallbackTest extends SerializationTest implements
+ SerializationTest.SerializableAssert {
public static void main(String[] args) {
junit.textui.TestRunner.run(SerTextOutputCallbackTest.class);
@@ -41,7 +44,7 @@
TextOutputCallback.INFORMATION, "message") };
}
- protected void assertDeserialized(Object golden, Object test) {
+ public void assertDeserialized(Serializable golden, Serializable test) {
assertTrue(test instanceof TextOutputCallback);
assertEquals(((TextOutputCallback) golden).getMessage(),
((TextOutputCallback) test).getMessage());
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/AuthorizeCallbackTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/AuthorizeCallbackTest.java?rev=414080&r1=414079&r2=414080&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/AuthorizeCallbackTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/AuthorizeCallbackTest.java Tue Jun 13 22:30:58 2006
@@ -21,6 +21,8 @@
package javax.security.sasl.serialization;
+import java.io.Serializable;
+
import javax.security.sasl.AuthorizeCallback;
import org.apache.harmony.security.tests.support.SerializationTest;
@@ -30,7 +32,8 @@
*
*/
-public class AuthorizeCallbackTest extends SerializationTest {
+public class AuthorizeCallbackTest extends SerializationTest implements
+ SerializationTest.SerializableAssert {
public static String[] msgs = {
"New String",
@@ -44,7 +47,7 @@
new AuthorizeCallback(msgs[1], msgs[1]), };
}
- protected void assertDeserialized(Object oref, Object otest) {
+ public void assertDeserialized(Serializable oref, Serializable otest) {
AuthorizeCallback ref = (AuthorizeCallback) oref;
AuthorizeCallback test = (AuthorizeCallback) otest;
String idC = ref.getAuthenticationID();
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/RealmCallbackTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/RealmCallbackTest.java?rev=414080&r1=414079&r2=414080&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/RealmCallbackTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/RealmCallbackTest.java Tue Jun 13 22:30:58 2006
@@ -21,6 +21,8 @@
package javax.security.sasl.serialization;
+import java.io.Serializable;
+
import javax.security.sasl.RealmCallback;
import org.apache.harmony.security.tests.support.SerializationTest;
@@ -30,7 +32,8 @@
*
*/
-public class RealmCallbackTest extends SerializationTest {
+public class RealmCallbackTest extends SerializationTest implements
+ SerializationTest.SerializableAssert {
public static String[] msgs = {
"New String",
@@ -50,7 +53,7 @@
return oo;
}
- protected void assertDeserialized(Object oref, Object otest) {
+ public void assertDeserialized(Serializable oref, Serializable otest) {
RealmCallback ref = (RealmCallback) oref;
RealmCallback test = (RealmCallback) otest;
String dText = ref.getDefaultText();
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/RealmChoiceCallbackTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/RealmChoiceCallbackTest.java?rev=414080&r1=414079&r2=414080&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/RealmChoiceCallbackTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/RealmChoiceCallbackTest.java Tue Jun 13 22:30:58 2006
@@ -21,6 +21,8 @@
package javax.security.sasl.serialization;
+import java.io.Serializable;
+
import javax.security.sasl.RealmChoiceCallback;
import org.apache.harmony.security.tests.support.SerializationTest;
@@ -30,7 +32,8 @@
*
*/
-public class RealmChoiceCallbackTest extends SerializationTest {
+public class RealmChoiceCallbackTest extends SerializationTest implements
+ SerializationTest.SerializableAssert {
public static String[] msgs = {
"New String",
@@ -60,7 +63,7 @@
return oo;
}
- protected void assertDeserialized(Object oref, Object otest) {
+ public void assertDeserialized(Serializable oref, Serializable otest) {
RealmChoiceCallback ref = (RealmChoiceCallback) oref;
RealmChoiceCallback test = (RealmChoiceCallback) otest;