summaryrefslogtreecommitdiffstats
path: root/src/junit/com/jogamp
diff options
context:
space:
mode:
Diffstat (limited to 'src/junit/com/jogamp')
-rw-r--r--src/junit/com/jogamp/common/nio/TestPointerBufferEndian.java2
-rw-r--r--src/junit/com/jogamp/common/nio/TestStructAccessorEndian.java4
-rw-r--r--src/junit/com/jogamp/common/util/TestIOUtil01.java4
-rw-r--r--src/junit/com/jogamp/common/util/TestPlatform01.java6
-rw-r--r--src/junit/com/jogamp/gluegen/test/junit/generation/BaseClass.java8
-rw-r--r--src/junit/com/jogamp/junit/sec/Applet01.java4
6 files changed, 14 insertions, 14 deletions
diff --git a/src/junit/com/jogamp/common/nio/TestPointerBufferEndian.java b/src/junit/com/jogamp/common/nio/TestPointerBufferEndian.java
index 3334f7f..d97e98c 100644
--- a/src/junit/com/jogamp/common/nio/TestPointerBufferEndian.java
+++ b/src/junit/com/jogamp/common/nio/TestPointerBufferEndian.java
@@ -20,7 +20,7 @@ import org.junit.runners.MethodSorters;
public class TestPointerBufferEndian extends SingletonJunitCase {
protected void testImpl (final boolean direct) {
- final MachineDescription machine = Platform.getMachineDescription();
+ final MachineDataInfo machine = Platform.getMachineDataInfo();
final int bitsPtr = machine.pointerSizeInBytes() * 8;
final String bitsProp = System.getProperty("sun.arch.data.model");
out.println("OS: <"+PlatformPropsImpl.OS+"> CPU: <"+PlatformPropsImpl.ARCH+"> Bits: <"+bitsPtr+"/"+bitsProp+">");
diff --git a/src/junit/com/jogamp/common/nio/TestStructAccessorEndian.java b/src/junit/com/jogamp/common/nio/TestStructAccessorEndian.java
index 081337e..a569b54 100644
--- a/src/junit/com/jogamp/common/nio/TestStructAccessorEndian.java
+++ b/src/junit/com/jogamp/common/nio/TestStructAccessorEndian.java
@@ -10,7 +10,7 @@ import jogamp.common.os.PlatformPropsImpl;
import org.junit.Assert;
import org.junit.Test;
-import com.jogamp.common.os.MachineDescription;
+import com.jogamp.common.os.MachineDataInfo;
import com.jogamp.common.os.Platform;
import com.jogamp.junit.util.SingletonJunitCase;
@@ -22,7 +22,7 @@ public class TestStructAccessorEndian extends SingletonJunitCase {
@Test
public void testStructAccessorEndian1 () {
- final MachineDescription machine = Platform.getMachineDescription();
+ final MachineDataInfo machine = Platform.getMachineDataInfo();
final int bitsPtr = machine.pointerSizeInBytes() * 8;
final String bitsProp = System.getProperty("sun.arch.data.model");
out.println("OS: <"+PlatformPropsImpl.OS+"> CPU: <"+PlatformPropsImpl.ARCH+"> Bits: <"+bitsPtr+"/"+bitsProp+">");
diff --git a/src/junit/com/jogamp/common/util/TestIOUtil01.java b/src/junit/com/jogamp/common/util/TestIOUtil01.java
index 539f883..e85aa37 100644
--- a/src/junit/com/jogamp/common/util/TestIOUtil01.java
+++ b/src/junit/com/jogamp/common/util/TestIOUtil01.java
@@ -43,7 +43,7 @@ import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
-import com.jogamp.common.os.MachineDescription;
+import com.jogamp.common.os.MachineDataInfo;
import com.jogamp.common.os.Platform;
import com.jogamp.junit.util.SingletonJunitCase;
@@ -53,7 +53,7 @@ import org.junit.runners.MethodSorters;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestIOUtil01 extends SingletonJunitCase {
- static final MachineDescription machine = Platform.getMachineDescription();
+ static final MachineDataInfo machine = Platform.getMachineDataInfo();
static final int tsz = machine.pageSizeInBytes() + machine.pageSizeInBytes() / 2 ;
static final byte[] orig = new byte[tsz];
static final String tfilename = "./test.bin" ;
diff --git a/src/junit/com/jogamp/common/util/TestPlatform01.java b/src/junit/com/jogamp/common/util/TestPlatform01.java
index fc88067..6f1fe0e 100644
--- a/src/junit/com/jogamp/common/util/TestPlatform01.java
+++ b/src/junit/com/jogamp/common/util/TestPlatform01.java
@@ -31,7 +31,7 @@ package com.jogamp.common.util;
import org.junit.Assert;
import org.junit.Test;
-import com.jogamp.common.os.MachineDescription;
+import com.jogamp.common.os.MachineDataInfo;
import com.jogamp.common.os.Platform;
import com.jogamp.junit.util.SingletonJunitCase;
@@ -55,14 +55,14 @@ public class TestPlatform01 extends SingletonJunitCase {
System.err.println("Java vendor[name/url]: "+Platform.getJavaVendor()+"/"+Platform.getJavaVendorURL());
System.err.println("Java version, vm: "+Platform.getJavaVersion()+", "+Platform.getJavaVMName());
System.err.println();
- System.err.println("MD: "+Platform.getMachineDescription());
+ System.err.println("MD: "+Platform.getMachineDataInfo());
System.err.println();
System.err.println();
}
@Test
public void testPageSize01() {
- final MachineDescription machine = Platform.getMachineDescription();
+ final MachineDataInfo machine = Platform.getMachineDataInfo();
final int ps = machine.pageSizeInBytes();
System.err.println("PageSize: "+ps);
Assert.assertTrue("PageSize is 0", 0 < ps );
diff --git a/src/junit/com/jogamp/gluegen/test/junit/generation/BaseClass.java b/src/junit/com/jogamp/gluegen/test/junit/generation/BaseClass.java
index 82e8cd4..3b1857d 100644
--- a/src/junit/com/jogamp/gluegen/test/junit/generation/BaseClass.java
+++ b/src/junit/com/jogamp/gluegen/test/junit/generation/BaseClass.java
@@ -30,7 +30,7 @@ package com.jogamp.gluegen.test.junit.generation;
import com.jogamp.common.nio.Buffers;
import com.jogamp.common.nio.PointerBuffer;
-import com.jogamp.common.os.MachineDescription;
+import com.jogamp.common.os.MachineDataInfo;
import com.jogamp.common.os.Platform;
import com.jogamp.junit.util.SingletonJunitCase;
@@ -41,7 +41,7 @@ import java.nio.IntBuffer;
import java.nio.LongBuffer;
import java.util.Arrays;
-import jogamp.common.os.MachineDescriptionRuntime;
+import jogamp.common.os.MachineDataInfoRuntime;
import org.junit.Assert;
@@ -824,8 +824,8 @@ public class BaseClass extends SingletonJunitCase {
public void chapter09TestCompoundAlignment(final Bindingtest1 binding) throws Exception {
- final MachineDescription.StaticConfig smd = MachineDescriptionRuntime.getStatic();
- final MachineDescription md = MachineDescriptionRuntime.getRuntime();
+ final MachineDataInfo.StaticConfig smd = MachineDataInfoRuntime.getStatic();
+ final MachineDataInfo md = MachineDataInfoRuntime.getRuntime();
System.err.println("static md: "+smd);
System.err.println("runtime md: "+md);
diff --git a/src/junit/com/jogamp/junit/sec/Applet01.java b/src/junit/com/jogamp/junit/sec/Applet01.java
index 2312aa4..f028d7c 100644
--- a/src/junit/com/jogamp/junit/sec/Applet01.java
+++ b/src/junit/com/jogamp/junit/sec/Applet01.java
@@ -37,7 +37,7 @@ import java.net.URISyntaxException;
import java.security.AccessControlException;
import com.jogamp.common.net.Uri;
-import com.jogamp.common.os.MachineDescription;
+import com.jogamp.common.os.MachineDataInfo;
import com.jogamp.common.os.NativeLibrary;
import com.jogamp.common.os.Platform;
import com.jogamp.common.util.IOUtil;
@@ -52,7 +52,7 @@ public class Applet01 extends Applet {
static final String os_name_propkey = "os.name";
static final String tfilename = "test.bin" ;
- static final MachineDescription machine = Platform.getMachineDescription();
+ static final MachineDataInfo machine = Platform.getMachineDataInfo();
static final int tsz = machine.pageSizeInBytes();
static final boolean usesSecurityManager;