--- a/javacommons/javastorage/tsrc/java_api/build/build.xml Mon Oct 04 11:29:25 2010 +0300
+++ b/javacommons/javastorage/tsrc/java_api/build/build.xml Fri Oct 15 12:29:39 2010 +0300
@@ -1,6 +1,6 @@
<!--
#
-# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
# under the terms of "Eclipse Public License v1.0"
@@ -12,141 +12,32 @@
#
# Contributors:
#
-# Description:
+# Description:
#
-->
-<project name="javastoragetest" default="deploy.ut" basedir=".">
+<project name="javastorageunittests" basedir="." default="deploy">
<import file="../../../../../build/utilities.xml"/>
-
- <property environment="env"/>
- <property name="java.src.root" location="${env.JAVA_SRC_ROOT}"/>
- <property name="java.bin.root" location="${env.JAVA_BIN_ROOT}"/>
+ <property file="../../../../../build/unittest.properties"/>
- <property name="src.dir" location="../javasrc"/>
- <property name="build.dir" location="../build"/>
- <property name="classes.dir" location="${build.dir}/javabuild"/>
- <property name="dist" location="${java.bin.root}/jsr/classes"/>
- <property name="installer.jar.filename" value="javainstaller.jar"/>
- <property name="javastoragetest.jar.filename" value="javastoragetest.jar"/>
- <property name="utils.jar.filename" value="javacommonutils.jar"/>
- <property name="logger.jar.filename" value="logger.jar"/>
- <property name="junit.jar.dir" location="${java.src.root}/tools/junit"/>
- <property name="junit.jar.filename" value="j2meunit1.1.1.jar"/>
- <property name="junit.omj.jar.filename" value="j2meunitomj.jar"/>
-
- <property name="bootclasspath.cdc" location="${java.src.root}/javaruntime/jvm/ibm/j9_23/ibmdelivery/resource/lib/jclCdc11/classes.zip"/>
-
- <property name="javac.source" value="1.3"/>
- <property name="javac.target" value="1.3"/>
-
- <target name="clean">
- <delete dir="${classes.dir}"/>
- <delete file="${dist}/${javastoragetest.jar.filename}"/>
- <delete file="${dist}/${junit.jar.filename}"/>
- <delete file="${dist}/${junit.omj.jar.filename}"/>
- </target>
+ <property name="java.src.paths" value="../javasrc"/>
+ <property name="java.bin.root" value="${env.JAVA_BIN_ROOT}"/>
- <target name="compile.ut" depends="init.properties">
- <property name="jars.dir" location="${jarfiles.collect.root}"/>
- <property name="jars.dir.cdc" location="${jarfiles.collect.cdc.root}"/>
- <mkdir dir="${classes.dir}"/>
- <javac source="${javac.source}" target="${javac.target}"
- destdir="${classes.dir}"
- bootclasspath="${bootclasspath.cdc}">
- <classpath>
- <pathelement
- location="${jars.dir.cdc}/${installer.jar.filename}"/>
- <pathelement location="${impl.cldc.jar}"/>
- <pathelement location="${impl.cdc.jar}"/>
- <pathelement location="${public.api.jar}"/>
- <pathelement location="${platform.api.jar}"/>
- <pathelement location="${junit.jar.dir}/${junit.jar.filename}"/>
- <pathelement location="${junit.jar.dir}/${junit.omj.jar.filename}"/>
- </classpath>
- <src path="${src.dir}"/>
- </javac>
+ <target name="run" depends="deploy">
+ <echo>Running TestStorageAttribute</echo>
+ <exec executable="${java.bin.root}/bin/javaunittester">
+ <arg line="-mainclass=com.nokia.mj.impl.storage.TestStorageAttribute"/>
+ </exec>
+
+ <echo>Running TestStorageAttribute</echo>
+ <exec executable="${java.bin.root}/bin/javaunittester">
+ <arg line="-mainclass=com.nokia.mj.test.storage.TestStorageEntry"/>
+ </exec>
</target>
-
- <target name="deploy.ut" depends="compile.ut">
- <mkdir dir="${dist}"/>
- <jar destfile="${vm.extension.directory}/${javastoragetest.jar.filename}" basedir="${classes.dir}"/>
- <copy file="${junit.jar.dir}/${junit.jar.filename}"
- tofile="${vm.extension.directory}/${junit.jar.filename}"/>
- <copy file="${junit.jar.dir}/${junit.omj.jar.filename}"
- tofile="${vm.extension.directory}/${junit.omj.jar.filename}"/>
- </target>
+
+ <!-- NOTE: MISSING CASES from test run -->
<target name="main" depends="clean,run"/>
- <!--<target name="run" depends="deploy.ut">
- <echo>Running TestStorageAttribute</echo>
- <exec executable="${env.JAVA_BIN_ROOT}/bin/javainstaller">
- <arg line="test -mainclass=com.nokia.mj.impl.storage.TestStorageAttribute"/>
- </exec>
- </target>-->
-
- <target name="run" depends="deploy.ut">
- <echo>Running TestStorageAttribute</echo>
- <exec executable="${env.JAVA_BIN_ROOT}/bin/javainstaller">
- <arg line="test -mainclass=com.nokia.mj.impl.storage.TestStorageAttribute"/>
- </exec>
- <echo>Running TestStorageEntry</echo>
- <exec executable="${env.JAVA_BIN_ROOT}/bin/javainstaller">
- <arg line="test -mainclass=com.nokia.mj.test.storage.TestStorageEntry"/>
- </exec>
- <echo>Running TestConnection</echo>
- <exec executable="${env.JAVA_BIN_ROOT}/bin/javainstaller">
- <arg line="test -mainclass=com.nokia.mj.test.storage.TestConnection"/>
- </exec>
- <echo>Running TestTransaction</echo>
- <exec executable="${env.JAVA_BIN_ROOT}/bin/javainstaller">
- <arg line="test -mainclass=com.nokia.mj.test.storage.TestTransaction"/>
- </exec>
- <echo>Running TestSearch</echo>
- <exec executable="${env.JAVA_BIN_ROOT}/bin/javainstaller">
- <arg line="test -mainclass=com.nokia.mj.test.storage.TestSearch"/>
- </exec>
- <echo>Running TestWrite</echo>
- <exec executable="${env.JAVA_BIN_ROOT}/bin/javainstaller">
- <arg line="test -mainclass=com.nokia.mj.test.storage.TestWrite"/>
- </exec>
- <echo>Running TestUpdate</echo>
- <exec executable="${env.JAVA_BIN_ROOT}/bin/javainstaller">
- <arg line="test -mainclass=com.nokia.mj.test.storage.TestUpdate"/>
- </exec>
- <echo>Running TestRemove</echo>
- <exec executable="${env.JAVA_BIN_ROOT}/bin/javainstaller">
- <arg line="test -mainclass=com.nokia.mj.test.storage.TestRemove"/>
- </exec>
- <echo>Running TestRead</echo>
- <exec executable="${env.JAVA_BIN_ROOT}/bin/javainstaller">
- <arg line="test -mainclass=com.nokia.mj.test.storage.TestRead"/>
- </exec>
- <echo>Running TestCreateTable</echo>
- <exec executable="${env.JAVA_BIN_ROOT}/bin/javainstaller">
- <arg line="test -mainclass=com.nokia.mj.test.storage.TestCreateTable"/>
- </exec>
- <echo>Running TestAppendTable</echo>
- <exec executable="${env.JAVA_BIN_ROOT}/bin/javainstaller">
- <arg line="test -mainclass=com.nokia.mj.test.storage.TestAppendTable"/>
- </exec>
- <echo>Running TestOTATable</echo>
- <exec executable="${env.JAVA_BIN_ROOT}/bin/javainstaller">
- <arg line="test -mainclass=com.nokia.mj.test.storage.TestOTATable"/>
- </exec>
- <echo>Running TestPreinstallTable</echo>
- <exec executable="${env.JAVA_BIN_ROOT}/bin/javainstaller">
- <arg line="test -mainclass=com.nokia.mj.test.storage.TestPreinstallTable"/>
- </exec>
- <echo>Running TestRobustness</echo>
- <exec executable="${env.JAVA_BIN_ROOT}/bin/javainstaller">
- <arg line="test -mainclass=com.nokia.mj.test.storage.TestRobustness"/>
- </exec>
- <echo>Running TestStorageException</echo>
- <exec executable="${env.JAVA_BIN_ROOT}/bin/javainstaller">
- <arg line="test -mainclass=com.nokia.mj.test.storage.TestStorageException"/>
- </exec>
- </target>
</project>