am cb43b294: Merge "Get rid of Support_Configuration.SpecialInetTestAddress ..."
* commit 'cb43b294c4fc686c38f7bdd7c81c07f66f8eb9ce':
Get rid of Support_Configuration.SpecialInetTestAddress ...
diff --git a/support/src/test/java/tests/support/Support_Configuration.java b/support/src/test/java/tests/support/Support_Configuration.java
index 8058315..0856d44 100644
--- a/support/src/test/java/tests/support/Support_Configuration.java
+++ b/support/src/test/java/tests/support/Support_Configuration.java
@@ -32,380 +32,35 @@
*/
public class Support_Configuration {
- public static String DomainAddress = "apache.org";
+ public static final String DomainAddress = "apache.org";
- public static String WebName = "jcltest.";
+ public static final String WebName = "jcltest.";
- public static final String HomeAddress;
+ public static final String HomeAddress = WebName + DomainAddress;
- public static String TestResourcesDir = "/testres231";
+ public static final String TestResourcesDir = "/testres231";
- public static final String TestResources;
+ public static final String TestResources = HomeAddress + TestResourcesDir;
- public static String HomeAddressResponse = "HTTP/1.1 200 OK";
+ public static final String HomeAddressResponse = "HTTP/1.1 200 OK";
- public static String HomeAddressSoftware = "Jetty(6.0.x)";
+ public static final String HomeAddressSoftware = "Jetty(6.0.x)";
- public static String SocksServerTestHost = "jcltest.apache.org";
+ public static final String SocksServerTestHost = "jcltest.apache.org";
- public static int SocksServerTestPort = 1080;
-
- // Need an IP address that does not resolve to a host name
- public static String UnresolvedIP = "192.168.99.99";
+ public static final int SocksServerTestPort = 1080;
// the bytes for an address which represents an address which is not
// one of the addresses for any of our machines on which tests will run
// it is used to verify we get the expected error when we try to bind
// to an address that is not one of the machines local addresses
- public static byte nonLocalAddressBytes[] = { 1, 0, 0, 0 };
+ public static final byte nonLocalAddressBytes[] = { 1, 0, 0, 0 };
- public static String InetTestAddress = "localhost";
+ public static final String FTPTestAddress = "jcltest:jclpass@localhost";
- public static String InetTestIP = "127.0.0.1";
+ public static final String URLConnectionLastModifiedString = "Mon, 14 Jun 1999 21:06:22 GMT";
- // BEGIN android-added
- public static byte[] InetTestAddr = {127, 0, 0, 1};
- // END android-added
+ public static final long URLConnectionLastModified = 929394382000L;
- public static String InetTestAddress2 = "localhost";
-
- public static String InetTestIP2 = "127.0.0.1";
-
- public static byte[] InetTestCaddr = { 9, 26, -56, -111 };
-
- public static String IPv6GlobalAddressJcl4 = "2001:4860:8004::67"; // ipv6.google.com
-
- // BEGIN android-changed
- /**
- * An address that resolves to more than one IP address so that the
- * getAllByName test has something to test.
- */
- public static String SpecialInetTestAddress = "www.google.com";
- // changed from jcltestmultiple.apache.org to www.google.com since
- // the old address vaished from the net. www.google.com has also more
- // than one addresses returned for this host name as needed by a test
- // END android-changed
-
- public static int SpecialInetTestAddressNumber = 4;
-
- /**
- * InetAlias1 and InetAlias2 must be different host names that resolve to
- * the same IP address.
- */
- public static String InetAlias1 = "alias1.apache.org";
-
- public static String InetAlias2 = "alias2.apache.org";
-
- public static String FTPTestAddress = "jcltest:jclpass@localhost";
-
- public static String URLConnectionLastModifiedString = "Mon, 14 Jun 1999 21:06:22 GMT";
-
- public static long URLConnectionLastModified = 929394382000L;
-
- public static long URLConnectionDate = 929106872000L;
-
- static Hashtable<String, String> props = null;
- static {
- loadProperties();
- HomeAddress = WebName + DomainAddress;
- TestResources = HomeAddress + TestResourcesDir;
- }
-
- static void loadProperties() {
- InputStream in = null;
- Hashtable<String, String> props = new Hashtable<String, String>();
-
- String iniName = System.getProperty("test.ini.file", "JCLAuto.ini");
-
- try {
- in = new FileInputStream(iniName);
- } catch (IOException e) {
- } catch (Exception e) {
- System.out.println("SupportConfiguration.loadProperties()");
- System.out.println(e);
- e.printStackTrace();
- }
- if (in == null) {
- try {
- Class<?> cl = Class
- .forName("com.ibm.support.Support_Configuration");
- in = cl.getResourceAsStream(iniName);
- } catch (ClassNotFoundException e) {
- }
- }
- try {
- if (in != null) {
- load(in, props);
- }
- } catch (IOException e) {
- }
- if (props.size() == 0) {
- return;
- }
- String value;
-
- value = props.get("DomainAddress");
- if (value != null) {
- DomainAddress = value;
- }
-
- value = props.get("WebName");
- if (value != null) {
- WebName = value;
- }
-
- value = props.get("TestResourcesDir");
- if (value != null) {
- TestResourcesDir = value;
- }
- value = props.get("HomeAddressResponse");
- if (value != null) {
- HomeAddressResponse = value;
- }
-
- value = props.get("HomeAddressSoftware");
- if (value != null) {
- HomeAddressSoftware = value;
- }
-
- value = props.get("SocksServerTestHost");
- if (value != null) {
- SocksServerTestHost = value;
- }
-
- value = props.get("SocksServerTestPort");
- if (value != null) {
- SocksServerTestPort = Integer.parseInt(value);
- }
-
- value = props.get("UnresolvedIP");
- if (value != null) {
- UnresolvedIP = value;
- }
-
- value = props.get("InetTestAddress");
- if (value != null) {
- InetTestAddress = value;
- }
-
- value = props.get("InetTestIP");
- if (value != null) {
- InetTestIP = value;
- byte[] addr = new byte[4];
- int last = 0;
- try {
- for (int i = 0; i < 3; i++) {
- int dot = InetTestIP.indexOf('.', last);
- addr[i] = (byte) Integer.parseInt(InetTestIP.substring(
- last, dot));
- last = dot + 1;
- }
- addr[3] = (byte) Integer.parseInt(InetTestIP.substring(last));
- InetTestCaddr = addr;
- } catch (RuntimeException e) {
- System.out.println("Error parsing InetTestIP (" + InetTestIP
- + ")");
- System.out.println(e);
- }
- }
-
- value = props.get("NonLocalAddressBytes");
- if (value != null) {
- String nonLocalAddressBytesString = value;
- byte[] addr = new byte[4];
- int last = 0;
- try {
- for (int i = 0; i < 3; i++) {
- int dot = nonLocalAddressBytesString.indexOf('.', last);
- addr[i] = (byte) Integer
- .parseInt(nonLocalAddressBytesString.substring(
- last, dot));
- last = dot + 1;
- }
- addr[3] = (byte) Integer.parseInt(nonLocalAddressBytesString
- .substring(last));
- nonLocalAddressBytes = addr;
- } catch (RuntimeException e) {
- System.out.println("Error parsing NonLocalAddressBytes ("
- + nonLocalAddressBytesString + ")");
- System.out.println(e);
- }
- }
-
- value = props.get("InetTestAddress2");
- if (value != null) {
- InetTestAddress2 = value;
- }
-
- value = props.get("InetTestIP2");
- if (value != null) {
- InetTestIP2 = value;
- }
-
- value = props.get("SpecialInetTestAddress");
- if (value != null) {
- SpecialInetTestAddress = value;
- }
-
- value = props.get("SpecialInetTestAddressNumber");
- if (value != null) {
- SpecialInetTestAddressNumber = Integer.parseInt(value);
- }
-
- value = props.get("FTPTestAddress");
- if (value != null) {
- FTPTestAddress = value;
- }
-
- value = props.get("URLConnectionLastModifiedString");
- if (value != null) {
- URLConnectionLastModifiedString = value;
- }
-
- value = props.get("URLConnectionLastModified");
- if (value != null) {
- URLConnectionLastModified = Long.parseLong(value);
- }
-
- value = props.get("URLConnectionDate");
- if (value != null) {
- URLConnectionDate = Long.parseLong(value);
- }
-
- value = props.get("InetAlias1");
- if (value != null) {
- InetAlias1 = value;
- }
-
- value = props.get("InetAlias2");
- if (value != null) {
- InetAlias2 = value;
- }
-
- value = props.get("IPv6GlobalAddressJcl4");
- if (value != null) {
- IPv6GlobalAddressJcl4 = value;
- }
-
- }
-
- static void load(InputStream in, Hashtable<String, String> result) throws IOException {
- int NONE = 0, SLASH = 1, UNICODE = 2, CONTINUE = 3, DONE = 4, IGNORE = 5;
- int mode = NONE, unicode = 0, count = 0, nextChar;
- StringBuffer key = new StringBuffer(), value = new StringBuffer(), buffer = key;
- boolean firstChar = true;
-
- while ((nextChar = in.read()) != -1) {
- if (mode == UNICODE) {
- int digit = Character.digit((char) nextChar, 16);
- if (digit >= 0) {
- unicode = (unicode << 4) + digit;
- if (++count < 4) {
- continue;
- }
- }
- mode = NONE;
- buffer.append((char) unicode);
- if (nextChar != '\n') {
- continue;
- }
- }
- if (mode == SLASH) {
- mode = NONE;
- switch (nextChar) {
- case '\r':
- mode = CONTINUE; // Look for a following \n
- continue;
- case '\n':
- mode = IGNORE; // Ignore whitespace on the next line
- continue;
- case 'b':
- nextChar = '\b';
- break;
- case 'f':
- nextChar = '\f';
- break;
- case 'n':
- nextChar = '\n';
- break;
- case 'r':
- nextChar = '\r';
- break;
- case 't':
- nextChar = '\t';
- break;
- case 'u':
- mode = UNICODE;
- unicode = count = 0;
- continue;
- }
- } else {
- switch (nextChar) {
- case '#':
- case '!':
- if (firstChar) {
- while ((nextChar = in.read()) != -1) {
- if (nextChar == '\r' || nextChar == '\n') {
- break;
- }
- }
- continue;
- }
- break;
- case '\n':
- if (mode == CONTINUE) { // Part of a \r\n sequence
- mode = IGNORE; // Ignore whitespace on the next line
- continue;
- }
- // fall into the next case
- case '\r':
- mode = NONE;
- firstChar = true;
- if (key.length() > 0 || buffer == value) {
- result.put(key.toString(), value.toString());
- }
- key.setLength(0);
- value.setLength(0);
- buffer = key;
- continue;
- case '\\':
- mode = SLASH;
- continue;
- case ':':
- case '=':
- if (buffer == key) {
- buffer = value;
- continue;
- }
- break;
- }
- char c = (char) nextChar;
- if ((c >= 0x1c && c <= 0x20) || (c >= 0x9 && c <= 0xd)) {
- if (mode == CONTINUE) {
- mode = IGNORE;
- }
- if (buffer.length() == 0 || mode == IGNORE) {
- continue;
- }
- if (buffer == key) {
- mode = DONE;
- continue;
- }
- }
- if (mode == IGNORE || mode == CONTINUE) {
- mode = NONE;
- }
- }
- firstChar = false;
- if (mode == DONE) {
- buffer = value;
- mode = NONE;
- }
- buffer.append((char) nextChar);
- }
- if (key.length() > 0 || buffer == value) {
- result.put(key.toString(), value.toString());
- }
- }
-
+ public static final long URLConnectionDate = 929106872000L;
}