added test target to main build script.

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

2 files changed, 59 insertions, 14 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>
     
diff --git a/nbproject/project.xml b/nbproject/project.xml
index e42488b..84bdc44 100755
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -41,6 +41,12 @@
                     <location>build/test</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
+                <source-folder>
+                    <label>build/test/gensrc/java</label>
+                    <type>java</type>
+                    <location>build/test/gensrc/java</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
             </folders>
             <ide-actions>
                 <action name="build">
@@ -82,6 +88,19 @@
                         </arity>
                     </context>
                 </action>
+                <action name="debug.test.single">
+                    <script>nbproject/ide-file-targets.xml</script>
+                    <target>debug-selected-file-in-junit</target>
+                    <context>
+                        <property>run.class</property>
+                        <folder>test/junit</folder>
+                        <pattern>\.java$</pattern>
+                        <format>java-name</format>
+                        <arity>
+                            <one-file-only/>
+                        </arity>
+                    </context>
+                </action>
                 <action name="compile.single">
                     <script>nbproject/ide-file-targets.xml</script>
                     <target>compile-selected-files-in-junit</target>
@@ -108,6 +127,10 @@
                         </arity>
                     </context>
                 </action>
+                <action name="test">
+                    <script>${ant.script}</script>
+                    <target>test</target>
+                </action>
             </ide-actions>
             <export>
                 <type>folder</type>
@@ -145,6 +168,10 @@
                         <label>build/test</label>
                         <location>build/test</location>
                     </source-folder>
+                    <source-folder style="packages">
+                        <label>build/test/gensrc/java</label>
+                        <location>build/test/gensrc/java</location>
+                    </source-folder>
                     <source-file>
                         <location>${ant.script}</location>
                     </source-file>
@@ -153,6 +180,7 @@
                     <ide-action name="build"/>
                     <ide-action name="rebuild"/>
                     <ide-action name="clean"/>
+                    <ide-action name="test"/>
                 </context-menu>
             </view>
             <subprojects/>
@@ -173,7 +201,7 @@
             <compilation-unit>
                 <package-root>test/junit</package-root>
                 <unit-tests/>
-                <classpath mode="compile">build/classes:build/test/gensrc/java:lib/antlr-3.2.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}:lib/junit-4.5.jar</classpath>
+                <classpath mode="compile">build/classes:build/test/build/classes:lib/antlr-3.2.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}:make/lib/junit-4.5.jar</classpath>
                 <built-to>build/classes</built-to>
                 <source-level>1.5</source-level>
             </compilation-unit>
@@ -181,6 +209,11 @@
                 <package-root>build/test</package-root>
                 <source-level>1.5</source-level>
             </compilation-unit>
+            <compilation-unit>
+                <package-root>build/test/gensrc/java</package-root>
+                <unit-tests/>
+                <source-level>1.5</source-level>
+            </compilation-unit>
         </java-data>
         <preferences xmlns="http://www.netbeans.org/ns/auxiliary-configuration-preferences/1">
             <module name="org-netbeans-modules-editor-indent"/>