Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode: [4150] trunk/core/src/test/org/jnode/test
|
From: <ls...@us...> - 2008-05-30 11:38:12
|
Revision: 4150
http://jnode.svn.sourceforge.net/jnode/?rev=4150&view=rev
Author: lsantha
Date: 2008-05-30 04:38:06 -0700 (Fri, 30 May 2008)
Log Message:
-----------
Checkstyle fixes.
Modified Paths:
--------------
trunk/core/src/test/org/jnode/test/AllTests.java
trunk/core/src/test/org/jnode/test/AnnotationTest.java
trunk/core/src/test/org/jnode/test/ArrayBoundsTest.java
trunk/core/src/test/org/jnode/test/ArrayLongTest.java
trunk/core/src/test/org/jnode/test/ArrayTest.java
trunk/core/src/test/org/jnode/test/AssertTest.java
trunk/core/src/test/org/jnode/test/AutoBoxTest.java
trunk/core/src/test/org/jnode/test/BinOpTest.java
trunk/core/src/test/org/jnode/test/CMOSTest.java
trunk/core/src/test/org/jnode/test/CastTest.java
trunk/core/src/test/org/jnode/test/CharsTest.java
trunk/core/src/test/org/jnode/test/CompareTest.java
trunk/core/src/test/org/jnode/test/ConsoleTest.java
trunk/core/src/test/org/jnode/test/ConvertTest.java
trunk/core/src/test/org/jnode/test/CovariantReturnTypeTest.java
trunk/core/src/test/org/jnode/test/CurrentTimeMillisTest.java
trunk/core/src/test/org/jnode/test/DoubleTest.java
trunk/core/src/test/org/jnode/test/DoubleTest2.java
trunk/core/src/test/org/jnode/test/ExecTest.java
trunk/core/src/test/org/jnode/test/FPTest.java
trunk/core/src/test/org/jnode/test/FieldInitTest.java
trunk/core/src/test/org/jnode/test/FinalizeTest.java
trunk/core/src/test/org/jnode/test/ForEachTest.java
trunk/core/src/test/org/jnode/test/HoldsLockTest.java
trunk/core/src/test/org/jnode/test/IOTest.java
trunk/core/src/test/org/jnode/test/IRTest.java
trunk/core/src/test/org/jnode/test/IfNullTest.java
trunk/core/src/test/org/jnode/test/InlineExceptionTest.java
trunk/core/src/test/org/jnode/test/InlineTestClass.java
trunk/core/src/test/org/jnode/test/InstanceofTest.java
trunk/core/src/test/org/jnode/test/IntTest.java
trunk/core/src/test/org/jnode/test/InvokeInterfaceTest.java
trunk/core/src/test/org/jnode/test/InvokeStaticTest.java
trunk/core/src/test/org/jnode/test/InvokeTest.java
trunk/core/src/test/org/jnode/test/JMXTest.java
trunk/core/src/test/org/jnode/test/JNDITest.java
trunk/core/src/test/org/jnode/test/JUnitTest.java
trunk/core/src/test/org/jnode/test/Linpack.java
trunk/core/src/test/org/jnode/test/Log4jTest.java
trunk/core/src/test/org/jnode/test/LongTest.java
trunk/core/src/test/org/jnode/test/MultiANewArrayTest.java
trunk/core/src/test/org/jnode/test/NIOTest.java
trunk/core/src/test/org/jnode/test/NanoTimeTest.java
trunk/core/src/test/org/jnode/test/NanoXmlTest.java
trunk/core/src/test/org/jnode/test/PointerTest.java
trunk/core/src/test/org/jnode/test/ResolverTest.java
trunk/core/src/test/org/jnode/test/ResourceTest.java
trunk/core/src/test/org/jnode/test/SerialPortTest.java
trunk/core/src/test/org/jnode/test/SignatureTest.java
trunk/core/src/test/org/jnode/test/StrictMathTest.java
trunk/core/src/test/org/jnode/test/SystemInTest.java
trunk/core/src/test/org/jnode/test/TableSwitchTest.java
trunk/core/src/test/org/jnode/test/Test.java
trunk/core/src/test/org/jnode/test/TestControlFlowGraph.java
trunk/core/src/test/org/jnode/test/TestException.java
trunk/core/src/test/org/jnode/test/TestNPE.java
trunk/core/src/test/org/jnode/test/TestStackOverflow.java
trunk/core/src/test/org/jnode/test/TestVmClass.java
trunk/core/src/test/org/jnode/test/TryFinallyTest.java
trunk/core/src/test/org/jnode/test/VarArgsTest.java
trunk/core/src/test/org/jnode/test/ViewMethodTest.java
trunk/core/src/test/org/jnode/test/WaitTest.java
trunk/core/src/test/org/jnode/test/X86StreamTest.java
trunk/core/src/test/org/jnode/test/bugs/TestByteBufferInputStream.java
trunk/core/src/test/org/jnode/test/bugs/bug778001.java
trunk/core/src/test/org/jnode/test/bugs/bug824457.java
trunk/core/src/test/org/jnode/test/bugs/bug826174.java
trunk/core/src/test/org/jnode/test/core/ArithOpt.java
trunk/core/src/test/org/jnode/test/core/CLInitTest.java
trunk/core/src/test/org/jnode/test/core/CompilerTest.java
trunk/core/src/test/org/jnode/test/core/HeapHammerTest.java
trunk/core/src/test/org/jnode/test/core/IMTCompilerTest.java
trunk/core/src/test/org/jnode/test/core/IsolateTest.java
trunk/core/src/test/org/jnode/test/core/IsolatedHelloWorld.java
trunk/core/src/test/org/jnode/test/core/LinkTest.java
trunk/core/src/test/org/jnode/test/core/MagicAddressTest.java
trunk/core/src/test/org/jnode/test/core/MagicWordTest.java
trunk/core/src/test/org/jnode/test/core/MemoryTest.java
trunk/core/src/test/org/jnode/test/core/PerfCtrTest.java
trunk/core/src/test/org/jnode/test/core/ProxyBuilder.java
trunk/core/src/test/org/jnode/test/core/ProxyTest.java
trunk/core/src/test/org/jnode/test/core/ReflectiveInvokeTest.java
trunk/core/src/test/org/jnode/test/core/Sieve.java
trunk/core/src/test/org/jnode/test/core/TestTSC.java
trunk/core/src/test/org/jnode/test/core/package.html
trunk/core/src/test/org/jnode/test/framework/TestManager.java
trunk/core/src/test/org/jnode/test/framework/TestRunnerPlugin.java
trunk/core/src/test/org/jnode/test/jnodenative/NativeTestCase1.java
trunk/core/src/test/org/jnode/test/jnodenative/NativeTestCase2.java
trunk/core/src/test/org/jnode/test/jnodenative/TestCase1.java
trunk/core/src/test/org/jnode/test/mauve/CheckResult.java
trunk/core/src/test/org/jnode/test/mauve/ClassResult.java
trunk/core/src/test/org/jnode/test/mauve/HTMLGenerator.java
trunk/core/src/test/org/jnode/test/mauve/MauveTestCommand.java
trunk/core/src/test/org/jnode/test/mauve/PackageResult.java
trunk/core/src/test/org/jnode/test/mauve/PluginTestHarness.java
trunk/core/src/test/org/jnode/test/mauve/RunResult.java
trunk/core/src/test/org/jnode/test/mauve/SingleTestHarness.java
trunk/core/src/test/org/jnode/test/mauve/TestResult.java
trunk/core/src/test/org/jnode/test/security/AccessControlTest.java
trunk/core/src/test/org/jnode/test/security/TestSecurityManager.java
trunk/core/src/test/org/jnode/test/threads/BasicTest.java
trunk/core/src/test/org/jnode/test/threads/DaemonThreadGroupTest.java
trunk/core/src/test/org/jnode/test/threads/MultiTest.java
trunk/core/src/test/org/jnode/test/threads/SynchronizedTest.java
trunk/core/src/test/org/jnode/test/threads/ThreadingTest.java
trunk/core/src/test/org/jnode/test/threads/ThreadingUtils.java
Modified: trunk/core/src/test/org/jnode/test/AllTests.java
===================================================================
--- trunk/core/src/test/org/jnode/test/AllTests.java 2008-05-29 21:48:08 UTC (rev 4149)
+++ trunk/core/src/test/org/jnode/test/AllTests.java 2008-05-30 11:38:06 UTC (rev 4150)
@@ -18,27 +18,27 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.test;
-import org.apache.log4j.Logger;
-
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.apache.log4j.Logger;
/**
* @author epr
*/
public class AllTests {
- final static Logger log = Logger.getLogger(AllTests.class);
- public static Test suite() {
- log.info("Starting test");
- TestSuite suite = new TestSuite("Test for org.jnode.test");
- //$JUnit-BEGIN$
- suite.addTest(new TestSuite(TestVmClass.class));
- suite.addTest(new TestSuite(SignatureTest.class));
- //$JUnit-END$
- return suite;
- }
+ final static Logger log = Logger.getLogger(AllTests.class);
+
+ public static Test suite() {
+ log.info("Starting test");
+ TestSuite suite = new TestSuite("Test for org.jnode.test");
+ //$JUnit-BEGIN$
+ suite.addTest(new TestSuite(TestVmClass.class));
+ suite.addTest(new TestSuite(SignatureTest.class));
+ //$JUnit-END$
+ return suite;
+ }
}
Modified: trunk/core/src/test/org/jnode/test/AnnotationTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/AnnotationTest.java 2008-05-29 21:48:08 UTC (rev 4149)
+++ trunk/core/src/test/org/jnode/test/AnnotationTest.java 2008-05-30 11:38:06 UTC (rev 4150)
@@ -18,17 +18,16 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.test;
import java.lang.annotation.Annotation;
-import static java.lang.annotation.ElementType.*;
-
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.reflect.AnnotatedElement;
public class AnnotationTest {
@@ -45,39 +44,41 @@
// show("Declared annotations for class A", A.class.getDeclaredAnnotations());
// show("Declared annotations for class B", B.class.getDeclaredAnnotations());
}
-
+
private static void show(String msg, Annotation[] ann) {
System.out.println(msg);
for (Annotation a : ann) {
System.out.println(a);
- }
+ }
System.out.println();
}
-
+
@Test
@Test4
public static class A {
-
+
}
- @Test2(name="ewout", descr="programmer")
- @Test3(name=5, descr={1,2,3,4})
+ @Test2(name = "ewout", descr = "programmer")
+ @Test3(name = 5, descr = {1, 2, 3, 4 })
public static class B extends A {
-
+
@Test
public void foo() {
-
+
}
}
@Retention(RetentionPolicy.RUNTIME)
- @Target({TYPE, METHOD})
- public @interface Test { }
+ @Target({TYPE, METHOD })
+ public @interface Test {
+ }
@Retention(RetentionPolicy.RUNTIME)
@Target(TYPE)
public @interface Test2 {
String name();
+
String descr();
}
@@ -85,13 +86,15 @@
@Target(TYPE)
public @interface Test3 {
int name();
+
int[] descr();
}
-
+
@Retention(RetentionPolicy.RUNTIME)
- @Target({TYPE, METHOD})
+ @Target({TYPE, METHOD })
@Inherited
- public @interface Test4 { }
+ public @interface Test4 {
+ }
-
+
}
Modified: trunk/core/src/test/org/jnode/test/ArrayBoundsTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/ArrayBoundsTest.java 2008-05-29 21:48:08 UTC (rev 4149)
+++ trunk/core/src/test/org/jnode/test/ArrayBoundsTest.java 2008-05-30 11:38:06 UTC (rev 4150)
@@ -18,7 +18,7 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.test;
/**
@@ -26,30 +26,30 @@
*/
public class ArrayBoundsTest {
- public static void main(String[] args) {
- test(args, -1, false);
- test(args, args.length, false);
- if (args.length > 0) {
- test(args, 0, true);
- test(args, args.length-1, true);
- }
- }
-
- private static void test(String[] arr, int index, boolean ok) {
- try {
- System.out.println(arr[index]);
- if (!ok) {
- throw new RuntimeException("Test should fail at index " + index);
- } else {
- System.out.println("Ok");
- }
- } catch (ArrayIndexOutOfBoundsException ex) {
- if (ok) {
- throw ex;
- } else {
- System.out.println("Ok: " + ex.getMessage());
- }
- }
- }
-
+ public static void main(String[] args) {
+ test(args, -1, false);
+ test(args, args.length, false);
+ if (args.length > 0) {
+ test(args, 0, true);
+ test(args, args.length - 1, true);
+ }
+ }
+
+ private static void test(String[] arr, int index, boolean ok) {
+ try {
+ System.out.println(arr[index]);
+ if (!ok) {
+ throw new RuntimeException("Test should fail at index " + index);
+ } else {
+ System.out.println("Ok");
+ }
+ } catch (ArrayIndexOutOfBoundsException ex) {
+ if (ok) {
+ throw ex;
+ } else {
+ System.out.println("Ok: " + ex.getMessage());
+ }
+ }
+ }
+
}
Modified: trunk/core/src/test/org/jnode/test/ArrayLongTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/ArrayLongTest.java 2008-05-29 21:48:08 UTC (rev 4149)
+++ trunk/core/src/test/org/jnode/test/ArrayLongTest.java 2008-05-30 11:38:06 UTC (rev 4150)
@@ -18,7 +18,7 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.test;
/**
@@ -31,12 +31,12 @@
new ArrayLongTest().test(i, 63);
}
}
-
+
private final Object[] arr = new Object[128];
-
+
public void test(long l1, long l2) {
- int group = (int)(l1 / l2);
- int index = (int)(l1 % l2);
+ int group = (int) (l1 / l2);
+ int index = (int) (l1 % l2);
Object obj = arr[group];
}
}
Modified: trunk/core/src/test/org/jnode/test/ArrayTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/ArrayTest.java 2008-05-29 21:48:08 UTC (rev 4149)
+++ trunk/core/src/test/org/jnode/test/ArrayTest.java 2008-05-30 11:38:06 UTC (rev 4150)
@@ -18,7 +18,7 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.test;
/**
@@ -27,55 +27,55 @@
public class ArrayTest {
public static int simpleByte(byte[] arr, int i) {
- arr[i+4] = arr[i];
+ arr[i + 4] = arr[i];
return arr[i];
}
-
+
public static char simpleChar(char[] arr, int i) {
- arr[i+4] = arr[i];
+ arr[i + 4] = arr[i];
return arr[i];
}
-
+
public static int simpleInt(int[] arr, int i) {
- arr[i+4] = arr[i];
+ arr[i + 4] = arr[i];
return arr[i];
}
-
+
public static int mulTest(int a, int b) {
return a * b;
}
-
+
public static int shlTest(int a, int b) {
return a << b;
}
-
+
public static int shrTest(int a, int b) {
return a >> b;
}
-
+
public static int sarTest(int a, int b) {
return a >>> b;
}
-
+
public static void main(String[] args) {
int[][] array;
- array = new int[ 2][ 3];
+ array = new int[2][3];
for (int a = 0; a < 2; a++) {
for (int b = 0; b < 3; b++) {
- array[ a][ b] = a + b;
+ array[a][b] = a + b;
}
}
for (int a = 0; a < 2; a++) {
System.out.println("A: " + a);
for (int b = 0; b < 3; b++) {
- System.out.println("B: " + b + " -> " + array[ a][ b]);
+ System.out.println("B: " + b + " -> " + array[a][b]);
}
}
- final int[] arr = new int[ 27];
+ final int[] arr = new int[27];
boolean ok = true;
ok &= test(arr, 0, true);
ok &= test(arr, 26, true);
@@ -88,7 +88,7 @@
if (ok) {
final long start = System.currentTimeMillis();
for (int i = 0; i < 100000; i++) {
- arr[ i % 27] = arr[ i % 13];
+ arr[i % 27] = arr[i % 13];
}
final long end = System.currentTimeMillis();
System.out.println("Test succeeded in " + (end - start) + "ms");
@@ -98,7 +98,7 @@
static boolean test(int[] arr, int index, boolean mustSucceed) {
try {
- arr[ index] = index;
+ arr[index] = index;
if (!mustSucceed) {
System.out.println("Test arr[" + index + "] failed");
return false;
Modified: trunk/core/src/test/org/jnode/test/AssertTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/AssertTest.java 2008-05-29 21:48:08 UTC (rev 4149)
+++ trunk/core/src/test/org/jnode/test/AssertTest.java 2008-05-30 11:38:06 UTC (rev 4150)
@@ -18,7 +18,7 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.test;
public class AssertTest {
Modified: trunk/core/src/test/org/jnode/test/AutoBoxTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/AutoBoxTest.java 2008-05-29 21:48:08 UTC (rev 4149)
+++ trunk/core/src/test/org/jnode/test/AutoBoxTest.java 2008-05-30 11:38:06 UTC (rev 4150)
@@ -18,7 +18,7 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.test;
/**
@@ -39,71 +39,71 @@
testFloat();
testDouble();
}
-
+
private static void testBoolean() {
System.out.println("Boolean");
- final boolean[] a = new boolean[]{ true, false };
-
+ final boolean[] a = new boolean[]{true, false};
+
Boolean i = a[0];
System.out.println("i=" + i);
a[1] = new Boolean(true);
-
+
for (int k = 0; k < a.length; k++) {
final Boolean j = a[k];
System.out.println("j=" + j + " , class=" + j.getClass().getName());
- }
+ }
}
-
+
private static void testByte() {
System.out.println("Byte");
- final byte[] a = new byte[]{ 1, 2, 3, 4, 5 };
-
+ final byte[] a = new byte[]{1, 2, 3, 4, 5};
+
Byte i = a[3];
System.out.println("i=" + i);
- a[2] = new Byte((byte)85);
-
+ a[2] = new Byte((byte) 85);
+
for (int k = 0; k < a.length; k++) {
final Byte j = a[k];
System.out.println("j=" + j + " , class=" + j.getClass().getName());
}
}
-
+
private static void testChar() {
System.out.println("Character");
- final char[] a = new char[] { '1', '2', '3', '4', '5' };
-
+ final char[] a = new char[]{'1', '2', '3', '4', '5'};
+
Character i = a[3];
System.out.println("i=" + i);
a[2] = new Character('T');
-
+
for (int k = 0; k < a.length; k++) {
final Character j = a[k];
System.out.println("j=" + j + " , class=" + j.getClass().getName());
}
}
-
+
private static void testShort() {
System.out.println("Short");
- final short[] a = new short[]{ 1, 2, 3, 4, 5 };
-
+ final short[] a = new short[]{1, 2, 3, 4, 5};
+
Short i = a[3];
System.out.println("i=" + i);
- a[2] = new Short((short)85);
-
+ a[2] = new Short((short) 85);
+
for (int k = 0; k < a.length; k++) {
final Short j = a[k];
System.out.println("j=" + j + " , class=" + j.getClass().getName());
}
}
-
+
private static void testInt() {
System.out.println("Int");
- final int[] a = new int[]{ 1, 2, 3, 4, 5 };
-
+ final int[] a = new int[]{1, 2, 3, 4, 5};
+
Integer i = a[3];
System.out.println("i=" + i);
a[2] = new Integer(85);
-
+
for (int k = 0; k < a.length; k++) {
final Integer j = a[k];
System.out.println("j=" + j + " , class=" + j.getClass().getName());
@@ -112,12 +112,12 @@
private static void testLong() {
System.out.println("Long");
- final long[] a = new long[]{ 1, 2, 3, 4, 5 };
-
+ final long[] a = new long[]{1, 2, 3, 4, 5};
+
Long i = a[3];
System.out.println("i=" + i);
a[2] = new Long(85);
-
+
for (int k = 0; k < a.length; k++) {
final Long j = a[k];
System.out.println("j=" + j + " , class=" + j.getClass().getName());
@@ -126,12 +126,12 @@
private static void testFloat() {
System.out.println("Float");
- final float[] a = new float[]{ 1, 2, 3, 4, 5 };
-
+ final float[] a = new float[]{1, 2, 3, 4, 5};
+
Float i = a[3];
System.out.println("i=" + i);
a[2] = new Float(85);
-
+
for (int k = 0; k < a.length; k++) {
final Float j = a[k];
System.out.println("j=" + j + " , class=" + j.getClass().getName());
@@ -140,12 +140,12 @@
private static void testDouble() {
System.out.println("Double");
- final double[] a = new double[]{ 1, 2, 3, 4, 5 };
-
+ final double[] a = new double[]{1, 2, 3, 4, 5};
+
Double i = a[3];
System.out.println("i=" + i);
a[2] = new Double(85);
-
+
for (int k = 0; k < a.length; k++) {
final Double j = a[k];
System.out.println("j=" + j + " , class=" + j.getClass().getName());
Modified: trunk/core/src/test/org/jnode/test/BinOpTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/BinOpTest.java 2008-05-29 21:48:08 UTC (rev 4149)
+++ trunk/core/src/test/org/jnode/test/BinOpTest.java 2008-05-30 11:38:06 UTC (rev 4150)
@@ -18,7 +18,7 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.test;
import org.jnode.util.NumberUtils;
@@ -28,36 +28,36 @@
*/
public class BinOpTest {
- public static void main(String[] args) {
-
- final int i1 = 0x00450078;
- final int i2 = 0x45007800;
- final long l1 = 0xAABB220000450078L;
- final long l2 = 0x0022BBAA45007800L;
-
- System.out.println("i1 % i2 =" + NumberUtils.hex(i1 % i2));
- System.out.println("i1 & i2 =" + NumberUtils.hex(i1 & i2));
- System.out.println("i1 | i2 =" + NumberUtils.hex(i1 | i2));
- System.out.println("i1 ^ i2 =" + NumberUtils.hex(i1 ^ i2));
-
- System.out.println("l1 % l2 =" + NumberUtils.hex(l1 % l2));
- System.out.println("l1 & l2 =" + NumberUtils.hex(l1 & l2));
- System.out.println("l1 | l2 =" + NumberUtils.hex(l1 | l2));
- System.out.println("l1 ^ l2 =" + NumberUtils.hex(l1 ^ l2));
-
- System.out.println("l1 >> 3 =" + NumberUtils.hex(l1 >> 3));
- System.out.println("l1 >> 33 =" + NumberUtils.hex(l1 >> 33));
- System.out.println("l1 >>> 3 =" + NumberUtils.hex(l1 >>> 3));
- System.out.println("l1 >>> 33=" + NumberUtils.hex(l1 >>> 33));
+ public static void main(String[] args) {
- System.out.println("i1 & 0xFF = " + (byte) (i1 & 0xFF));
- System.out.println("(i1 >> 8) & 0xFF = " + (byte) ((i1 >> 8) & 0xFF));
- System.out.println("(i1 >> 16) & 0xFF = " + (byte) ((i1 >> 16) & 0xFF));
- System.out.println("(i1 >> 24) & 0xFF = " + (byte) ((i1 >> 24) & 0xFF));
+ final int i1 = 0x00450078;
+ final int i2 = 0x45007800;
+ final long l1 = 0xAABB220000450078L;
+ final long l2 = 0x0022BBAA45007800L;
- System.out.println("i2 & 0xFF = " + (byte) (i2 & 0xFF));
- System.out.println("(i2 >> 8) & 0xFF = " + (byte) ((i2 >> 8) & 0xFF));
- System.out.println("(i2 >> 16) & 0xFF = " + (byte) ((i2 >> 16) & 0xFF));
- System.out.println("(i2 >> 24) & 0xFF = " + (byte) ((i2 >> 24) & 0xFF));
- }
+ System.out.println("i1 % i2 =" + NumberUtils.hex(i1 % i2));
+ System.out.println("i1 & i2 =" + NumberUtils.hex(i1 & i2));
+ System.out.println("i1 | i2 =" + NumberUtils.hex(i1 | i2));
+ System.out.println("i1 ^ i2 =" + NumberUtils.hex(i1 ^ i2));
+
+ System.out.println("l1 % l2 =" + NumberUtils.hex(l1 % l2));
+ System.out.println("l1 & l2 =" + NumberUtils.hex(l1 & l2));
+ System.out.println("l1 | l2 =" + NumberUtils.hex(l1 | l2));
+ System.out.println("l1 ^ l2 =" + NumberUtils.hex(l1 ^ l2));
+
+ System.out.println("l1 >> 3 =" + NumberUtils.hex(l1 >> 3));
+ System.out.println("l1 >> 33 =" + NumberUtils.hex(l1 >> 33));
+ System.out.println("l1 >>> 3 =" + NumberUtils.hex(l1 >>> 3));
+ System.out.println("l1 >>> 33=" + NumberUtils.hex(l1 >>> 33));
+
+ System.out.println("i1 & 0xFF = " + (byte) (i1 & 0xFF));
+ System.out.println("(i1 >> 8) & 0xFF = " + (byte) ((i1 >> 8) & 0xFF));
+ System.out.println("(i1 >> 16) & 0xFF = " + (byte) ((i1 >> 16) & 0xFF));
+ System.out.println("(i1 >> 24) & 0xFF = " + (byte) ((i1 >> 24) & 0xFF));
+
+ System.out.println("i2 & 0xFF = " + (byte) (i2 & 0xFF));
+ System.out.println("(i2 >> 8) & 0xFF = " + (byte) ((i2 >> 8) & 0xFF));
+ System.out.println("(i2 >> 16) & 0xFF = " + (byte) ((i2 >> 16) & 0xFF));
+ System.out.println("(i2 >> 24) & 0xFF = " + (byte) ((i2 >> 24) & 0xFF));
+ }
}
Modified: trunk/core/src/test/org/jnode/test/CMOSTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/CMOSTest.java 2008-05-29 21:48:08 UTC (rev 4149)
+++ trunk/core/src/test/org/jnode/test/CMOSTest.java 2008-05-30 11:38:06 UTC (rev 4150)
@@ -18,11 +18,10 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.test;
import javax.naming.NamingException;
-
import org.jnode.driver.system.cmos.CMOSService;
import org.jnode.driver.system.cmos.def.RTC;
import org.jnode.naming.InitialNaming;
@@ -34,21 +33,21 @@
*/
public class CMOSTest {
- public static void main(String[] args)
- throws ResourceNotFreeException, NamingException {
-
- CMOSService cmos = InitialNaming.lookup(CMOSService.NAME);
- RTC rtc = new RTC(cmos);
-
- for (int i = 0; i < 10; i++) {
- System.out.println("CMOS" + i + "=" + BCDUtils.bcd2bin(cmos.getRegister(i)));
- }
-
- System.out.println("time=" + rtc.getHours() + ":" + rtc.getMinutes() + ":" + rtc.getSeconds());
- System.out.println("date=" + rtc.getDay() + "-" + rtc.getMonth() + "-" + rtc.getYear());
-
- int fp = cmos.getRegister(0x10);
- System.out.println("floppy A: " + ((fp >> 4) & 0x0f));
- System.out.println("floppy B: " + (fp & 0x0f));
- }
+ public static void main(String[] args)
+ throws ResourceNotFreeException, NamingException {
+
+ CMOSService cmos = InitialNaming.lookup(CMOSService.NAME);
+ RTC rtc = new RTC(cmos);
+
+ for (int i = 0; i < 10; i++) {
+ System.out.println("CMOS" + i + "=" + BCDUtils.bcd2bin(cmos.getRegister(i)));
+ }
+
+ System.out.println("time=" + rtc.getHours() + ":" + rtc.getMinutes() + ":" + rtc.getSeconds());
+ System.out.println("date=" + rtc.getDay() + "-" + rtc.getMonth() + "-" + rtc.getYear());
+
+ int fp = cmos.getRegister(0x10);
+ System.out.println("floppy A: " + ((fp >> 4) & 0x0f));
+ System.out.println("floppy B: " + (fp & 0x0f));
+ }
}
Modified: trunk/core/src/test/org/jnode/test/CastTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/CastTest.java 2008-05-29 21:48:08 UTC (rev 4149)
+++ trunk/core/src/test/org/jnode/test/CastTest.java 2008-05-30 11:38:06 UTC (rev 4150)
@@ -18,10 +18,9 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.test;
-import java.util.List;
import java.util.Vector;
/**
@@ -29,37 +28,40 @@
*/
public class CastTest {
- public static void main(String[] args) {
- test(args);
- test2("Hello world");
- }
-
+ public static void main(String[] args) {
+ test(args);
+ test2("Hello world");
+ }
+
private StaticClass field;
+
public void test1(Vector<?> entries, int i) {
- field = (StaticClass)entries.get(i);
+ field = (StaticClass) entries.get(i);
}
-
+
static class StaticClass {
- static { System.out.println(1); }
+ static {
+ System.out.println(1);
+ }
}
- public static void test(Object args) {
- System.out.println("args.class=" + args.getClass().getName());
- Object[] arr = (Object[]) args;
- System.out.println(arr);
-
- if (args instanceof String[]) {
- System.out.println("Instanceof");
- } else {
- System.out.println("Not instanceof: " + args.getClass().getName());
- }
- }
-
- public static void test2(Object arg) {
- try {
- ((Integer)arg).intValue();
- } catch (ClassCastException ex) {
- ex.printStackTrace();
- }
- }
+ public static void test(Object args) {
+ System.out.println("args.class=" + args.getClass().getName());
+ Object[] arr = (Object[]) args;
+ System.out.println(arr);
+
+ if (args instanceof String[]) {
+ System.out.println("Instanceof");
+ } else {
+ System.out.println("Not instanceof: " + args.getClass().getName());
+ }
+ }
+
+ public static void test2(Object arg) {
+ try {
+ ((Integer) arg).intValue();
+ } catch (ClassCastException ex) {
+ ex.printStackTrace();
+ }
+ }
}
Modified: trunk/core/src/test/org/jnode/test/CharsTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/CharsTest.java 2008-05-29 21:48:08 UTC (rev 4149)
+++ trunk/core/src/test/org/jnode/test/CharsTest.java 2008-05-30 11:38:06 UTC (rev 4150)
@@ -18,34 +18,35 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.test;
/**
* Print all (8-bit) chars to the console, for debugging purposes.
* This demonstrates the support for 8-bit chars introduced to
* the output driver.
- *
+ *
* @author Bengt B\u00e4verman
* @since 2003-08
*/
-public class CharsTest
-{
- public static void main(String[] args)
- {
- System.out.println("Test written by Bengt B\u00e4verman");
-
- System.out.println("Some chars used in Sweden: \u00e5\u00e4\u00f6 \u00c5\u00c4\u00d6 \u00c9\u00e9\u00fc\u00dc \u00e1\u00e0");
-
- System.out.println("Other chars: \u00bf \u00c7\u00e7 \u00c9\u00e9 \u00e8\u00eb \u00dc\u00fc\u00f9\u00fa \u00e0\u00e1\u00f2\u00f3 \u00d1\u00f1 \u00a3$\u00a5 \u00ce\u00e2\u00ea\u00f4\u00fb ");
+public class CharsTest {
+ public static void main(String[] args) {
+ System.out.println("Test written by Bengt B\u00e4verman");
- System.out.println();
- System.out.print("All 8-bit chars in groups of 64:");
- for (int i=0; i<256; i++) {
- if (i%64 == 0) System.out.println();
-
- System.out.print((char) i);
- }
- System.out.println();
- }
+ System.out.println(
+ "Some chars used in Sweden: \u00e5\u00e4\u00f6 \u00c5\u00c4\u00d6 \u00c9\u00e9\u00fc\u00dc \u00e1\u00e0");
+
+ System.out.println(
+ "Other chars: \u00bf \u00c7\u00e7 \u00c9\u00e9 \u00e8\u00eb \u00dc\u00fc\u00f9\u00fa " +
+ "\u00e0\u00e1\u00f2\u00f3 \u00d1\u00f1 \u00a3$\u00a5 \u00ce\u00e2\u00ea\u00f4\u00fb ");
+
+ System.out.println();
+ System.out.print("All 8-bit chars in groups of 64:");
+ for (int i = 0; i < 256; i++) {
+ if (i % 64 == 0) System.out.println();
+
+ System.out.print((char) i);
+ }
+ System.out.println();
+ }
}
Modified: trunk/core/src/test/org/jnode/test/CompareTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/CompareTest.java 2008-05-29 21:48:08 UTC (rev 4149)
+++ trunk/core/src/test/org/jnode/test/CompareTest.java 2008-05-30 11:38:06 UTC (rev 4150)
@@ -18,7 +18,7 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.test;
/**
@@ -26,15 +26,15 @@
*/
public class CompareTest {
- public static void main(String[] args) {
-
- final int i = 0x80000000;
-
- if (i < 0) {
- System.out.println("i < 0");
- } else {
- System.out.println("i >= 0");
- }
-
- }
+ public static void main(String[] args) {
+
+ final int i = 0x80000000;
+
+ if (i < 0) {
+ System.out.println("i < 0");
+ } else {
+ System.out.println("i >= 0");
+ }
+
+ }
}
Modified: trunk/core/src/test/org/jnode/test/ConsoleTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/ConsoleTest.java 2008-05-29 21:48:08 UTC (rev 4149)
+++ trunk/core/src/test/org/jnode/test/ConsoleTest.java 2008-05-30 11:38:06 UTC (rev 4150)
@@ -18,7 +18,7 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.test;
/**
@@ -26,9 +26,9 @@
*/
public class ConsoleTest {
- public static void main(String[] args) {
- for (int i = 0; i < 300; i++) {
- System.out.println("Row" + i);
- }
- }
+ public static void main(String[] args) {
+ for (int i = 0; i < 300; i++) {
+ System.out.println("Row" + i);
+ }
+ }
}
Modified: trunk/core/src/test/org/jnode/test/ConvertTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/ConvertTest.java 2008-05-29 21:48:08 UTC (rev 4149)
+++ trunk/core/src/test/org/jnode/test/ConvertTest.java 2008-05-30 11:38:06 UTC (rev 4150)
@@ -4,7 +4,7 @@
package org.jnode.test;
public class ConvertTest {
-
+
public static void main(String[] argv) {
System.out.println(test1());
System.out.println(test2());
Modified: trunk/core/src/test/org/jnode/test/CovariantReturnTypeTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/CovariantReturnTypeTest.java 2008-05-29 21:48:08 UTC (rev 4149)
+++ trunk/core/src/test/org/jnode/test/CovariantReturnTypeTest.java 2008-05-30 11:38:06 UTC (rev 4150)
@@ -18,7 +18,7 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.test;
/**
@@ -33,7 +33,7 @@
final A a = new A();
final B b = new B();
final A ab = new B();
-
+
System.out.println("a.foo = " + a.foo());
System.out.println("b.foo = " + b.foo());
System.out.println("ab.foo = " + ab.foo());
@@ -48,7 +48,7 @@
return null;
}
}
-
+
public static class B extends A {
public String foo() {
return "Hello world";
Modified: trunk/core/src/test/org/jnode/test/CurrentTimeMillisTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/CurrentTimeMillisTest.java 2008-05-29 21:48:08 UTC (rev 4149)
+++ trunk/core/src/test/org/jnode/test/CurrentTimeMillisTest.java 2008-05-30 11:38:06 UTC (rev 4150)
@@ -18,7 +18,7 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.test;
/**
@@ -26,28 +26,28 @@
*/
public class CurrentTimeMillisTest {
- public static void main(String[] args) {
-
- System.out.println("Testing System.currentTimeMillis please wait");
-
- for (int i = 0; i < 1000; i++) {
- final long start = System.currentTimeMillis();
-
- final long end = System.currentTimeMillis();
-
- int count = 0;
- for (int j = 0; j < 50000; j++) {
- count += j;
- }
-
- final long diff = end-start;
-
- if (diff < 0) {
- System.out.println("Oops currentTimeMillis goes back in time " + diff + "ms");
- }
-
- }
-
- System.out.println("done");
- }
+ public static void main(String[] args) {
+
+ System.out.println("Testing System.currentTimeMillis please wait");
+
+ for (int i = 0; i < 1000; i++) {
+ final long start = System.currentTimeMillis();
+
+ final long end = System.currentTimeMillis();
+
+ int count = 0;
+ for (int j = 0; j < 50000; j++) {
+ count += j;
+ }
+
+ final long diff = end - start;
+
+ if (diff < 0) {
+ System.out.println("Oops currentTimeMillis goes back in time " + diff + "ms");
+ }
+
+ }
+
+ System.out.println("done");
+ }
}
Modified: trunk/core/src/test/org/jnode/test/DoubleTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/DoubleTest.java 2008-05-29 21:48:08 UTC (rev 4149)
+++ trunk/core/src/test/org/jnode/test/DoubleTest.java 2008-05-30 11:38:06 UTC (rev 4150)
@@ -18,7 +18,7 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.test;
/**
@@ -26,22 +26,22 @@
*/
public class DoubleTest {
- public static void main(String[] args) {
- d2i(0.0);
- d2i(0.4);
- d2i(0.5);
- d2i(0.6);
- d2i(1.0);
- d2i(1.1);
- d2i(1.4);
- d2i(1.5);
- d2i(1.6);
- d2i(1.9);
- d2i(2.0);
- }
+ public static void main(String[] args) {
+ d2i(0.0);
+ d2i(0.4);
+ d2i(0.5);
+ d2i(0.6);
+ d2i(1.0);
+ d2i(1.1);
+ d2i(1.4);
+ d2i(1.5);
+ d2i(1.6);
+ d2i(1.9);
+ d2i(2.0);
+ }
- public static void d2i(double d) {
- final int i = (int) d;
- System.out.println("d=" + d + ", i=" + i);
- }
+ public static void d2i(double d) {
+ final int i = (int) d;
+ System.out.println("d=" + d + ", i=" + i);
+ }
}
Modified: trunk/core/src/test/org/jnode/test/DoubleTest2.java
===================================================================
--- trunk/core/src/test/org/jnode/test/DoubleTest2.java 2008-05-29 21:48:08 UTC (rev 4149)
+++ trunk/core/src/test/org/jnode/test/DoubleTest2.java 2008-05-30 11:38:06 UTC (rev 4150)
@@ -18,7 +18,7 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.test;
import org.jnode.util.NumberUtils;
@@ -27,11 +27,11 @@
* @author Levente S?ntha
*/
public class DoubleTest2 {
- public static void main(String[] argv){
+ public static void main(String[] argv) {
System.out.println(test1());
System.out.println(test2());
System.out.println(test3());
-
+
System.out.println(NumberUtils.hex(Double.doubleToLongBits(1.3)));
System.out.println(NumberUtils.hex(Double.doubleToRawLongBits(1.3)));
@@ -39,23 +39,23 @@
System.out.println(toString(Double.longBitsToDouble(Double.doubleToRawLongBits(1.3)), false));
}
- private static double test1(){
- return (long)1.3;
+ private static double test1() {
+ return (long) 1.3;
}
- private static double test2(){
+ private static double test2() {
return 1.3;
}
-
+
private static double test3() {
- double i = 13;
- return i / 10;
+ double i = 13;
+ return i / 10;
}
-
+
public static String toString(double v, boolean isFloat) {
-
+
final int MAX_DIGITS = isFloat ? 10 : 19;
-
+
if (Double.isNaN(v))
return "NaN";
if (v == Double.POSITIVE_INFINITY)
Modified: trunk/core/src/test/org/jnode/test/ExecTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/ExecTest.java 2008-05-29 21:48:08 UTC (rev 4149)
+++ trunk/core/src/test/org/jnode/test/ExecTest.java 2008-05-30 11:38:06 UTC (rev 4150)
@@ -18,22 +18,22 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.test;
/**
* @author epr
*/
public class ExecTest {
-
- public static void main(String[] args) {
- // Change System.out. If the process works correctly,
- // the console should not have problem with it.
-
- System.setOut(System.err);
- System.out.println("Message on new System.out");
- System.exit(0);
-
- }
+ public static void main(String[] args) {
+ // Change System.out. If the process works correctly,
+ // the console should not have problem with it.
+
+ System.setOut(System.err);
+ System.out.println("Message on new System.out");
+ System.exit(0);
+
+ }
+
}
Modified: trunk/core/src/test/org/jnode/test/FPTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/FPTest.java 2008-05-29 21:48:08 UTC (rev 4149)
+++ trunk/core/src/test/org/jnode/test/FPTest.java 2008-05-30 11:38:06 UTC (rev 4150)
@@ -18,153 +18,153 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.test;
import java.io.PrintStream;
/**
* Test of floating point operations
- *
+ *
* @author epr
*/
public class FPTest {
- public static void main(String[] args) throws InterruptedException {
+ public static void main(String[] args) throws InterruptedException {
- Runnable r = new Runnable() {
- public void run() {
- final PrintStream out = System.out;
+ Runnable r = new Runnable() {
+ public void run() {
+ final PrintStream out = System.out;
- testFloat(out);
- Thread.yield();
- testDouble(out);
- Thread.yield();
- testTan(out);
- Thread.yield();
- }
- };
- Thread t1 = new Thread(r);
- Thread t2 = new Thread(r);
- t1.start();
- t2.start();
- t1.join();
- t2.join();
- }
-
- private static void testTan(PrintStream out) {
- out.println("testTan");
-
- for (double i = -5; i < 5; i += 0.5) {
-
- final double jvmResult = Math.tan(i);
- final double cpResult = StrictMathTest.tan(i);
-
- if (jvmResult != cpResult) {
- out.println("tan(" + i + ")=" + jvmResult + "\t" + cpResult);
- }
- }
- final double angle = Math.PI / 4.0;
- final double a = 1.0 - Math.cos(angle);
- final double b = Math.tan(angle);
- final double c = Math.sqrt(1.0 + b * b) - 1 + a;
- final float cv = (float)(4.0 / 3.0 * a * b / c);
- out.println("JVM: " + Math.tan(angle) + ", CP: " + StrictMathTest.tan(angle));
- out.println("CV: " + cv);
- }
-
-
- private static void testFloat(PrintStream out) {
- out.println("testFloat");
- final float a = 45.5f;
- final float b = -7.11f;
- final double da = a;
- final double db = b;
- final int ia = (int)a;
- final int ib = (int)b;
-
- out.println("a " + a);
- out.println("b " + b);
- out.println("-a " + (-a));
- out.println("-b " + (-b));
- out.println("a + b " + (a + b));
- out.println("a - b " + (a - b));
- out.println("a * b " + (a * b));
- out.println("a / b " + (a / b));
- out.println("sin(a) " + Math.sin(a));
- out.println("asin(a) " + Math.asin(a));
- out.println("cos(a) " + Math.cos(a));
- out.println("acos(a) " + Math.acos(a));
- out.println("tan(a) " + Math.tan(a));
- out.println("atan(a) " + Math.atan(a));
- out.println("sqrt(a) " + Math.sqrt(a));
-
- out.println("da " + da);
- out.println("db " + db);
- out.println("ia " + ia);
- out.println("ib " + ib);
-
- out.println("a == a " + (a == a));
- out.println("a != a " + (a != a));
- out.println("a > a " + (a > a));
- out.println("a >= a " + (a >= a));
- out.println("a < a " + (a < a));
- out.println("a <= a " + (a <= a));
-
- out.println("a == b " + (a == b));
- out.println("a != b " + (a != b));
- out.println("a > b " + (a > b));
- out.println("a >= b " + (a >= b));
- out.println("a < b " + (a < b));
- out.println("a <= b " + (a <= b));
+ testFloat(out);
+ Thread.yield();
+ testDouble(out);
+ Thread.yield();
+ testTan(out);
+ Thread.yield();
+ }
+ };
+ Thread t1 = new Thread(r);
+ Thread t2 = new Thread(r);
+ t1.start();
+ t2.start();
+ t1.join();
+ t2.join();
+ }
- out.println();
- }
+ private static void testTan(PrintStream out) {
+ out.println("testTan");
- private static void testDouble(PrintStream out) {
- out.println("testDouble");
- final double a = 45.5;
- final double b = -7.11;
- final float fa = (float)a;
- final float fb = (float)b;
- final int ia = (int)a;
- final int ib = (int)b;
-
- out.println("a " + a);
- out.println("b " + b);
- out.println("-a " + (-a));
- out.println("-b " + (-b));
- out.println("a + b " + (a + b));
- out.println("a - b " + (a - b));
- out.println("a * b " + (a * b));
- out.println("a / b " + (a / b));
- out.println("sin(a) " + Math.sin(a));
- out.println("asin(a) " + Math.asin(a));
- out.println("cos(a) " + Math.cos(a));
- out.println("acos(a) " + Math.acos(a));
- out.println("tan(a) " + Math.tan(a));
- out.println("atan(a) " + Math.atan(a));
- out.println("sqrt(a) " + Math.sqrt(a));
-
- out.println("fa " + fa);
- out.println("fb " + fb);
- out.println("ia " + ia);
- out.println("ib " + ib);
-
- out.println("a == a " + (a == a));
- out.println("a != a " + (a != a));
- out.println("a > a " + (a > a));
- out.println("a >= a " + (a >= a));
- out.println("a < a " + (a < a));
- out.println("a <= a " + (a <= a));
-
- out.println("a == b " + (a == b));
- out.println("a != b " + (a != b));
- out.println("a > b " + (a > b));
- out.println("a >= b " + (a >= b));
- out.println("a < b " + (a < b));
- out.println("a <= b " + (a <= b));
-
- out.println();
- }
+ for (double i = -5; i < 5; i += 0.5) {
+
+ final double jvmResult = Math.tan(i);
+ final double cpResult = StrictMathTest.tan(i);
+
+ if (jvmResult != cpResult) {
+ out.println("tan(" + i + ")=" + jvmResult + "\t" + cpResult);
+ }
+ }
+ final double angle = Math.PI / 4.0;
+ final double a = 1.0 - Math.cos(angle);
+ final double b = Math.tan(angle);
+ final double c = Math.sqrt(1.0 + b * b) - 1 + a;
+ final float cv = (float) (4.0 / 3.0 * a * b / c);
+ out.println("JVM: " + Math.tan(angle) + ", CP: " + StrictMathTest.tan(angle));
+ out.println("CV: " + cv);
+ }
+
+
+ private static void testFloat(PrintStream out) {
+ out.println("testFloat");
+ final float a = 45.5f;
+ final float b = -7.11f;
+ final double da = a;
+ final double db = b;
+ final int ia = (int) a;
+ final int ib = (int) b;
+
+ out.println("a " + a);
+ out.println("b " + b);
+ out.println("-a " + (-a));
+ out.println("-b " + (-b));
+ out.println("a + b " + (a + b));
+ out.println("a - b " + (a - b));
+ out.println("a * b " + (a * b));
+ out.println("a / b " + (a / b));
+ out.println("sin(a) " + Math.sin(a));
+ out.println("asin(a) " + Math.asin(a));
+ out.println("cos(a) " + Math.cos(a));
+ out.println("acos(a) " + Math.acos(a));
+ out.println("tan(a) " + Math.tan(a));
+ out.println("atan(a) " + Math.atan(a));
+ out.println("sqrt(a) " + Math.sqrt(a));
+
+ out.println("da " + da);
+ out.println("db " + db);
+ out.println("ia " + ia);
+ out.println("ib " + ib);
+
+ out.println("a == a " + (a == a));
+ out.println("a != a " + (a != a));
+ out.println("a > a " + (a > a));
+ out.println("a >= a " + (a >= a));
+ out.println("a < a " + (a < a));
+ out.println("a <= a " + (a <= a));
+
+ out.println("a == b " + (a == b));
+ out.println("a != b " + (a != b));
+ out.println("a > b " + (a > b));
+ out.println("a >= b " + (a >= b));
+ out.println("a < b " + (a < b));
+ out.println("a <= b " + (a <= b));
+
+ out.println();
+ }
+
+ private static void testDouble(PrintStream out) {
+ out.println("testDouble");
+ final double a = 45.5;
+ final double b = -7.11;
+ final float fa = (float) a;
+ final float fb = (float) b;
+ final int ia = (int) a;
+ final int ib = (int) b;
+
+ out.println("a " + a);
+ out.println("b " + b);
+ out.println("-a " + (-a));
+ out.println("-b " + (-b));
+ out.println("a + b " + (a + b));
+ out.println("a - b " + (a - b));
+ out.println("a * b " + (a * b));
+ out.println("a / b " + (a / b));
+ out.println("sin(a) " + Math.sin(a));
+ out.println("asin(a) " + Math.asin(a));
+ out.println("cos(a) " + Math.cos(a));
+ out.println("acos(a) " + Math.acos(a));
+ out.println("tan(a) " + Math.tan(a));
+ out.println("atan(a) " + Math.atan(a));
+ out.println("sqrt(a) " + Math.sqrt(a));
+
+ out.println("fa " + fa);
+ out.println("fb " + fb);
+ out.println("ia " + ia);
+ out.println("ib " + ib);
+
+ out.println("a == a " + (a == a));
+ out.println("a != a " + (a != a));
+ out.println("a > a " + (a > a));
+ out.println("a >= a " + (a >= a));
+ out.println("a < a " + (a < a));
+ out.println("a <= a " + (a <= a));
+
+ out.println("a == b " + (a == b));
+ out.println("a != b " + (a != b));
+ out.println("a > b " + (a > b));
+ out.println("a >= b " + (a >= b));
+ out.println("a < b " + (a < b));
+ out.println("a <= b " + (a <= b));
+
+ out.println();
+ }
}
Modified: trunk/core/src/test/org/jnode/test/FieldInitTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/FieldInitTest.java 2008-05-29 21:48:08 UTC (rev 4149)
+++ trunk/core/src/test/org/jnode/test/FieldInitTest.java 2008-05-30 11:38:06 UTC (rev 4150)
@@ -18,7 +18,7 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.test;
public class FieldInitTest {
@@ -29,9 +29,9 @@
public static void main(String[] args) {
new FieldInitTest().DoSomething();
}
-
+
StringBuilder sb = new StringBuilder();
-
+
public void DoSomething() {
sb.append("Hello world");
}
Modified: trunk/core/src/test/org/jnode/test/FinalizeTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/FinalizeTest.java 2008-05-29 21:48:08 UTC (rev 4149)
+++ trunk/core/src/test/org/jnode/test/FinalizeTest.java 2008-05-30 11:38:06 UTC (rev 4150)
@@ -18,7 +18,7 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.test;
@@ -34,18 +34,18 @@
Runtime.getRuntime().gc();
System.out.println("Done");
}
-
+
private final int i;
-
+
public FinalizeTest(int i) {
this.i = i;
}
-
+
/**
* @see java.lang.Object#finalize()
*/
public void finalize() {
System.out.println("Finalize called on " + i);
}
-
+
}
Modified: trunk/core/src/test/org/jnode/test/ForEachTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/ForEachTest.java 2008-05-29 21:48:08 UTC (rev 4149)
+++ trunk/core/src/test/org/jnode/test/ForEachTest.java 2008-05-30 11:38:06 UTC (rev 4150)
@@ -18,11 +18,10 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.test;
import java.util.ArrayList;
-
import junit.framework.TestCase;
@@ -36,14 +35,14 @@
* @param args
*/
public static void main(String[] args) {
- ForEachTest test = new ForEachTest();
+ ForEachTest test = new ForEachTest();
test.testIntArray();
test.testStringArray();
test.testCollection();
}
public void testIntArray() {
- final int[] a = new int[] { 0, 1, 2, 3, 4, 5 };
+ final int[] a = new int[]{0, 1, 2, 3, 4, 5};
int expected = 0;
for (int i : a) {
@@ -52,29 +51,29 @@
}
assertEquals("array not fully iterated", expected, a.length);
}
-
+
public void testStringArray() {
- final String[] a = new String[] { "A", "B", "C", "D", "E" };
-
+ final String[] a = new String[]{"A", "B", "C", "D", "E"};
+
int idxExpected = 0;
for (String s : a) {
assertEquals(a[idxExpected], s);
- idxExpected++;
+ idxExpected++;
}
assertEquals("array not fully iterated", idxExpected, a.length);
}
-
+
public void testCollection() {
final ArrayList<String> list = new ArrayList<String>();
list.add("Aap");
list.add("Noot");
list.add("Mies");
-
+
int idxExpected = 0;
for (String s : list) {
assertEquals(list.get(idxExpected), s);
- idxExpected++;
+ idxExpected++;
}
assertEquals("collection not fully iterated", idxExpected, list.size());
- }
+ }
}
Modified: trunk/core/src/test/org/jnode/test/HoldsLockTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/HoldsLockTest.java 2008-05-29 21:48:08 UTC (rev 4149)
+++ trunk/core/src/test/org/jnode/test/HoldsLockTest.java 2008-05-30 11:38:06 UTC (rev 4150)
@@ -18,7 +18,7 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.test;
/**
@@ -26,23 +26,23 @@
*/
public class HoldsLockTest {
- public static void main(String[] args) {
-
- final Object o = new Object();
-
- test(o, false);
- synchronized (o) {
- test(o, true);
- }
- test(o, false);
- }
-
- private static void test(Object obj, boolean expectedResult) {
- final boolean result = Thread.holdsLock(obj);
- if (result != expectedResult) {
- System.out.println("Test failed: holdsLock=" + result + ", but " + expectedResult + " was expected");
- } else {
- System.out.println("Ok");
- }
- }
+ public static void main(String[] args) {
+
+ final Object o = new Object();
+
+ test(o, false);
+ synchronized (o) {
+ test(o, true);
+ }
+ test(o, false);
+ }
+
+ private static void test(Object obj, boolean expectedResult) {
+ final boolean result = Thread.holdsLock(obj);
+ if (result != expectedResult) {
+ System.out.println("Test failed: holdsLock=" + result + ", but " + expectedResult + " was expected");
+ } else {
+ System.out.println("Ok");
+ }
+ }
}
Modified: trunk/core/src/test/org/jnode/test/IOTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/IOTest.java 2008-05-29 21:48:08 UTC (rev 4149)
+++ trunk/core/src/test/org/jnode/test/IOTest.java 2008-05-30 11:38:06 UTC (rev 4150)
@@ -18,7 +18,7 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.test;
import java.io.File;
@@ -27,42 +27,42 @@
* @author epr
*/
public class IOTest {
-
- public static void main(String[] args) {
- File[] roots = File.listRoots();
-
- System.out.println("FS Roots:");
- for (int i = 0; i < roots.length; i++) {
- System.out.println("[" + i + "]: " + roots[i]);
- printDir(roots[i], 1);
- }
- }
-
- public static void printDir(File dir, int level) {
- final File[] list = dir.listFiles();
- if (list != null) {
- for (int i = 0; i < list.length; i++) {
- final File f = list[i];
- if (f.isDirectory()) {
- System.out.println(tabs(level) + "[" + f.getName() + "]");
- printDir(f, level+1);
- } else {
- System.out.println(tabs(level) + f.getName() + " " + f.length());
- }
- }
- System.out.println(tabs(level) + " -- total of " + list.length + " files --");
- } else {
- System.out.println("list == null in (" + dir + ").list");
- }
- }
-
- private static String tabs(int level) {
- StringBuffer b = new StringBuffer();
- for (int i = 0; i < level; i++) {
- b.append(" ");
- }
- return b.toString();
- }
+ public static void main(String[] args) {
+ File[] roots = File.listRoots();
+
+ System.out.println("FS Roots:");
+ for (int i = 0; i < roots.length; i++) {
+ System.out.println("[" + i + "]: " + roots[i]);
+ printDir(roots[i], 1);
+ }
+ }
+
+ public static void printDir(File dir, int level) {
+ final File[] list = dir.listFiles();
+ if (list != null) {
+ for (int i = 0; i < list.length; i++) {
+ final File f = list[i];
+ if (f.isDirectory()) {
+ System.out.println(tabs(level) + "[" + f.getName() + "]");
+ printDir(f, level + 1);
+ } else {
+ System.out.println(tabs(level) + f.getName() + " " + f.length());
+ }
+ }
+ System.out.println(tabs(level) + " -- total of " + list.length + " files --");
+ } else {
+ System.out.println("list == null in (" + dir + ").list");
+ }
+ }
+
+ private static String tabs(int level) {
+ StringBuffer b = new StringBuffer();
+ for (int i = 0; i < level; i++) {
+ b.append(" ");
+ }
+ return b.toString();
+ }
+
}
Modified: trunk/core/src/test/org/jnode/test/IRTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/IRTest.java 2008-05-29 21:48:08 UTC (rev 4149)
+++ trunk/core/src/test/org/jnode/test/IRTest.java 2008-05-30 11:38:06 UTC (rev 4150)
@@ -18,7 +18,7 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.test;
import java.io.File;
@@ -28,7 +28,6 @@
import java.net.MalformedURLException;
import java.util.Collection;
import java.util.Map;
-
import org.jnode.assembler.x86.X86Assembler;
import org.jnode.assembler.x86.X86BinaryAssembler;
import org.jnode.assembler.x86.X86Constants;
@@ -40,8 +39,14 @@
import org.jnode.vm.classmgr.VmByteCode;
import org.jnode.vm.classmgr.VmMethod;
import org.jnode.vm.classmgr.VmType;
+import org.jnode.vm.compiler.ir.CodeGenerator;
+import org.jnode.vm.compiler.ir.IRBasicBlock;
+import org.jnode.vm.compiler.ir.IRControlFlowGraph;
+import org.jnode.vm.compiler.ir.IRGenerator;
+import org.jnode.vm.compiler.ir.LinearScanAllocator;
+import org.jnode.vm.compiler.ir.LiveRange;
+import org.jnode.vm.compiler.ir.Variable;
import org.jnode.vm.compiler.ir.quad.Quad;
-import org.jnode.vm.compiler.ir.*;
import org.jnode.vm.x86.VmX86Architecture32;
import org.jnode.vm.x86.X86CpuID;
import org.jnode.vm.x86.compiler.l2.GenericX86CodeGenerator;
@@ -52,7 +57,7 @@
* @author Levente S\u00e1ntha
*/
public class IRTest {
- public static void main(String args[]) throws SecurityException, IOException, ClassNotFoundException {
+ public static void m...
[truncated message content] |
