You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by nd...@apache.org on 2006/08/08 06:40:24 UTC
svn commit: r429569 - in
/incubator/harmony/enhanced/classlib/trunk/modules/luni: ./
src/test/api/java/org/apache/harmony/luni/tests/java/lang/
src/test/java/org/apache/harmony/luni/
src/test/java/org/apache/harmony/luni/tests/ src/test/java/org/apache...
Author: ndbeyer
Date: Mon Aug 7 21:40:21 2006
New Revision: 429569
URL: http://svn.apache.org/viewvc?rev=429569&view=rev
Log:
Consolidate the majority of 'java.lang' tests; attempt to un-exclude some tests.
Added:
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/
- copied from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/java/org/apache/harmony/luni/tests/java/lang/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ArrayCopyTest.java
- copied, changed from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ArrayCopyTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/Character_UnicodeBlockTest.java
- copied, changed from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/tests/java/lang/Character_UnicodeBlockTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassTest.java
- copied, changed from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ClassTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/CompilerTest.java
- copied, changed from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/CompilerTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/InheritableThreadLocalTest.java
- copied, changed from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/InheritableThreadLocalTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/MathTest.java
- copied, changed from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/MathTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ObjectTest.java
- copied, changed from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ObjectTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/PackageTest.java
- copied, changed from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/PackageTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/RuntimePermissionTest.java
- copied, changed from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/RuntimePermissionTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/RuntimeTest.java
- copied, changed from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/RuntimeTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SecurityManagerTest.java
- copied, changed from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/tests/java/lang/SecurityManagerTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StringTest.java
- copied, changed from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/tests/java/lang/StringTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SystemTest.java
- copied, changed from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/SystemTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadDeathTest.java
- copied, changed from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ThreadDeathTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadGroupTest.java
- copied, changed from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ThreadGroupTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadLocalTest.java
- copied, changed from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ThreadLocalTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadTest.java
- copied, changed from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ThreadTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/org/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/org/apache/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/org/apache/harmony/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/org/apache/harmony/luni/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/org/apache/harmony/luni/tests/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/org/apache/harmony/luni/tests/test_resource.txt (with props)
Removed:
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/java/org/apache/harmony/luni/tests/java/lang/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/tests/java/lang/AllTests.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/tests/java/lang/Character_UnicodeBlockTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/tests/java/lang/SecurityManagerTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/tests/java/lang/StringTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/tests/luni/AllTests.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/AllTests.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ArrayCopyTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/BooleanTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ByteTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ClassLoaderTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ClassTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/CompilerTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/HelloWorldTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/InheritableThreadLocalTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/MathTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ObjectTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/PackageTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/RuntimePermissionTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/RuntimeTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/SystemTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ThreadDeathTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ThreadGroupTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ThreadLocalTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ThreadTest.java
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/BooleanTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ByteTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassLoaderTest.java
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml?rev=429569&r1=429568&r2=429569&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml Mon Aug 7 21:40:21 2006
@@ -377,13 +377,9 @@
</fileset>
<fileset dir="${hy.luni.src.test}/java">
<include name="**/*Test.java"/>
- <exclude name="tests/api/java/lang/IllegalThreadStateExceptionTest.java" />
- <exclude name="tests/api/java/lang/ThreadTest.java" />
<exclude name="tests/api/java/io/InputStreamReaderTest.java" />
<exclude name="tests/api/java/io/OutputStreamWriterTest.java" />
<exclude name="tests/api/java/io/PipedInputStreamTest.java" />
- <exclude name="tests/api/java/lang/AssertionErrorTest.java" />
- <exclude name="tests/api/java/lang/ClassTest.java" />
<exclude name="tests/api/java/lang/ProcessTest.java" />
<exclude name="tests/api/java/net/DatagramSocketTest.java" />
<exclude name="tests/api/java/net/HttpURLConnectionTest.java" />
Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ArrayCopyTest.java (from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ArrayCopyTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ArrayCopyTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ArrayCopyTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ArrayCopyTest.java&r1=429546&r2=429569&rev=429569&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ArrayCopyTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ArrayCopyTest.java Mon Aug 7 21:40:21 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.lang;
+package org.apache.harmony.luni.tests.java.lang;
import junit.framework.TestCase;
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/BooleanTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/BooleanTest.java?rev=429569&r1=429546&r2=429569&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/BooleanTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/BooleanTest.java Mon Aug 7 21:40:21 2006
@@ -34,7 +34,7 @@
assertEquals(Boolean.TRUE, new Boolean("TRUE"));
assertEquals(Boolean.TRUE, new Boolean("true"));
assertEquals(Boolean.TRUE, new Boolean("True"));
-
+
assertEquals(Boolean.FALSE, new Boolean("yes"));
assertEquals(Boolean.FALSE, new Boolean("false"));
}
@@ -74,10 +74,10 @@
public void test_getBooleanLjava_lang_String() {
System.setProperty(getClass().getName(), "true");
assertTrue(Boolean.getBoolean(getClass().getName()));
-
+
System.setProperty(getClass().getName(), "TRUE");
assertTrue(Boolean.getBoolean(getClass().getName()));
-
+
System.setProperty(getClass().getName(), "false");
assertFalse(Boolean.getBoolean(getClass().getName()));
}
@@ -104,13 +104,18 @@
public void test_valueOfLjava_lang_String() {
assertEquals(Boolean.TRUE, Boolean.valueOf("true"));
assertEquals(Boolean.FALSE, Boolean.valueOf("false"));
-
+
assertEquals(Boolean.TRUE, Boolean.valueOf("TRUE"));
assertEquals(Boolean.FALSE, Boolean.valueOf("false"));
-
+
assertEquals(Boolean.FALSE, Boolean.valueOf(null));
assertEquals(Boolean.FALSE, Boolean.valueOf(""));
assertEquals(Boolean.FALSE, Boolean.valueOf("invalid"));
+
+ assertTrue("Failed to parse true to true", Boolean.valueOf("true").booleanValue());
+ assertTrue("Failed to parse mixed case true to true", Boolean.valueOf("TrUe")
+ .booleanValue());
+ assertTrue("parsed non-true to true", !Boolean.valueOf("ddddd").booleanValue());
}
/**
@@ -133,19 +138,19 @@
assertFalse(Boolean.parseBoolean("invalid"));
}
- /**
- * @tests java.lang.Boolean#compareTo(Boolean)
- */
- public void test_compareToLjava_lang_Boolean() {
- assertTrue(Boolean.TRUE.compareTo(Boolean.TRUE) == 0);
- assertTrue(Boolean.FALSE.compareTo(Boolean.FALSE) == 0);
- assertTrue(Boolean.TRUE.compareTo(Boolean.FALSE) > 0);
- assertTrue(Boolean.FALSE.compareTo(Boolean.TRUE) < 0);
-
- try {
- Boolean.TRUE.compareTo(null);
- fail("No NPE");
- } catch (NullPointerException e) {
- }
- }
+ /**
+ * @tests java.lang.Boolean#compareTo(Boolean)
+ */
+ public void test_compareToLjava_lang_Boolean() {
+ assertTrue(Boolean.TRUE.compareTo(Boolean.TRUE) == 0);
+ assertTrue(Boolean.FALSE.compareTo(Boolean.FALSE) == 0);
+ assertTrue(Boolean.TRUE.compareTo(Boolean.FALSE) > 0);
+ assertTrue(Boolean.FALSE.compareTo(Boolean.TRUE) < 0);
+
+ try {
+ Boolean.TRUE.compareTo(null);
+ fail("No NPE");
+ } catch (NullPointerException e) {
+ }
+ }
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ByteTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ByteTest.java?rev=429569&r1=429546&r2=429569&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ByteTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ByteTest.java Mon Aug 7 21:40:21 2006
@@ -19,90 +19,94 @@
public class ByteTest extends TestCase {
- /**
- * @tests java.lang.Byte#valueOf(byte)
- */
- public void test_valueOfB() {
- assertEquals(new Byte(Byte.MIN_VALUE), Byte.valueOf(Byte.MIN_VALUE));
- assertEquals(new Byte(Byte.MAX_VALUE), Byte.valueOf(Byte.MAX_VALUE));
- assertEquals(new Byte((byte) 0), Byte.valueOf((byte) 0));
-
- byte b = Byte.MIN_VALUE + 1;
- while (b < Byte.MAX_VALUE) {
- assertEquals(new Byte(b), Byte.valueOf(b));
- assertSame(Byte.valueOf(b), Byte.valueOf(b));
- b++;
- }
- }
-
+ /**
+ * @tests java.lang.Byte#valueOf(byte)
+ */
+ public void test_valueOfB() {
+ assertEquals(new Byte(Byte.MIN_VALUE), Byte.valueOf(Byte.MIN_VALUE));
+ assertEquals(new Byte(Byte.MAX_VALUE), Byte.valueOf(Byte.MAX_VALUE));
+ assertEquals(new Byte((byte) 0), Byte.valueOf((byte) 0));
+
+ byte b = Byte.MIN_VALUE + 1;
+ while (b < Byte.MAX_VALUE) {
+ assertEquals(new Byte(b), Byte.valueOf(b));
+ assertSame(Byte.valueOf(b), Byte.valueOf(b));
+ b++;
+ }
+ }
+
/**
* @tests java.lang.Byte#hashCode()
*/
public void test_hashCode() {
- assertEquals(1, new Byte((byte)1).hashCode());
- assertEquals(2, new Byte((byte)2).hashCode());
- assertEquals(0, new Byte((byte)0).hashCode());
- assertEquals(-1, new Byte((byte)-1).hashCode());
+ assertEquals(1, new Byte((byte) 1).hashCode());
+ assertEquals(2, new Byte((byte) 2).hashCode());
+ assertEquals(0, new Byte((byte) 0).hashCode());
+ assertEquals(-1, new Byte((byte) -1).hashCode());
}
/**
* @tests java.lang.Byte#Byte(String)
*/
public void test_ConstructorLjava_lang_String() {
- assertEquals(new Byte((byte)0), new Byte("0"));
- assertEquals(new Byte((byte)1), new Byte("1"));
- assertEquals(new Byte((byte)-1), new Byte("-1"));
-
+ assertEquals(new Byte((byte) 0), new Byte("0"));
+ assertEquals(new Byte((byte) 1), new Byte("1"));
+ assertEquals(new Byte((byte) -1), new Byte("-1"));
+
try {
new Byte("0x1");
fail("Expected NumberFormatException with hex string.");
- } catch (NumberFormatException e) {}
+ } catch (NumberFormatException e) {
+ }
try {
new Byte("9.2");
fail("Expected NumberFormatException with floating point string.");
- } catch (NumberFormatException e) {}
+ } catch (NumberFormatException e) {
+ }
try {
new Byte("");
fail("Expected NumberFormatException with empty string.");
- } catch (NumberFormatException e) {}
-
+ } catch (NumberFormatException e) {
+ }
+
try {
new Byte(null);
fail("Expected NumberFormatException with null string.");
- } catch (NumberFormatException e) {}
+ } catch (NumberFormatException e) {
+ }
}
/**
* @tests java.lang.Byte#Byte(byte)
*/
public void test_ConstructorB() {
- assertEquals(1, new Byte((byte)1).byteValue());
- assertEquals(2, new Byte((byte)2).byteValue());
- assertEquals(0, new Byte((byte)0).byteValue());
- assertEquals(-1, new Byte((byte)-1).byteValue());
+ assertEquals(1, new Byte((byte) 1).byteValue());
+ assertEquals(2, new Byte((byte) 2).byteValue());
+ assertEquals(0, new Byte((byte) 0).byteValue());
+ assertEquals(-1, new Byte((byte) -1).byteValue());
}
/**
* @tests java.lang.Byte#byteValue()
*/
public void test_booleanValue() {
- assertEquals(1, new Byte((byte)1).byteValue());
- assertEquals(2, new Byte((byte)2).byteValue());
- assertEquals(0, new Byte((byte)0).byteValue());
- assertEquals(-1, new Byte((byte)-1).byteValue());
+ assertEquals(1, new Byte((byte) 1).byteValue());
+ assertEquals(2, new Byte((byte) 2).byteValue());
+ assertEquals(0, new Byte((byte) 0).byteValue());
+ assertEquals(-1, new Byte((byte) -1).byteValue());
}
/**
* @tests java.lang.Byte#equals(Object)
*/
public void test_equalsLjava_lang_Object() {
- assertEquals(new Byte((byte)0), Byte.valueOf((byte)0));
- assertEquals(new Byte((byte)1), Byte.valueOf((byte)1));
- assertEquals(new Byte((byte)-1), Byte.valueOf((byte)-1));
-
- Byte fixture = new Byte((byte)25);
+ assertEquals(new Byte((byte) 0), Byte.valueOf((byte) 0));
+ assertEquals(new Byte((byte) 1), Byte.valueOf((byte) 1));
+ assertEquals(new Byte((byte) -1), Byte.valueOf((byte) -1));
+
+ Byte fixture = new Byte((byte) 25);
assertEquals(fixture, fixture);
assertFalse(fixture.equals(null));
assertFalse(fixture.equals("Not a Byte"));
@@ -112,84 +116,92 @@
* @tests java.lang.Byte#toString()
*/
public void test_toString() {
- assertEquals("-1", new Byte((byte)-1).toString());
- assertEquals("0", new Byte((byte)0).toString());
- assertEquals("1", new Byte((byte)1).toString());
- assertEquals("-1", new Byte((byte)0xFF).toString());
+ assertEquals("-1", new Byte((byte) -1).toString());
+ assertEquals("0", new Byte((byte) 0).toString());
+ assertEquals("1", new Byte((byte) 1).toString());
+ assertEquals("-1", new Byte((byte) 0xFF).toString());
}
/**
* @tests java.lang.Byte#toString(byte)
*/
public void test_toStringB() {
- assertEquals("-1", Byte.toString((byte)-1));
- assertEquals("0", Byte.toString((byte)0));
- assertEquals("1", Byte.toString((byte)1));
- assertEquals("-1", Byte.toString((byte)0xFF));
+ assertEquals("-1", Byte.toString((byte) -1));
+ assertEquals("0", Byte.toString((byte) 0));
+ assertEquals("1", Byte.toString((byte) 1));
+ assertEquals("-1", Byte.toString((byte) 0xFF));
}
/**
* @tests java.lang.Byte#valueOf(String)
*/
public void test_valueOfLjava_lang_String() {
- assertEquals(new Byte((byte)0), Byte.valueOf("0"));
- assertEquals(new Byte((byte)1), Byte.valueOf("1"));
- assertEquals(new Byte((byte)-1), Byte.valueOf("-1"));
-
+ assertEquals(new Byte((byte) 0), Byte.valueOf("0"));
+ assertEquals(new Byte((byte) 1), Byte.valueOf("1"));
+ assertEquals(new Byte((byte) -1), Byte.valueOf("-1"));
+
try {
Byte.valueOf("0x1");
fail("Expected NumberFormatException with hex string.");
- } catch (NumberFormatException e) {}
+ } catch (NumberFormatException e) {
+ }
try {
Byte.valueOf("9.2");
fail("Expected NumberFormatException with floating point string.");
- } catch (NumberFormatException e) {}
+ } catch (NumberFormatException e) {
+ }
try {
Byte.valueOf("");
fail("Expected NumberFormatException with empty string.");
- } catch (NumberFormatException e) {}
-
+ } catch (NumberFormatException e) {
+ }
+
try {
Byte.valueOf(null);
fail("Expected NumberFormatException with null string.");
- } catch (NumberFormatException e) {}
+ } catch (NumberFormatException e) {
+ }
}
-
+
/**
* @tests java.lang.Byte#valueOf(String,int)
*/
public void test_valueOfLjava_lang_StringI() {
- assertEquals(new Byte((byte)0), Byte.valueOf("0", 10));
- assertEquals(new Byte((byte)1), Byte.valueOf("1", 10));
- assertEquals(new Byte((byte)-1), Byte.valueOf("-1", 10));
-
+ assertEquals(new Byte((byte) 0), Byte.valueOf("0", 10));
+ assertEquals(new Byte((byte) 1), Byte.valueOf("1", 10));
+ assertEquals(new Byte((byte) -1), Byte.valueOf("-1", 10));
+
//must be consistent with Character.digit()
assertEquals(Character.digit('1', 2), Byte.valueOf("1", 2).byteValue());
assertEquals(Character.digit('F', 16), Byte.valueOf("F", 16).byteValue());
-
+
try {
Byte.valueOf("0x1", 10);
fail("Expected NumberFormatException with hex string.");
- } catch (NumberFormatException e) {}
+ } catch (NumberFormatException e) {
+ }
try {
Byte.valueOf("9.2", 10);
fail("Expected NumberFormatException with floating point string.");
- } catch (NumberFormatException e) {}
+ } catch (NumberFormatException e) {
+ }
try {
Byte.valueOf("", 10);
fail("Expected NumberFormatException with empty string.");
- } catch (NumberFormatException e) {}
-
+ } catch (NumberFormatException e) {
+ }
+
try {
Byte.valueOf(null, 10);
fail("Expected NumberFormatException with null string.");
- } catch (NumberFormatException e) {}
+ } catch (NumberFormatException e) {
+ }
}
-
+
/**
* @tests java.lang.Byte#parseByte(String)
*/
@@ -197,28 +209,32 @@
assertEquals(0, Byte.parseByte("0"));
assertEquals(1, Byte.parseByte("1"));
assertEquals(-1, Byte.parseByte("-1"));
-
+
try {
Byte.parseByte("0x1");
fail("Expected NumberFormatException with hex string.");
- } catch (NumberFormatException e) {}
+ } catch (NumberFormatException e) {
+ }
try {
Byte.parseByte("9.2");
fail("Expected NumberFormatException with floating point string.");
- } catch (NumberFormatException e) {}
+ } catch (NumberFormatException e) {
+ }
try {
Byte.parseByte("");
fail("Expected NumberFormatException with empty string.");
- } catch (NumberFormatException e) {}
-
+ } catch (NumberFormatException e) {
+ }
+
try {
Byte.parseByte(null);
fail("Expected NumberFormatException with null string.");
- } catch (NumberFormatException e) {}
+ } catch (NumberFormatException e) {
+ }
}
-
+
/**
* @tests java.lang.Byte#parseByte(String,int)
*/
@@ -226,131 +242,475 @@
assertEquals(0, Byte.parseByte("0", 10));
assertEquals(1, Byte.parseByte("1", 10));
assertEquals(-1, Byte.parseByte("-1", 10));
-
+
//must be consistent with Character.digit()
assertEquals(Character.digit('1', 2), Byte.parseByte("1", 2));
assertEquals(Character.digit('F', 16), Byte.parseByte("F", 16));
-
+
try {
Byte.parseByte("0x1", 10);
fail("Expected NumberFormatException with hex string.");
- } catch (NumberFormatException e) {}
+ } catch (NumberFormatException e) {
+ }
try {
Byte.parseByte("9.2", 10);
fail("Expected NumberFormatException with floating point string.");
- } catch (NumberFormatException e) {}
+ } catch (NumberFormatException e) {
+ }
try {
Byte.parseByte("", 10);
fail("Expected NumberFormatException with empty string.");
- } catch (NumberFormatException e) {}
-
+ } catch (NumberFormatException e) {
+ }
+
try {
Byte.parseByte(null, 10);
fail("Expected NumberFormatException with null string.");
- } catch (NumberFormatException e) {}
+ } catch (NumberFormatException e) {
+ }
}
-
+
/**
* @tests java.lang.Byte#decode(String)
*/
public void test_decodeLjava_lang_String() {
- assertEquals(new Byte((byte)0), Byte.decode("0"));
- assertEquals(new Byte((byte)1), Byte.decode("1"));
- assertEquals(new Byte((byte)-1), Byte.decode("-1"));
- assertEquals(new Byte((byte)0xF), Byte.decode("0xF"));
- assertEquals(new Byte((byte)0xF), Byte.decode("#F"));
- assertEquals(new Byte((byte)0xF), Byte.decode("0XF"));
- assertEquals(new Byte((byte)07), Byte.decode("07"));
-
+ assertEquals(new Byte((byte) 0), Byte.decode("0"));
+ assertEquals(new Byte((byte) 1), Byte.decode("1"));
+ assertEquals(new Byte((byte) -1), Byte.decode("-1"));
+ assertEquals(new Byte((byte) 0xF), Byte.decode("0xF"));
+ assertEquals(new Byte((byte) 0xF), Byte.decode("#F"));
+ assertEquals(new Byte((byte) 0xF), Byte.decode("0XF"));
+ assertEquals(new Byte((byte) 07), Byte.decode("07"));
+
try {
Byte.decode("9.2");
fail("Expected NumberFormatException with floating point string.");
- } catch (NumberFormatException e) {}
+ } catch (NumberFormatException e) {
+ }
try {
Byte.decode("");
fail("Expected NumberFormatException with empty string.");
- } catch (NumberFormatException e) {}
-
+ } catch (NumberFormatException e) {
+ }
+
try {
Byte.decode(null);
//undocumented NPE, but seems consistent across JREs
fail("Expected NullPointerException with null string.");
- } catch (NullPointerException e) {}
+ } catch (NullPointerException e) {
+ }
}
-
+
/**
* @tests java.lang.Byte#doubleValue()
*/
public void test_doubleValue() {
- assertEquals(-1D, new Byte((byte)-1).doubleValue(), 0D);
- assertEquals(0D, new Byte((byte)0).doubleValue(), 0D);
- assertEquals(1D, new Byte((byte)1).doubleValue(), 0D);
+ assertEquals(-1D, new Byte((byte) -1).doubleValue(), 0D);
+ assertEquals(0D, new Byte((byte) 0).doubleValue(), 0D);
+ assertEquals(1D, new Byte((byte) 1).doubleValue(), 0D);
}
-
+
/**
* @tests java.lang.Byte#floatValue()
*/
public void test_floatValue() {
- assertEquals(-1F, new Byte((byte)-1).floatValue(), 0F);
- assertEquals(0F, new Byte((byte)0).floatValue(), 0F);
- assertEquals(1F, new Byte((byte)1).floatValue(), 0F);
+ assertEquals(-1F, new Byte((byte) -1).floatValue(), 0F);
+ assertEquals(0F, new Byte((byte) 0).floatValue(), 0F);
+ assertEquals(1F, new Byte((byte) 1).floatValue(), 0F);
}
-
+
/**
* @tests java.lang.Byte#intValue()
*/
public void test_intValue() {
- assertEquals(-1, new Byte((byte)-1).intValue());
- assertEquals(0, new Byte((byte)0).intValue());
- assertEquals(1, new Byte((byte)1).intValue());
+ assertEquals(-1, new Byte((byte) -1).intValue());
+ assertEquals(0, new Byte((byte) 0).intValue());
+ assertEquals(1, new Byte((byte) 1).intValue());
}
-
+
/**
* @tests java.lang.Byte#longValue()
*/
public void test_longValue() {
- assertEquals(-1L, new Byte((byte)-1).longValue());
- assertEquals(0L, new Byte((byte)0).longValue());
- assertEquals(1L, new Byte((byte)1).longValue());
+ assertEquals(-1L, new Byte((byte) -1).longValue());
+ assertEquals(0L, new Byte((byte) 0).longValue());
+ assertEquals(1L, new Byte((byte) 1).longValue());
}
-
+
/**
* @tests java.lang.Byte#shortValue()
*/
public void test_shortValue() {
- assertEquals(-1, new Byte((byte)-1).shortValue());
- assertEquals(0, new Byte((byte)0).shortValue());
- assertEquals(1, new Byte((byte)1).shortValue());
+ assertEquals(-1, new Byte((byte) -1).shortValue());
+ assertEquals(0, new Byte((byte) 0).shortValue());
+ assertEquals(1, new Byte((byte) 1).shortValue());
}
-
+
/**
* @tests java.lang.Byte#compareTo(Byte)
*/
public void test_compareToLjava_lang_Byte() {
final Byte min = new Byte(Byte.MIN_VALUE);
- final Byte zero = new Byte((byte)0);
+ final Byte zero = new Byte((byte) 0);
final Byte max = new Byte(Byte.MAX_VALUE);
-
+
assertTrue(max.compareTo(max) == 0);
assertTrue(min.compareTo(min) == 0);
assertTrue(zero.compareTo(zero) == 0);
-
+
assertTrue(max.compareTo(zero) > 0);
assertTrue(max.compareTo(min) > 0);
-
+
assertTrue(zero.compareTo(max) < 0);
assertTrue(zero.compareTo(min) > 0);
-
+
assertTrue(min.compareTo(zero) < 0);
assertTrue(min.compareTo(max) < 0);
-
+
try {
min.compareTo(null);
fail("No NPE");
} catch (NullPointerException e) {
}
+ }
+
+ /**
+ * @tests java.lang.Byte#Byte(byte)
+ */
+ public void test_ConstructorB2() {
+ // Test for method java.lang.Byte(byte)
+
+ Byte b = new Byte((byte) 127);
+ assertTrue("Byte creation failed", b.byteValue() == (byte) 127);
+ }
+
+ /**
+ * @tests java.lang.Byte#Byte(java.lang.String)
+ */
+ public void test_ConstructorLjava_lang_String2() {
+ // Test for method java.lang.Byte(java.lang.String)
+
+ Byte b = new Byte("127");
+ Byte nb = new Byte("-128");
+ assertTrue("Incorrect Byte Object created", b.byteValue() == (byte) 127
+ && (nb.byteValue() == (byte) -128));
+
+ }
+
+ /**
+ * @tests java.lang.Byte#byteValue()
+ */
+ public void test_byteValue() {
+ // Test for method byte java.lang.Byte.byteValue()
+ assertTrue("Returned incorrect byte value",
+ new Byte((byte) 127).byteValue() == (byte) (127));
+ }
+
+ /**
+ * @tests java.lang.Byte#compareTo(java.lang.Byte)
+ */
+ public void test_compareToLjava_lang_Byte2() {
+ // Test for method int java.lang.Byte.compareTo(java.lang.Byte)
+ assertTrue("Comparison failed", new Byte((byte) 1).compareTo(new Byte((byte) 2)) < 0);
+ assertTrue("Comparison failed", new Byte((byte) 1).compareTo(new Byte((byte) -2)) > 0);
+ assertEquals("Comparison failed", 0, new Byte((byte) 1).compareTo(new Byte((byte) 1)));
+ }
+
+ /**
+ * @tests java.lang.Byte#decode(java.lang.String)
+ */
+ public void test_decodeLjava_lang_String2() {
+ // Test for method java.lang.Byte
+ // java.lang.Byte.decode(java.lang.String)
+ assertTrue("String decoded incorrectly, wanted: 1 got: " + Byte.decode("1").toString(),
+ Byte.decode("1").equals(new Byte((byte) 1)));
+ assertTrue("String decoded incorrectly, wanted: -1 got: "
+ + Byte.decode("-1").toString(), Byte.decode("-1").equals(new Byte((byte) -1)));
+ assertTrue("String decoded incorrectly, wanted: 127 got: "
+ + Byte.decode("127").toString(), Byte.decode("127")
+ .equals(new Byte((byte) 127)));
+ assertTrue("String decoded incorrectly, wanted: -128 got: "
+ + Byte.decode("-128").toString(), Byte.decode("-128").equals(
+ new Byte((byte) -128)));
+ assertTrue("String decoded incorrectly, wanted: 127 got: "
+ + Byte.decode("0x7f").toString(), Byte.decode("0x7f").equals(
+ new Byte((byte) 127)));
+ assertTrue("String decoded incorrectly, wanted: -128 got: "
+ + Byte.decode("-0x80").toString(), Byte.decode("-0x80").equals(
+ new Byte((byte) -128)));
+
+ boolean exception = false;
+ try {
+ Byte.decode("128");
+ } catch (NumberFormatException e) {
+ // Correct
+ exception = true;
+ }
+ assertTrue("Failed to throw exception for MAX_VALUE + 1", exception);
+
+ exception = false;
+ try {
+ Byte.decode("-129");
+ } catch (NumberFormatException e) {
+ // Correct
+ exception = true;
+ }
+ assertTrue("Failed to throw exception for MIN_VALUE - 1", exception);
+
+ exception = false;
+ try {
+ Byte.decode("0x80");
+ } catch (NumberFormatException e) {
+ // Correct
+ exception = true;
+ }
+ assertTrue("Failed to throw exception for hex MAX_VALUE + 1", exception);
+
+ exception = false;
+ try {
+ Byte.decode("-0x81");
+ } catch (NumberFormatException e) {
+ // Correct
+ exception = true;
+ }
+ assertTrue("Failed to throw exception for hex MIN_VALUE - 1", exception);
+ }
+
+ /**
+ * @tests java.lang.Byte#doubleValue()
+ */
+ public void test_doubleValue2() {
+ // Test for method double java.lang.Byte.doubleValue()
+ assertTrue("Returned incorrect double value",
+ new Byte((byte) 127).doubleValue() == (double) (127));
+ }
+
+ /**
+ * @tests java.lang.Byte#equals(java.lang.Object)
+ */
+ public void test_equalsLjava_lang_Object2() {
+ // Test for method boolean java.lang.Byte.equals(java.lang.Object)
+ Byte b1 = new Byte((byte) 90);
+ Byte b2 = new Byte((byte) 90);
+ Byte b3 = new Byte((byte) -90);
+ assertTrue("Equality test failed", b1.equals(b2));
+ assertTrue("Equality test failed", !b1.equals(b3));
+ }
+
+ /**
+ * @tests java.lang.Byte#floatValue()
+ */
+ public void test_floatValue2() {
+ // Test for method float java.lang.Byte.floatValue()
+ assertTrue("Returned incorrect float value",
+ new Byte((byte) 127).byteValue() == (float) (127));
+ }
+
+ /**
+ * @tests java.lang.Byte#hashCode()
+ */
+ public void test_hashCode2() {
+ // Test for method int java.lang.Byte.hashCode()
+ assertEquals("Incorrect hash returned", 127, new Byte((byte) 127).hashCode());
+ }
+
+ /**
+ * @tests java.lang.Byte#intValue()
+ */
+ public void test_intValue2() {
+ // Test for method int java.lang.Byte.intValue()
+ assertEquals("Returned incorrect int value", 127, new Byte((byte) 127).intValue());
+ }
+
+ /**
+ * @tests java.lang.Byte#longValue()
+ */
+ public void test_longValue2() {
+ // Test for method long java.lang.Byte.longValue()
+ assertEquals("Returned incorrect long value", 127L, new Byte((byte) 127).longValue());
+ }
+
+ /**
+ * @tests java.lang.Byte#parseByte(java.lang.String)
+ */
+ public void test_parseByteLjava_lang_String2() {
+ // Test for method byte java.lang.Byte.parseByte(java.lang.String)
+
+ byte b = Byte.parseByte("127");
+ byte bn = Byte.parseByte("-128");
+ assertTrue("Invalid parse of byte", b == (byte) 127 && (bn == (byte) -128));
+ assertEquals("Returned incorrect value for 0", 0, Byte.parseByte("0"));
+ assertTrue("Returned incorrect value for most negative value",
+ Byte.parseByte("-128") == (byte) 0x80);
+ assertTrue("Returned incorrect value for most positive value",
+ Byte.parseByte("127") == 0x7f);
+
+ boolean exception = false;
+ try {
+ Byte.parseByte("-1000");
+ } catch (NumberFormatException e) {
+ // Correct
+ exception = true;
+ }
+ assertTrue("Failed to throw exception", exception);
+
+ exception = false;
+ try {
+ Byte.parseByte("128");
+ } catch (NumberFormatException e) {
+ // Correct
+ exception = true;
+ }
+ assertTrue("Failed to throw exception for MAX_VALUE + 1", exception);
+
+ exception = false;
+ try {
+ Byte.parseByte("-129");
+ } catch (NumberFormatException e) {
+ // Correct
+ exception = true;
+ }
+ assertTrue("Failed to throw exception for MIN_VALUE - 1", exception);
+ }
+
+ /**
+ * @tests java.lang.Byte#parseByte(java.lang.String, int)
+ */
+ public void test_parseByteLjava_lang_StringI2() {
+ // Test for method byte java.lang.Byte.parseByte(java.lang.String, int)
+ byte b = Byte.parseByte("127", 10);
+ byte bn = Byte.parseByte("-128", 10);
+ assertTrue("Invalid parse of dec byte", b == (byte) 127 && (bn == (byte) -128));
+ assertEquals("Failed to parse hex value", 10, Byte.parseByte("A", 16));
+ assertEquals("Returned incorrect value for 0 hex", 0, Byte.parseByte("0", 16));
+ assertTrue("Returned incorrect value for most negative value hex", Byte.parseByte(
+ "-80", 16) == (byte) 0x80);
+ assertTrue("Returned incorrect value for most positive value hex", Byte.parseByte("7f",
+ 16) == 0x7f);
+ assertEquals("Returned incorrect value for 0 decimal", 0, Byte.parseByte("0", 10));
+ assertTrue("Returned incorrect value for most negative value decimal", Byte.parseByte(
+ "-128", 10) == (byte) 0x80);
+ assertTrue("Returned incorrect value for most positive value decimal", Byte.parseByte(
+ "127", 10) == 0x7f);
+
+ boolean exception = false;
+ try {
+ Byte.parseByte("-1000", 10);
+ } catch (NumberFormatException e) {
+ // Correct
+ exception = true;
+ }
+ assertTrue("Failed to throw exception", exception);
+
+ exception = false;
+ try {
+ Byte.parseByte("128", 10);
+ } catch (NumberFormatException e) {
+ // Correct
+ exception = true;
+ }
+ assertTrue("Failed to throw exception for MAX_VALUE + 1", exception);
+
+ exception = false;
+ try {
+ Byte.parseByte("-129", 10);
+ } catch (NumberFormatException e) {
+ // Correct
+ exception = true;
+ }
+ assertTrue("Failed to throw exception for MIN_VALUE - 1", exception);
+
+ exception = false;
+ try {
+ Byte.parseByte("80", 16);
+ } catch (NumberFormatException e) {
+ // Correct
+ exception = true;
+ }
+ assertTrue("Failed to throw exception for hex MAX_VALUE + 1", exception);
+
+ exception = false;
+ try {
+ Byte.parseByte("-81", 16);
+ } catch (NumberFormatException e) {
+ // Correct
+ exception = true;
+ }
+ assertTrue("Failed to throw exception for hex MIN_VALUE + 1", exception);
+ }
+
+ /**
+ * @tests java.lang.Byte#shortValue()
+ */
+ public void test_shortValue2() {
+ // Test for method short java.lang.Byte.shortValue()
+ assertTrue("Returned incorrect short value",
+ new Byte((byte) 127).shortValue() == (short) (127));
+ }
+
+ /**
+ * @tests java.lang.Byte#toString()
+ */
+ public void test_toString2() {
+ // Test for method java.lang.String java.lang.Byte.toString()
+ assertEquals("Returned incorrect String", "127", new Byte((byte) 127).toString());
+ assertEquals("Returned incorrect String", "-127", new Byte((byte) -127).toString());
+ assertEquals("Returned incorrect String", "-128", new Byte((byte) -128).toString());
+ }
+
+ /**
+ * @tests java.lang.Byte#toString(byte)
+ */
+ public void test_toStringB2() {
+ // Test for method java.lang.String java.lang.Byte.toString(byte)
+ assertEquals("Returned incorrect String", "127", Byte.toString((byte) 127));
+ assertEquals("Returned incorrect String", "-127", Byte.toString((byte) -127));
+ assertEquals("Returned incorrect String", "-128", Byte.toString((byte) -128));
+ }
+
+ /**
+ * @tests java.lang.Byte#valueOf(java.lang.String)
+ */
+ public void test_valueOfLjava_lang_String2() {
+ // Test for method java.lang.Byte
+ // java.lang.Byte.valueOf(java.lang.String)
+ assertEquals("Returned incorrect byte", 0, Byte.valueOf("0").byteValue());
+ assertEquals("Returned incorrect byte", 127, Byte.valueOf("127").byteValue());
+ assertEquals("Returned incorrect byte", -127, Byte.valueOf("-127").byteValue());
+ assertEquals("Returned incorrect byte", -128, Byte.valueOf("-128").byteValue());
+
+ try {
+ Byte.valueOf("128");
+ } catch (NumberFormatException e) {
+ // Correct
+ return;
+ }
+ fail("Failed to throw exception when passes value > byte");
+ }
+
+ /**
+ * @tests java.lang.Byte#valueOf(java.lang.String, int)
+ */
+ public void test_valueOfLjava_lang_StringI2() {
+ // Test for method java.lang.Byte
+ // java.lang.Byte.valueOf(java.lang.String, int)
+ assertEquals("Returned incorrect byte", 10, Byte.valueOf("A", 16).byteValue());
+ assertEquals("Returned incorrect byte", 127, Byte.valueOf("127", 10).byteValue());
+ assertEquals("Returned incorrect byte", -127, Byte.valueOf("-127", 10).byteValue());
+ assertEquals("Returned incorrect byte", -128, Byte.valueOf("-128", 10).byteValue());
+ assertEquals("Returned incorrect byte", 127, Byte.valueOf("7f", 16).byteValue());
+ assertEquals("Returned incorrect byte", -127, Byte.valueOf("-7f", 16).byteValue());
+ assertEquals("Returned incorrect byte", -128, Byte.valueOf("-80", 16).byteValue());
+
+ try {
+ Byte.valueOf("128", 10);
+ } catch (NumberFormatException e) {
+ // Correct
+ return;
+ }
+ fail("Failed to throw exception when passes value > byte");
}
}
Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/Character_UnicodeBlockTest.java (from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/tests/java/lang/Character_UnicodeBlockTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/Character_UnicodeBlockTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/Character_UnicodeBlockTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/tests/java/lang/Character_UnicodeBlockTest.java&r1=429546&r2=429569&rev=429569&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/tests/java/lang/Character_UnicodeBlockTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/Character_UnicodeBlockTest.java Mon Aug 7 21:40:21 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package org.apache.harmony.luni.tests.java.lang;
import junit.framework.TestCase;
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassLoaderTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassLoaderTest.java?rev=429569&r1=429546&r2=429569&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassLoaderTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassLoaderTest.java Mon Aug 7 21:40:21 2006
@@ -27,60 +27,121 @@
import java.security.SecurityPermission;
import junit.framework.TestCase;
-
public class ClassLoaderTest extends TestCase {
/**
- * Tests that Classloader.defineClass() assignes appropriate
+ * Tests that Classloader.defineClass() assigns appropriate
* default domains to the defined classes.
*/
public void test_defineClass_defaultDomain() throws Exception {
// Regression for HARMONY-765
DynamicPolicy plc = new DynamicPolicy();
Policy back = Policy.getPolicy();
- try{
+ try {
Policy.setPolicy(plc);
Class a = new Ldr().define();
Permission p = new SecurityPermission("abc");
- assertFalse("impossible! misconfiguration?",
- a.getProtectionDomain().implies(p));
-
+ assertFalse("impossible! misconfiguration?", a.getProtectionDomain().implies(p));
+
plc.pc = p.newPermissionCollection();
plc.pc.add(p);
- assertTrue("default domain is not dynamic",
- a.getProtectionDomain().implies(p));
+ assertTrue("default domain is not dynamic", a.getProtectionDomain().implies(p));
} finally {
Policy.setPolicy(back);
}
}
+ /**
+ * @tests java.lang.ClassLoader#getResource(java.lang.String)
+ */
+ public void test_getResourceLjava_lang_String() {
+ // Test for method java.net.URL
+ // java.lang.ClassLoader.getResource(java.lang.String)
+ java.net.URL u = ClassLoader.getSystemClassLoader().getResource("hyts_Foo.c");
+ assertNotNull("Unable to find resource", u);
+ java.io.InputStream is = null;
+ try {
+ is = u.openStream();
+ assertNotNull("Resource returned is invalid", is);
+ is.close();
+ } catch (java.io.IOException e) {
+ fail("IOException getting stream for resource : " + e.getMessage());
+ }
+ }
+
+ /**
+ * @tests java.lang.ClassLoader#getResourceAsStream(java.lang.String)
+ */
+ public void test_getResourceAsStreamLjava_lang_String() {
+ // Test for method java.io.InputStream
+ // java.lang.ClassLoader.getResourceAsStream(java.lang.String)
+ // Need better test...
+
+ java.io.InputStream is = null;
+ assertNotNull("Failed to find resource: hyts_Foo.c", (is = ClassLoader
+ .getSystemClassLoader().getResourceAsStream("hyts_Foo.c")));
+ try {
+ is.close();
+ } catch (java.io.IOException e) {
+ fail("Exception during getResourceAsStream: " + e.toString());
+ }
+ }
+
+ /**
+ * @tests java.lang.ClassLoader#getSystemClassLoader()
+ */
+ public void test_getSystemClassLoader() {
+ // Test for method java.lang.ClassLoader
+ // java.lang.ClassLoader.getSystemClassLoader()
+ ClassLoader cl = ClassLoader.getSystemClassLoader();
+ java.io.InputStream is = cl.getResourceAsStream("hyts_Foo.c");
+ assertNotNull("Failed to find resource from system classpath", is);
+ try {
+ is.close();
+ } catch (java.io.IOException e) {
+ }
+
+ }
+
+ /**
+ * @tests java.lang.ClassLoader#getSystemResource(java.lang.String)
+ */
+ public void test_getSystemResourceLjava_lang_String() {
+ // Test for method java.net.URL
+ // java.lang.ClassLoader.getSystemResource(java.lang.String)
+ // Need better test...
+ assertNotNull("Failed to find resource: hyts_Foo.c", ClassLoader
+ .getSystemResource("hyts_Foo.c"));
+ }
}
class DynamicPolicy extends Policy {
- public PermissionCollection pc;
+ public PermissionCollection pc;
- public PermissionCollection getPermissions(ProtectionDomain pd) {
- return pc;
- }
+ public PermissionCollection getPermissions(ProtectionDomain pd) {
+ return pc;
+ }
- public PermissionCollection getPermissions(CodeSource codesource) {
- return pc;
- }
+ public PermissionCollection getPermissions(CodeSource codesource) {
+ return pc;
+ }
- public void refresh() {}
+ public void refresh() {
+ }
}
-class A{}
+class A {
+}
class Ldr extends ClassLoader {
- public Class define() throws Exception{
+ public Class define() throws Exception {
Package p = getClass().getPackage();
- String path =
- p == null ? "" : p.getName().replace('.', File.separatorChar) + File.separator;
- InputStream is = getResourceAsStream(path+"A.class");
+ String path = p == null ? "" : p.getName().replace('.', File.separatorChar)
+ + File.separator;
+ InputStream is = getResourceAsStream(path + "A.class");
byte[] buf = new byte[512];
int len = is.read(buf);
return defineClass(buf, 0, len);
Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassTest.java (from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ClassTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ClassTest.java&r1=429546&r2=429569&rev=429569&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ClassTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassTest.java Mon Aug 7 21:40:21 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.lang;
+package org.apache.harmony.luni.tests.java.lang;
import java.io.File;
import java.io.IOException;
@@ -731,20 +731,10 @@
* @tests java.lang.Class#getResource(java.lang.String)
*/
public void test_getResourceLjava_lang_String() {
- // Test for method java.net.URL
- // java.lang.Class.getResource(java.lang.String)
- String name = Support_Resources.RESOURCE_PACKAGE + "hyts_compressD.txt";
- System.setSecurityManager(new SecurityManager());
- try {
- java.net.URL res = Object.class.getResource("Object.class");
- assertNull("Object.class should not be found", res);
-
- assertNotNull("Security: the file " + name
- + " can not be found in this directory", ClassTest.class
- .getResource(name));
- } finally {
- System.setSecurityManager(null);
- }
+ final String name = "/org/apache/harmony/luni/tests/test_resource.txt";
+
+ java.net.URL res = getClass().getResource(name);
+ assertNotNull(res);
}
/**
@@ -754,42 +744,16 @@
// Test for method java.io.InputStream
// java.lang.Class.getResourceAsStream(java.lang.String)
- String name = Support_Resources.RESOURCE_PACKAGE + "hyts_compressD.txt";
- Class clazz = null;
- try {
- clazz = Class.forName("tests.api.java.lang.ClassTest");
- } catch (ClassNotFoundException e) {
- fail(
- "Should be able to find the class tests.api.java.lang.ClassTest");
- }
+ final String name = "/org/apache/harmony/luni/tests/test_resource.txt";
assertNotNull("the file " + name + " can not be found in this directory",
- clazz.getResourceAsStream(name));
+ getClass().getResourceAsStream(name));
- System.setSecurityManager(new SecurityManager());
- try {
- InputStream res = Object.class.getResourceAsStream("Object.class");
- assertNull("Object.class should not be found", res);
- InputStream is = ClassTest.class.getResourceAsStream(name);
- assertNotNull("Security: the file " + name
- + " can not be found in this directory", is);
- } finally {
- System.setSecurityManager(null);
- }
-
- name = "hyts_Foo.c";
- assertNull("the file " + name
- + " should not be found in this directory", clazz
- .getResourceAsStream(name));
- assertNotNull("the file " + name
- + " can not be found in the root directory", clazz
- .getResourceAsStream("/" + name));
+ final String nameBadURI = "org/apache/harmony/luni/tests/test_resource.txt";
+ assertNull("the file " + nameBadURI
+ + " should not be found in this directory", getClass()
+ .getResourceAsStream(nameBadURI));
- try {
- clazz = Class.forName("java.lang.Object");
- } catch (ClassNotFoundException e) {
- fail("Should be able to find the class java.lang.Object");
- }
- InputStream str = clazz.getResourceAsStream("Class.class");
+ InputStream str = Object.class.getResourceAsStream("Class.class");
assertNotNull(
"java.lang.Object couldn't find its class with getResource...",
str);
@@ -801,8 +765,7 @@
fail("Exception while closing resource stream 1.");
}
- InputStream str2 = getClass().getResourceAsStream(
- Support_Resources.RESOURCE_PACKAGE + "hyts_compressD.txt");
+ InputStream str2 = getClass().getResourceAsStream("ClassTest.class");
assertNotNull("Can't find resource", str2);
try {
assertTrue("Cannot read single byte", str2.read() != -1);
@@ -866,48 +829,25 @@
}
/**
- * @tests java.lang.Class#isAssignableFrom(java.lang.Class)
- */
- public void test_isAssignableFromLjava_lang_Class() {
- // Test for method boolean
- // java.lang.Class.isAssignableFrom(java.lang.Class)
- Class clazz1 = null;
- Class clazz2 = null;
- try {
- clazz1 = Class.forName("java.lang.Object");
- } catch (ClassNotFoundException e) {
- fail("Should be able to find the class java.lang.Object");
- }
- try {
- clazz2 = Class.forName("java.lang.Class");
- } catch (ClassNotFoundException e) {
- fail("Should be able to find the class java.lang.Class");
- }
- assertTrue("returned false for superclass", clazz1
- .isAssignableFrom(clazz2));
-
- try {
- clazz1 = Class.forName("tests.api.java.lang.ClassTest$TestClass");
- } catch (ClassNotFoundException e) {
- fail(
- "Should be able to find the class tests.api.java.lang.ClassTest$TestClass");
- }
- assertTrue("returned false for same class", clazz1
- .isAssignableFrom(clazz1));
-
- try {
- clazz1 = Class.forName("java.lang.Runnable");
- } catch (ClassNotFoundException e) {
- fail("Should be able to find the class java.lang.Runnable");
- }
- try {
- clazz2 = Class.forName("java.lang.Thread");
- } catch (ClassNotFoundException e) {
- fail("Should be able to find the class java.lang.Thread");
- }
- assertTrue("returned false for implemented interface", clazz1
- .isAssignableFrom(clazz2));
- }
+ * @tests java.lang.Class#isAssignableFrom(java.lang.Class)
+ */
+ public void test_isAssignableFromLjava_lang_Class() {
+ // Test for method boolean
+ // java.lang.Class.isAssignableFrom(java.lang.Class)
+ Class<?> clazz1 = null;
+ Class<?> clazz2 = null;
+
+ clazz1 = Object.class;
+ clazz2 = Class.class;
+ assertTrue("returned false for superclass", clazz1.isAssignableFrom(clazz2));
+
+ clazz1 = TestClass.class;
+ assertTrue("returned false for same class", clazz1.isAssignableFrom(clazz1));
+
+ clazz1 = Runnable.class;
+ clazz2 = Thread.class;
+ assertTrue("returned false for implemented interface", clazz1.isAssignableFrom(clazz2));
+ }
/**
* @tests java.lang.Class#isInterface()
@@ -1048,19 +988,5 @@
}
assertTrue("Class toString printed wrong value:" + clazz.toString(),
clazz.toString().equals("class [Ljava.lang.Object;"));
- }
-
- /**
- * Sets up the fixture, for example, open a network connection. This method
- * is called before a test is executed.
- */
- protected void setUp() {
- }
-
- /**
- * Tears down the fixture, for example, close a network connection. This
- * method is called after a test is executed.
- */
- protected void tearDown() {
}
}
Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/CompilerTest.java (from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/CompilerTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/CompilerTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/CompilerTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/CompilerTest.java&r1=429546&r2=429569&rev=429569&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/CompilerTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/CompilerTest.java Mon Aug 7 21:40:21 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.lang;
+package org.apache.harmony.luni.tests.java.lang;
public class CompilerTest extends junit.framework.TestCase {
Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/InheritableThreadLocalTest.java (from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/InheritableThreadLocalTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/InheritableThreadLocalTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/InheritableThreadLocalTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/InheritableThreadLocalTest.java&r1=429546&r2=429569&rev=429569&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/InheritableThreadLocalTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/InheritableThreadLocalTest.java Mon Aug 7 21:40:21 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.lang;
+package org.apache.harmony.luni.tests.java.lang;
public class InheritableThreadLocalTest extends junit.framework.TestCase {
Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/MathTest.java (from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/MathTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/MathTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/MathTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/MathTest.java&r1=429546&r2=429569&rev=429569&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/MathTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/MathTest.java Mon Aug 7 21:40:21 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.lang;
+package org.apache.harmony.luni.tests.java.lang;
public class MathTest extends junit.framework.TestCase {
Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ObjectTest.java (from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ObjectTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ObjectTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ObjectTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ObjectTest.java&r1=429546&r2=429569&rev=429569&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ObjectTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ObjectTest.java Mon Aug 7 21:40:21 2006
@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package tests.api.java.lang;
+package org.apache.harmony.luni.tests.java.lang;
public class ObjectTest extends junit.framework.TestCase {
Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/PackageTest.java (from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/PackageTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/PackageTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/PackageTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/PackageTest.java&r1=429546&r2=429569&rev=429569&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/PackageTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/PackageTest.java Mon Aug 7 21:40:21 2006
@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package tests.api.java.lang;
+package org.apache.harmony.luni.tests.java.lang;
import java.io.File;
import java.lang.reflect.Method;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/RuntimePermissionTest.java (from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/RuntimePermissionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/RuntimePermissionTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/RuntimePermissionTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/RuntimePermissionTest.java&r1=429546&r2=429569&rev=429569&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/RuntimePermissionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/RuntimePermissionTest.java Mon Aug 7 21:40:21 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.lang;
+package org.apache.harmony.luni.tests.java.lang;
public class RuntimePermissionTest extends junit.framework.TestCase {
Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/RuntimeTest.java (from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/RuntimeTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/RuntimeTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/RuntimeTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/RuntimeTest.java&r1=429546&r2=429569&rev=429569&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/RuntimeTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/RuntimeTest.java Mon Aug 7 21:40:21 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.lang;
+package org.apache.harmony.luni.tests.java.lang;
import java.io.IOException;
import java.io.InputStream;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SecurityManagerTest.java (from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/tests/java/lang/SecurityManagerTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SecurityManagerTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SecurityManagerTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/tests/java/lang/SecurityManagerTest.java&r1=429546&r2=429569&rev=429569&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/tests/java/lang/SecurityManagerTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SecurityManagerTest.java Mon Aug 7 21:40:21 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.apache.harmony.tests.java.lang;
+package org.apache.harmony.luni.tests.java.lang;
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StringTest.java (from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/tests/java/lang/StringTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StringTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StringTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/tests/java/lang/StringTest.java&r1=429546&r2=429569&rev=429569&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/tests/java/lang/StringTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StringTest.java Mon Aug 7 21:40:21 2006
@@ -14,7 +14,7 @@
* the License.
*/
-package org.apache.harmony.tests.java.lang;
+package org.apache.harmony.luni.tests.java.lang;
import java.lang.reflect.Constructor;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SystemTest.java (from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/SystemTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SystemTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SystemTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/SystemTest.java&r1=429546&r2=429569&rev=429569&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/SystemTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SystemTest.java Mon Aug 7 21:40:21 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.lang;
+package org.apache.harmony.luni.tests.java.lang;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadDeathTest.java (from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ThreadDeathTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadDeathTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadDeathTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ThreadDeathTest.java&r1=429546&r2=429569&rev=429569&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ThreadDeathTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadDeathTest.java Mon Aug 7 21:40:21 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.lang;
+package org.apache.harmony.luni.tests.java.lang;
public class ThreadDeathTest extends junit.framework.TestCase {
Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadGroupTest.java (from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ThreadGroupTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadGroupTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadGroupTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ThreadGroupTest.java&r1=429546&r2=429569&rev=429569&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ThreadGroupTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadGroupTest.java Mon Aug 7 21:40:21 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.lang;
+package org.apache.harmony.luni.tests.java.lang;
import java.util.Vector;
@@ -564,7 +564,7 @@
// Give them some time to really resume
try {
- Thread.sleep(1000);
+ Thread.sleep(500);
} catch (InterruptedException ie) {
fail("Should not have been interrupted");
}
@@ -575,7 +575,7 @@
MyThread t = (MyThread) threads.elementAt(i);
if (!failed) { // if one failed, don't waste time checking the
// rest
- isResumed[i] = t.isActivelyRunning(5000);
+ isResumed[i] = t.isActivelyRunning(1000);
failed = failed | (!isResumed[i]);
}
t.stop(); // deprecated but effective
@@ -583,7 +583,7 @@
// Give them some time to really die
try {
- Thread.sleep(1000);
+ Thread.sleep(500);
} catch (InterruptedException ie) {
fail("Should not have been interrupted");
}
Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadLocalTest.java (from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ThreadLocalTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadLocalTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadLocalTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ThreadLocalTest.java&r1=429546&r2=429569&rev=429569&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ThreadLocalTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadLocalTest.java Mon Aug 7 21:40:21 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.lang;
+package org.apache.harmony.luni.tests.java.lang;
public class ThreadLocalTest extends junit.framework.TestCase {
Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadTest.java (from r429546, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ThreadTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ThreadTest.java&r1=429546&r2=429569&rev=429569&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ThreadTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadTest.java Mon Aug 7 21:40:21 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.lang;
+package org.apache.harmony.luni.tests.java.lang;
public class ThreadTest extends junit.framework.TestCase {
Added: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/org/apache/harmony/luni/tests/test_resource.txt
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/org/apache/harmony/luni/tests/test_resource.txt?rev=429569&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/org/apache/harmony/luni/tests/test_resource.txt (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/org/apache/harmony/luni/tests/test_resource.txt Mon Aug 7 21:40:21 2006
@@ -0,0 +1 @@
+test_resource
\ No newline at end of file
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/org/apache/harmony/luni/tests/test_resource.txt
------------------------------------------------------------------------------
svn:eol-style = native