harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From py...@apache.org
Subject svn commit: r532234 - in /harmony/enhanced/classlib/trunk/modules/security/src: main/java/common/java/security/ test/api/java/org/apache/harmony/security/tests/java/security/ test/impl/java.injected/java/security/
Date Wed, 25 Apr 2007 07:39:25 GMT
Author: pyang
Date: Wed Apr 25 00:39:24 2007
New Revision: 532234

URL: http://svn.apache.org/viewvc?view=rev&rev=532234
Log:
Apply patch for HARMONY-3734([java][security]java.security.Provider.toString() should not
include the provider information)

Modified:
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Provider.java
    harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Provider2Test.java
    harmony/enhanced/classlib/trunk/modules/security/src/test/impl/java.injected/java/security/Provider_ImplTest.java

Modified: harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Provider.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Provider.java?view=diff&rev=532234&r1=532233&r2=532234
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Provider.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Provider.java
Wed Apr 25 00:39:24 2007
@@ -139,7 +139,7 @@
 	 * @return a printable representation for the receiver.
 	 */
     public String toString() {
-        return name + " provider, Ver. " + version + " " + info; //$NON-NLS-1$ //$NON-NLS-2$
+        return name + " version " + version; //$NON-NLS-1$
     }
 
     public synchronized void clear() {

Modified: harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Provider2Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Provider2Test.java?view=diff&rev=532234&r1=532233&r2=532234
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Provider2Test.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Provider2Test.java
Wed Apr 25 00:39:24 2007
@@ -115,4 +115,13 @@
 			// expected
 		}
 	}
-}
\ No newline at end of file
+    
+    
+    /**
+     * @tests java.security.Provider#toString()
+     */
+    public void test_toString() {
+        // Regression for HARMONY-3734
+        assertEquals("provTest version 1.2", provTest.toString());
+    }
+}

Modified: harmony/enhanced/classlib/trunk/modules/security/src/test/impl/java.injected/java/security/Provider_ImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/test/impl/java.injected/java/security/Provider_ImplTest.java?view=diff&rev=532234&r1=532233&r2=532234
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/src/test/impl/java.injected/java/security/Provider_ImplTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/security/src/test/impl/java.injected/java/security/Provider_ImplTest.java
Wed Apr 25 00:39:24 2007
@@ -46,9 +46,8 @@
      * Class under test for String toString()
      */
     public final void testToString() {
-        assertEquals("Incorrect provider.toString()",
-                "MyProvider provider, Ver. 1.0 Provider for testing", p
-                        .toString());
+        assertEquals("Incorrect provider.toString()", "MyProvider version 1.0",
+                p.toString());
     }
  
     public final void testImplementsAlg() {



Mime
View raw message