added test target to main build script.

added StructAccessorTest, refactored other tests.
updated project files, paths etc.

1 files changed, 25 insertions, 13 deletions

diff --git a/nbproject/ide-file-targets.xml b/nbproject/ide-file-targets.xml
index b1b8475..f763c48 100644
--- a/nbproject/ide-file-targets.xml
+++ b/nbproject/ide-file-targets.xml
@@ -1,60 +1,72 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project basedir=".." name="GlueGen-IDE">
     
-    <property name="ant.script" value="make/build.xml"/>
-
     <!-- edit the following targets according to your needs -->
     <!-- (more info: http://www.netbeans.org/kb/articles/freeform-config.html-->
     
+    <target name="compile-test">
+
+        <mkdir dir="build/test/build/classes"/>
+
+        <javac destdir="build/test/build/classes" failonerror="false" source="1.5" srcdir="test/junit" debug="true" debuglevel="lines,vars,source">
+            <classpath path="build/test/build/classes:build/classes:build/test/gensrc/java:lib/antlr-3.2.jar:make/lib/junit-4.5.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}"/>
+        </javac>
+    </target>
+
     <target name="compile-selected-files-in-junit">
         <fail unless="files">Must set property 'files'</fail>
 
         <mkdir dir="build/test/build/classes"/>
 
         <javac destdir="build/test/build/classes" includes="${files}" source="1.5" srcdir="test/junit" debug="true" debuglevel="lines,vars,source">
-            <classpath path="build/test/build/classes:build/classes:build/test/gensrc/java:lib/antlr-3.2.jar:lib/junit-4.5.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}"/>
+            <classpath path="build/test/build/classes:build/classes:build/test/gensrc/java:lib/antlr-3.2.jar:make/lib/junit-4.5.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}"/>
         </javac>
     </target>
 
-    <target name="run-selected-file-in-junit">
+    <target name="run-selected-file-in-junit" depends="compile-test">
         <fail unless="run.class">Must set property 'run.class'</fail>
 
         <java classname="${run.class}" failonerror="true" fork="true">
             <classpath>
-                <path path="build/test/build/classes:build/classes:lib/antlr-3.2.jar:lib/junit-4.5.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}"/>
+                <path path="build/test/build/classes:build/classes:lib/antlr-3.2.jar:make/lib/junit-4.5.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}"/>
             </classpath>
         </java>
     </target>
 
-    <target name="test-selected-file-in-junit">
+    <target name="test-selected-file-in-junit" depends="compile-test">
         <fail unless="run.class">Must set property 'run.class'</fail>
-
         <junit forkmode="once" showoutput="true" fork="true" failureproperty="tests.failed" errorproperty="tests.failed">
             <test name="${run.class}">
             </test>
+            <jvmarg value="-Djava.library.path=${basedir}/build/test/build/natives"/>
             <classpath>
-                <path path="build/test/build/classes:build/test/gensrc/java:build/classes:lib/antlr-3.2.jar:lib/junit-4.5.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}"/>
+                <path path="build/test/build/classes:build/test/gensrc/java:build/classes:lib/antlr-3.2.jar:make/lib/junit-4.5.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}"/>
             </classpath>
             <formatter usefile="false" type="brief"/>
-            <formatter type="xml"/>
         </junit>
     </target>
     
-    <target name="debug-selected-file-in-junit">
-        <fail unless="debug.class">Must set property 'debug.class'</fail>
+    <target name="debug-selected-file-in-junit" depends="compile-test">
+        <fail unless="run.class">Must set property 'debug.class'</fail>
 
         <path id="cp">
-            <path path="build/test/build/classes:build/classes:lib/antlr-3.2.jar:lib/junit-4.5.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}"/>
+            <path path="build/test/build/classes:build/test/gensrc/java:build/classes:lib/antlr-3.2.jar:make/lib/junit-4.5.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}"/>
         </path>
 
         <nbjpdastart addressproperty="jpda.address" name="GlueGen" transport="dt_socket">
             <classpath refid="cp"/>
         </nbjpdastart>
 
-        <java classname="${debug.class}" fork="true">
+        <junit forkmode="once" showoutput="true" fork="true" failureproperty="tests.failed" errorproperty="tests.failed">
+            <test name="${run.class}">
+            </test>
             <classpath refid="cp"/>
+            <jvmarg value="-Djava.library.path=${basedir}/build/test/build/natives"/>
             <jvmarg value="-Xdebug"/>
             <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+            <formatter usefile="false" type="brief"/>
+        </junit>
+        <java classname="${run.class}" fork="true">
         </java>
     </target>