You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by ol...@apache.org on 2006/04/28 17:23:20 UTC
svn commit: r397920 -
/jakarta/commons/proper/httpclient/branches/COOKIE_2_BRANCH/src/test/org/apache/commons/httpclient/cookie/TestCookieRFC2965Spec.java
Author: olegk
Date: Fri Apr 28 08:23:18 2006
New Revision: 397920
URL: http://svn.apache.org/viewcvs?rev=397920&view=rev
Log:
Got rid of superfluous helper methods
Modified:
jakarta/commons/proper/httpclient/branches/COOKIE_2_BRANCH/src/test/org/apache/commons/httpclient/cookie/TestCookieRFC2965Spec.java
Modified: jakarta/commons/proper/httpclient/branches/COOKIE_2_BRANCH/src/test/org/apache/commons/httpclient/cookie/TestCookieRFC2965Spec.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/httpclient/branches/COOKIE_2_BRANCH/src/test/org/apache/commons/httpclient/cookie/TestCookieRFC2965Spec.java?rev=397920&r1=397919&r2=397920&view=diff
==============================================================================
--- jakarta/commons/proper/httpclient/branches/COOKIE_2_BRANCH/src/test/org/apache/commons/httpclient/cookie/TestCookieRFC2965Spec.java (original)
+++ jakarta/commons/proper/httpclient/branches/COOKIE_2_BRANCH/src/test/org/apache/commons/httpclient/cookie/TestCookieRFC2965Spec.java Fri Apr 28 08:23:18 2006
@@ -35,7 +35,6 @@
import org.apache.commons.httpclient.Header;
import java.util.Date;
-import java.util.Arrays;
/**
* Test cases for RFC2965 cookie spec
@@ -205,7 +204,12 @@
assertEquals(1, parsed.length);
// only the first occurence of port attribute is considered, others ignored
Cookie2 cookie = (Cookie2) parsed[0];
- assertEquals(new int[] {80,800,8000}, cookie.getPorts());
+ int[] ports = cookie.getPorts();
+ assertNotNull(ports);
+ assertEquals(3, ports.length);
+ assertEquals(80, ports[0]);
+ assertEquals(800, ports[1]);
+ assertEquals(8000, ports[2]);
assertTrue(cookie.isPortAttributeSpecified());
}
@@ -228,7 +232,10 @@
assertNotNull(parsed);
assertEquals(1, parsed.length);
Cookie2 cookie = (Cookie2) parsed[0];
- assertEquals(new int[] {80}, cookie.getPorts());
+ int[] ports = cookie.getPorts();
+ assertNotNull(ports);
+ assertEquals(1, ports.length);
+ assertEquals(80, ports[0]);
assertTrue(cookie.isPortAttributeSpecified() && cookie.isPortAttributeBlank());
}
@@ -240,7 +247,10 @@
assertNotNull(parsed);
assertEquals(1, parsed.length);
Cookie2 cookie = (Cookie2) parsed[0];
- assertEquals(new int[] {80}, cookie.getPorts());
+ int[] ports = cookie.getPorts();
+ assertNotNull(ports);
+ assertEquals(1, ports.length);
+ assertEquals(80, ports[0]);
assertTrue(cookie.isPortAttributeSpecified() && cookie.isPortAttributeBlank());
}
@@ -603,7 +613,11 @@
assertNotNull(parsed);
assertEquals(1, parsed.length);
Cookie2 cookie = (Cookie2) parsed[0];
- assertEquals(new int[] {80, 800}, cookie.getPorts());
+ int[] ports = cookie.getPorts();
+ assertNotNull(ports);
+ assertEquals(2, ports.length);
+ assertEquals(80, ports[0]);
+ assertEquals(800, ports[1]);
}
/**
@@ -799,42 +813,6 @@
assertEquals("value", parsed[0].getValue());
assertEquals(".domain.com", parsed[0].getDomain());
assertEquals("/", parsed[0].getPath());
- }
-
- // ------------------------------------------------------- Helper Methods
-
- /**
- * Asserts that two arrays are equal (deep equality).
- * @param expected expected array
- * @param actual actual array
- */
- public static void assertEquals(int[] expected, int[] actual) {
- if (Arrays.equals(expected, actual))
- return;
- failNotEquals(null, intarrayToString(expected), intarrayToString(actual));
- }
-
- public static void failNotEquals(String message, Object expected, Object actual) {
- fail(format(message, expected, actual));
- }
-
- public static String format(String message, Object expected, Object actual) {
- String formatted= "";
- if (message != null)
- formatted = message + " ";
- return formatted + "expected:<" + expected + "> but was:<" + actual + ">";
- }
-
- static private String intarrayToString(int[] arr) {
- StringBuffer buffer = new StringBuffer();
- buffer.append("[");
- for (int i = 0, len = arr.length; i < len; i++) {
- buffer.append(arr[i]);
- if (i < (len - 1))
- buffer.append(", ");
- }
- buffer.append("]");
- return buffer.toString();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org