diff options
Diffstat (limited to 'src/junit/com')
5 files changed, 8 insertions, 8 deletions
diff --git a/src/junit/com/jogamp/common/util/IntIntHashMapTest.java b/src/junit/com/jogamp/common/util/IntIntHashMapTest.java index 09aff1c..22ff25a 100644 --- a/src/junit/com/jogamp/common/util/IntIntHashMapTest.java +++ b/src/junit/com/jogamp/common/util/IntIntHashMapTest.java @@ -55,7 +55,7 @@ public class IntIntHashMapTest { @BeforeClass public static void init() { - iterations = ( Platform.CPUType.ARM == Platform.CPU_TYPE ) ? 100 : 10000; + iterations = ( Platform.getCPUType().getFamily() == Platform.CPUFamily.ARM ) ? 100 : 10000; pairs = new IntIntUniqueRndValues(iterations); } diff --git a/src/junit/com/jogamp/common/util/IntObjectHashMapTest.java b/src/junit/com/jogamp/common/util/IntObjectHashMapTest.java index 00de133..2bbce8b 100644 --- a/src/junit/com/jogamp/common/util/IntObjectHashMapTest.java +++ b/src/junit/com/jogamp/common/util/IntObjectHashMapTest.java @@ -54,7 +54,7 @@ public class IntObjectHashMapTest { @BeforeClass public static void init() { - iterations = ( Platform.getCPUType() == Platform.CPUType.ARM ) ? 100 : 10000; + iterations = ( Platform.getCPUType().getFamily() == Platform.CPUFamily.ARM ) ? 100 : 10000; pairs = new IntIntObjUniqueRndValues(iterations); } diff --git a/src/junit/com/jogamp/common/util/LongIntHashMapTest.java b/src/junit/com/jogamp/common/util/LongIntHashMapTest.java index 239bef1..2426526 100644 --- a/src/junit/com/jogamp/common/util/LongIntHashMapTest.java +++ b/src/junit/com/jogamp/common/util/LongIntHashMapTest.java @@ -55,7 +55,7 @@ public class LongIntHashMapTest { @BeforeClass public static void init() { - iterations = ( Platform.getCPUType() == Platform.CPUType.ARM ) ? 100 : 10000; + iterations = ( Platform.getCPUFamily() == Platform.CPUFamily.ARM ) ? 100 : 10000; pairs = new LongIntUniqueRndValues(iterations); } diff --git a/src/junit/com/jogamp/common/util/TestIteratorIndexCORE.java b/src/junit/com/jogamp/common/util/TestIteratorIndexCORE.java index da797dc..6bdfbd1 100644 --- a/src/junit/com/jogamp/common/util/TestIteratorIndexCORE.java +++ b/src/junit/com/jogamp/common/util/TestIteratorIndexCORE.java @@ -42,7 +42,7 @@ import com.jogamp.common.os.Platform; public class TestIteratorIndexCORE { static int elems = 10; - static int loop = ( Platform.getCPUType() == Platform.CPUType.ARM ) ? 100 : 9999999; + static int loop = ( Platform.getCPUFamily() == Platform.CPUFamily.ARM ) ? 100 : 9999999; public void populate(List l, int len) { while(len>0) { diff --git a/src/junit/com/jogamp/common/util/locks/TestRecursiveLock01.java b/src/junit/com/jogamp/common/util/locks/TestRecursiveLock01.java index bee9b44..099f8b8 100644 --- a/src/junit/com/jogamp/common/util/locks/TestRecursiveLock01.java +++ b/src/junit/com/jogamp/common/util/locks/TestRecursiveLock01.java @@ -212,7 +212,7 @@ public class TestRecursiveLock01 { // @Test public void testLockedObjectThreading2x10000() throws InterruptedException { System.err.println("++++ TestRecursiveLock01.testLockedObjectThreading2x10000"); - if( Platform.getCPUType() == Platform.CPUType.ARM ) { + if( Platform.getCPUFamily() == Platform.CPUFamily.ARM ) { testLockedObjectImpl(2, 10, 10, YIELD_NONE); } else { testLockedObjectImpl(2, 10000, 10000, YIELD_NONE); @@ -223,7 +223,7 @@ public class TestRecursiveLock01 { @Test public void testLockedObjectThreading25x25Yield() throws InterruptedException { System.err.println("++++ TestRecursiveLock01.testLockedObjectThreading25x25-Yield"); - if( Platform.getCPUType() == Platform.CPUType.ARM ) { + if( Platform.getCPUFamily() == Platform.CPUFamily.ARM ) { testLockedObjectImpl(5, 25, 10, YIELD_YIELD); } else { testLockedObjectImpl(25, 25, 100, YIELD_YIELD); @@ -234,7 +234,7 @@ public class TestRecursiveLock01 { // @Test public void testLockedObjectThreading25x25Sleep() throws InterruptedException { System.err.println("++++ TestRecursiveLock01.testLockedObjectThreading25x25-Sleep"); - if( Platform.getCPUType() == Platform.CPUType.ARM ) { + if( Platform.getCPUFamily() == Platform.CPUFamily.ARM ) { testLockedObjectImpl(5, 25, 10, YIELD_SLEEP); } else { testLockedObjectImpl(25, 25, 100, YIELD_SLEEP); @@ -245,7 +245,7 @@ public class TestRecursiveLock01 { @Test public void testLockedObjectThreading25x25None() throws InterruptedException { System.err.println("++++ TestRecursiveLock01.testLockedObjectThreading25x25-None"); - if( Platform.getCPUType() == Platform.CPUType.ARM ) { + if( Platform.getCPUFamily() == Platform.CPUFamily.ARM ) { testLockedObjectImpl(5, 25, 10, YIELD_NONE); } else { testLockedObjectImpl(25, 25, 100, YIELD_NONE); |