1.1 --- a/visualweb.dataprovider/test/CachedRowSet_DataProvider_unit.sh Thu Nov 15 01:18:16 2007 +0000
1.2 +++ b/visualweb.dataprovider/test/CachedRowSet_DataProvider_unit.sh Thu Nov 15 07:15:46 2007 +0000
1.3 @@ -6,8 +6,8 @@
1.4 export BASE=g:/home/tr61
1.5 echo $BASE
1.6
1.7 -# ant -Dnetbeans.dest.dir="/sun/NB-6.0" -Dxtest.file_appserver.properties=/sun/as.properties -Dxtest.file_database.properties=/sun/db_derby.properties -Dxtest.testtype="unit" -Dxtest.testbags="CachedRowSetDataProviderTest" -Dxtest.testattribs="stable" -Dnetbeans.javacore.noscan=true
1.8 +# uncomment when running CachedRowSetTest also - after including test in cfg-unit.xml
1.9 +ant -Dnetbeans.dest.dir="$BASE/nbbuild/netbeans" -Dxtest.file_appserver.properties=$BASE/visualweb/dataprovider/runtime/test/unit/as.properties -Dxtest.file_database.properties=$BASE/visualweb/dataprovider/runtime/test/unit/db_derby.properties -Dxtest.testtype="unit" -Dxtest.testattribs="stable" -Dnetbeans.javacore.noscan=true
1.10
1.11 -#ant -Dnetbeans.dest.dir="$BASE/nbbuild/netbeans" -Dxtest.file_appserver.properties=$BASE/visualweb/dataprovider/runtime/test/unit/as.properties -Dxtest.file_database.properties=$BASE/visualweb/dataprovider/runtime/test/unit/db.properties -Dxtest.testtype="unit" -Dxtest.testbags="CachedRowSetDataProviderTest" -Dxtest.testattribs="stable" -Dnetbeans.javacore.noscan=true
1.12 +#ant -Dnetbeans.dest.dir="$BASE/nbbuild/netbeans" -Dxtest.testtype="unit" -Dxtest.testattribs="stable" -Dnetbeans.javacore.noscan=true
1.13
1.14 -ant -Dnetbeans.dest.dir="$BASE/nbbuild/netbeans" -Dxtest.file_appserver.properties=$BASE/visualweb/dataprovider/runtime/test/unit/as.properties -Dxtest.file_database.properties=$BASE/visualweb/dataprovider/runtime/test/unit/db_derby.properties -Dxtest.testtype="unit" -Dxtest.testattribs="stable" -Dnetbeans.javacore.noscan=true
2.1 --- a/visualweb.dataprovider/test/build-unit.xml Thu Nov 15 01:18:16 2007 +0000
2.2 +++ b/visualweb.dataprovider/test/build-unit.xml Thu Nov 15 07:15:46 2007 +0000
2.3 @@ -42,6 +42,8 @@
2.4 -->
2.5
2.6 <project name="org.netbeans.modules.visualweb.dataprovider/test-unit" basedir="." default="all">
2.7 + <import file="../../../../nbbuild/templates/xtest-unit.xml"/>
2.8 +
2.9 <property name="xtest.file_appserver.properties" location="${basedir}/unit/as.properties"/>
2.10 <property name="xtest.file_database.properties" location="${basedir}/unit/db_derby.properties"/>
2.11 <loadproperties srcfile="${xtest.file_appserver.properties}" />
2.12 @@ -56,6 +58,58 @@
2.13 <echo message=" "/>
2.14 <echo message="Pause..."/>
2.15 <sleep seconds="1"/>
2.16 - <import file="../../../../nbbuild/templates/xtest-unit.xml"/>
2.17 +
2.18 +<property name="derby.libdir" location="${path_SunAppServer}/javadb/lib"/>
2.19 +<property name="derby.libfile" value="derby.jar"/>
2.20 +<property name="dataprovider.libdir" value="../../../../nbbuild/netbeans/visualweb1/modules/ext"/>
2.21 +<property name="dataprovider.libfile" value="dataprovider.jar"/>
2.22 +<property name="rowset.libdir" value="../../../../nbbuild/netbeans/visualweb1/modules/ext"/>
2.23 +<property name="rowset.libfile" value="sqlx.jar"/>
2.24 +
2.25 +<path id="derby_jar_path">
2.26 + <pathelement location="${derby.libdir}/${derby.libfile}"/>
2.27 +</path>
2.28 +
2.29 +<path id="dataprovider_jar_path">
2.30 + <pathelement location="${dataprovider.libdir}/${dataprovider.libfile}"/>
2.31 +</path>
2.32 +
2.33 +<path id="rowset_jar_path">
2.34 + <pathelement location="${rowset.libdir}/${rowset.libfile}"/>
2.35 +</path>
2.36 +
2.37 +<path id="required_jars">
2.38 + <path refid="derby_jar_path"/>
2.39 + <path refid="dataprovider_jar_path"/>
2.40 + <path refid="rowset_jar_path"/>
2.41 +</path>
2.42 +
2.43 +
2.44 +
2.45 + <!-- ========= -->
2.46 + <!-- Compilers -->
2.47 + <!-- ========= -->
2.48 + <target name="unit-compiler" depends="init">
2.49 + <buildTests srcDir="unit/src" compileExcludes="**/data/**">
2.50 + <classpath>
2.51 + <path refid="required_jars"/>
2.52 + </classpath>
2.53 + </buildTests>
2.54 + </target>
2.55 +
2.56 +
2.57 + <!-- ========= -->
2.58 + <!-- Executors -->
2.59 + <!-- ========= -->
2.60 +
2.61 + <!-- This target executes tests inside IDE. It is defined in default-build-qa-functional.xml.
2.62 + If you need to customize it, you can uncomment the following and override it.-->
2.63 + <target name="run-jvm-test" depends="init,unit-compiler">
2.64 + <executeTests pluginName="jvm">
2.65 + <classpath>
2.66 + <path refid="required_jars"/>
2.67 + </classpath>
2.68 + </executeTests>
2.69 + </target>
2.70 </project>
2.71
3.1 --- a/visualweb.dataprovider/test/cfg-unit.xml Thu Nov 15 01:18:16 2007 +0000
3.2 +++ b/visualweb.dataprovider/test/cfg-unit.xml Thu Nov 15 07:15:46 2007 +0000
3.3 @@ -43,15 +43,15 @@
3.4
3.5 <mconfig name="struts">
3.6
3.7 - <testbag testattribs="stable" executor="unit-executor" name="visualweb/dataprovider/runtime">
3.8 + <testbag testattribs="stable" executor="jvm-executor" name="visualweb/dataprovider/runtime">
3.9 <testset dir="unit/src">
3.10 <patternset>
3.11 <include name="**/*Test.class"/>
3.12 -<exclude name="**/CachedRowSetDataProviderTest.class"/>
3.13 + <exclude name="**/CachedRowSetDataProviderTest.class"/>
3.14 </patternset>
3.15 </testset>
3.16 </testbag>
3.17 - <compiler name="default-compiler" antfile="build-unit.xml" target="default-compiler" default="true"/>
3.18 + <compiler name="default-compiler" antfile="build-unit.xml" target="unit-compiler" default="true"/>
3.19 <executor name="unit-executor" antfile="build-unit.xml" target="run-unit-test"/>
3.20 -
3.21 + <executor name="jvm-executor" antfile="build-unit.xml" target="run-jvm-test"/>
3.22 </mconfig>