Clean up/out some comments.

Change-Id: I8f251d2b1d7e2b5454c0702ae5cd836ca5507106

2 files changed, 3 insertions, 63 deletions

diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSourceTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSourceTest.java
index 75767c0..7cf12b5 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSourceTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSourceTest.java
@@ -40,6 +40,7 @@ import java.security.cert.Certificate;
 import org.apache.harmony.security.tests.support.TestCertUtils;
 
 import junit.framework.TestCase;
+
 @TestTargetClass(CodeSource.class)
 /**
  * Unit test for CodeSource.
@@ -502,9 +503,6 @@ public class CodeSourceTest extends TestCase {
         assertFalse(thizCS.implies(thatCS));
     }
 
-    /**
-     * If this object's location equals codesource's location, then return true.
-     */
     @TestTargetNew(
         level = TestLevel.PARTIAL_COMPLETE,
         notes = "",
@@ -520,10 +518,6 @@ public class CodeSourceTest extends TestCase {
 
     }
 
-    /**
-     * This object's protocol (getLocation().getProtocol()) must be equal to
-     * codesource's protocol.
-     */
     /*
      * FIXME
      * commented out for temporary, as there is no FTP:// protocol supported yet.
@@ -549,11 +543,6 @@ public class CodeSourceTest extends TestCase {
         assertFalse(thatCS.implies(thizCS));
     }
 
-    /**
-     * If this object's host (getLocation().getHost()) is not null, then the
-     * SocketPermission constructed with this object's host must imply the
-     * SocketPermission constructed with codesource's host.
-     */
     @TestTargetNew(
         level = TestLevel.PARTIAL_COMPLETE,
         notes = "",
@@ -585,10 +574,6 @@ public class CodeSourceTest extends TestCase {
         assertFalse(thatCS.implies(thizCS));
     }
 
-    /**
-     * If this object's port (getLocation().getPort()) is not equal to -1 (that
-     * is, if a port is specified), it must equal codesource's port.
-     */
     @TestTargetNew(
         level = TestLevel.PARTIAL_COMPLETE,
         notes = "",
@@ -616,10 +601,6 @@ public class CodeSourceTest extends TestCase {
         assertFalse(thizCS.implies(thatCS));
     }
 
-    /**
-     * If this object's file (getLocation().getFile()) doesn't equal
-     * codesource's file, then the following checks are made: ...
-     */
     @TestTargetNew(
         level = TestLevel.PARTIAL_COMPLETE,
         notes = "",
@@ -632,10 +613,6 @@ public class CodeSourceTest extends TestCase {
         assertTrue(thizCS.implies(thatCS));
     }
 
-    /**
-     * ... If this object's file ends with "/-", then codesource's file must
-     * start with this object's file (exclusive the trailing "-").
-     */
     @TestTargetNew(
         level = TestLevel.PARTIAL_COMPLETE,
         notes = "",
@@ -654,11 +631,6 @@ public class CodeSourceTest extends TestCase {
         assertFalse(thiz.implies(that));
     }
 
-    /**
-     * ... If this object's file ends with a "/*", then codesource's file must
-     * start with this object's file and must not have any further "/"
-     * separators.
-     */
     @TestTargetNew(
         level = TestLevel.PARTIAL_COMPLETE,
         notes = "",
@@ -680,10 +652,6 @@ public class CodeSourceTest extends TestCase {
         assertFalse(thiz.implies(that));
     }
 
-    /**
-     * ... If this object's file doesn't end with a "/", then codesource's file
-     * must match this object's file with a '/' appended.
-     */
     @TestTargetNew(
         level = TestLevel.PARTIAL_COMPLETE,
         notes = "",
@@ -698,10 +666,6 @@ public class CodeSourceTest extends TestCase {
         assertFalse(thatCS.implies(thizCS));
     }
 
-    /**
-     * If this object's reference (getLocation().getRef()) is not null, it must
-     * equal codesource's reference.
-     */
     @TestTargetNew(
         level = TestLevel.PARTIAL_COMPLETE,
         notes = "",
diff --git a/luni/src/test/java/tests/security/cert/CollectionCertStoreParametersTest.java b/luni/src/test/java/tests/security/cert/CollectionCertStoreParametersTest.java
index 2ebd12b..b194c70 100644
--- a/luni/src/test/java/tests/security/cert/CollectionCertStoreParametersTest.java
+++ b/luni/src/test/java/tests/security/cert/CollectionCertStoreParametersTest.java
@@ -36,9 +36,9 @@ import java.util.Collection;
 import java.util.Vector;
 
 import org.apache.harmony.security.tests.support.cert.MyCertificate;
+
 /**
- * Tests for <code>CollectionCertStoreParameters</code>
- *
+ * Tests for <code>CollectionCertStoreParameters</code>.
  */
 @TestTargetClass(CollectionCertStoreParameters.class)
 public class CollectionCertStoreParametersTest extends TestCase {
@@ -49,8 +49,6 @@ public class CollectionCertStoreParametersTest extends TestCase {
 
     /**
      * Test #1 for <code>CollectionCertStoreParameters()</code> constructor<br>
-     * Assertion: Creates an instance of CollectionCertStoreParameters
-     * with the default parameter values (an empty and immutable Collection)
      */
     @TestTargetNew(
         level = TestLevel.PARTIAL_COMPLETE,
@@ -66,8 +64,6 @@ public class CollectionCertStoreParametersTest extends TestCase {
 
     /**
      * Test #2 for <code>CollectionCertStoreParameters</code> constructor<br>
-     * Assertion: Creates an instance of CollectionCertStoreParameters
-     * with the default parameter values (an empty and immutable Collection)
      */
     @TestTargetNew(
         level = TestLevel.PARTIAL_COMPLETE,
@@ -93,7 +89,6 @@ public class CollectionCertStoreParametersTest extends TestCase {
     /**
      * Test #1 for <code>CollectionCertStoreParameters(Collection)</code>
      * constructor<br>
-     * Assertion: Creates an instance of CollectionCertStoreParameters
      */
     @TestTargetNew(
         level = TestLevel.PARTIAL_COMPLETE,
@@ -110,9 +105,6 @@ public class CollectionCertStoreParametersTest extends TestCase {
     /**
      * Test #2 for <code>CollectionCertStoreParameters(Collection)</code>
      * constructor<br>
-     * Assertion: If the specified <code>Collection</code> contains an object
-     * that is not a <code>Certificate</code> or <code>CRL</code>, that object
-     * will be ignored by the Collection <code>CertStore</code>.
      */
     @TestTargetNew(
         level = TestLevel.PARTIAL_COMPLETE,
@@ -132,11 +124,6 @@ public class CollectionCertStoreParametersTest extends TestCase {
     /**
      * Test #3 for <code>CollectionCertStoreParameters(Collection)</code>
      * constructor<br>
-     * Assertion: The Collection is not copied. Instead, a reference is used.
-     * This allows the caller to subsequently add or remove Certificates or
-     * CRLs from the Collection, thus changing the set of Certificates or CRLs
-     * available to the Collection CertStore. The Collection CertStore will
-     * not modify the contents of the Collection
      */
     @TestTargetNew(
         level = TestLevel.PARTIAL_COMPLETE,
@@ -163,8 +150,6 @@ public class CollectionCertStoreParametersTest extends TestCase {
     /**
      * Test #4 for <code>CollectionCertStoreParameters(Collection)</code>
      * constructor<br>
-     * Assertion: <code>NullPointerException</code> - if
-     * <code>collection</code> is <code>null</code>
      */
     @TestTargetNew(
         level = TestLevel.PARTIAL_COMPLETE,
@@ -182,7 +167,6 @@ public class CollectionCertStoreParametersTest extends TestCase {
 
     /**
      * Test #1 for <code>clone()</code> method<br>
-     * Assertion: Returns a copy of this object
      */
     @TestTargetNew(
         level = TestLevel.PARTIAL_COMPLETE,
@@ -203,8 +187,6 @@ public class CollectionCertStoreParametersTest extends TestCase {
 
     /**
      * Test #2 for <code>clone()</code> method<br>
-     * Assertion: ...only a reference to the <code>Collection</code>
-     * is copied, and not the contents
      */
     @TestTargetNew(
         level = TestLevel.PARTIAL_COMPLETE,
@@ -225,8 +207,6 @@ public class CollectionCertStoreParametersTest extends TestCase {
 
     /**
      * Test #3 for <code>clone()</code> method<br>
-     * Assertion: ...only a reference to the <code>Collection</code>
-     * is copied, and not the contents
      */
     @TestTargetNew(
         level = TestLevel.PARTIAL_COMPLETE,
@@ -248,7 +228,6 @@ public class CollectionCertStoreParametersTest extends TestCase {
 
     /**
      * Test #1 for <code>toString()</code> method<br>
-     * Assertion: returns the formatted string describing parameters
      */
     @TestTargetNew(
         level = TestLevel.PARTIAL_COMPLETE,
@@ -265,7 +244,6 @@ public class CollectionCertStoreParametersTest extends TestCase {
 
     /**
      * Test #2 for <code>toString()</code> method<br>
-     * Assertion: returns the formatted string describing parameters
      */
     @TestTargetNew(
         level = TestLevel.PARTIAL_COMPLETE,
@@ -284,7 +262,6 @@ public class CollectionCertStoreParametersTest extends TestCase {
 
     /**
      * Test #1 for <code>getCollection()</code> method<br>
-     * Assertion: returns the Collection (never null)
      */
     @TestTargetNew(
         level = TestLevel.PARTIAL_COMPLETE,
@@ -299,7 +276,6 @@ public class CollectionCertStoreParametersTest extends TestCase {
 
     /**
      * Test #2 for <code>getCollection()</code> method<br>
-     * Assertion: returns the Collection (never null)
      */
     @TestTargetNew(
         level = TestLevel.PARTIAL_COMPLETE,