summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/junit/com/sun/gluegen/BasicTest.java4
-rw-r--r--test/junit/com/sun/gluegen/BuildUtil.java6
-rw-r--r--test/junit/com/sun/gluegen/PCPPTest.java3
-rw-r--r--test/junit/com/sun/gluegen/build.xml2
-rw-r--r--test/junit/com/sun/gluegen/test.cfg2
5 files changed, 9 insertions, 8 deletions
diff --git a/test/junit/com/sun/gluegen/BasicTest.java b/test/junit/com/sun/gluegen/BasicTest.java
index a12cc76..b186c53 100644
--- a/test/junit/com/sun/gluegen/BasicTest.java
+++ b/test/junit/com/sun/gluegen/BasicTest.java
@@ -1,7 +1,7 @@
package com.sun.gluegen;
-import com.jogamp.gluegen.runtime.Buffers;
-import com.jogamp.gluegen.runtime.PointerBuffer;
+import com.jogamp.common.nio.Buffers;
+import com.jogamp.common.nio.PointerBuffer;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.nio.ByteBuffer;
diff --git a/test/junit/com/sun/gluegen/BuildUtil.java b/test/junit/com/sun/gluegen/BuildUtil.java
index dd46221..35dc0c1 100644
--- a/test/junit/com/sun/gluegen/BuildUtil.java
+++ b/test/junit/com/sun/gluegen/BuildUtil.java
@@ -43,8 +43,8 @@ public final class BuildUtil {
throw new RuntimeException("can not determine gluegen root", ex);
}
- path = gluegenRoot + "/test/junit/com/sun/gluegen";
- testOutput = gluegenRoot + "/" + rootrel_build + "/test";
+ path = gluegenRoot + "/test/junit/com/sun/gluegen";
+ testOutput = gluegenRoot + "/" + rootrel_build + "/test";
out.println("path: "+path);
out.println("testOutput: "+testOutput);
@@ -61,7 +61,7 @@ public final class BuildUtil {
DefaultLogger logger = new DefaultLogger();
logger.setErrorPrintStream(out);
logger.setOutputPrintStream(out);
- logger.setMessageOutputLevel(Project.MSG_INFO);
+ logger.setMessageOutputLevel(Project.MSG_WARN);
project.addBuildListener(logger);
project.init();
diff --git a/test/junit/com/sun/gluegen/PCPPTest.java b/test/junit/com/sun/gluegen/PCPPTest.java
index c086c47..3764212 100644
--- a/test/junit/com/sun/gluegen/PCPPTest.java
+++ b/test/junit/com/sun/gluegen/PCPPTest.java
@@ -1,7 +1,6 @@
package com.sun.gluegen;
import com.sun.gluegen.pcpp.PCPP;
-import java.io.BufferedOutputStream;
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.FileNotFoundException;
@@ -18,7 +17,7 @@ import static org.junit.Assert.*;
public class PCPPTest {
@Test
- public void pcppTest() throws FileNotFoundException, IOException {
+ public void pcppMacroDefinitionTest() throws FileNotFoundException, IOException {
PCPP pp = new PCPP(Collections.<String>emptyList());
ByteArrayOutputStream output = new ByteArrayOutputStream();
diff --git a/test/junit/com/sun/gluegen/build.xml b/test/junit/com/sun/gluegen/build.xml
index 24235c0..4889ab1 100644
--- a/test/junit/com/sun/gluegen/build.xml
+++ b/test/junit/com/sun/gluegen/build.xml
@@ -29,7 +29,7 @@
<mkdir dir="${build.dir.java}"/>
- <javac destdir="${build.dir.java}" source="1.5" failonerror="true" debug="true" verbose="true" debuglevel="lines,vars,source">
+ <javac destdir="${build.dir.java}" source="1.5" failonerror="true" debug="true" debuglevel="lines,vars,source">
<src path="${src.dir}"/>
<classpath path="${gluegen.root}/${rootrel.build}/classes:${src.dir}:${gluegen.root}/${rootrel.build}/antlr-3.2.jar:${gluegen.root}/make/lib/junit-4.5.jar:${tools.jar}:${ant.core.lib}"/>
</javac>
diff --git a/test/junit/com/sun/gluegen/test.cfg b/test/junit/com/sun/gluegen/test.cfg
index a709897..a2ac567 100644
--- a/test/junit/com/sun/gluegen/test.cfg
+++ b/test/junit/com/sun/gluegen/test.cfg
@@ -5,3 +5,5 @@ JavaOutputDir java
NativeOutputDir native
CustomCCode #include "test.h"
+
+Import com.jogamp.common.nio.* \ No newline at end of file