# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1279316108 -7200
# Node ID 9d430d9bc4b163bb291cd7db5faa0477197ca9c4
# Parent  afdd66815ee3bbbb094bcae598ae2d621dde3293
Creating the database in Ant. Placing it on a test classpath. Test test now checks real DB content.

diff -r afdd66815ee3 -r 9d430d9bc4b1 samples/livedb/build.xml
--- a/samples/livedb/build.xml	Thu Jul 15 00:40:37 2010 +0200
+++ b/samples/livedb/build.xml	Fri Jul 16 23:35:08 2010 +0200
@@ -71,4 +71,39 @@
     nbproject/build-impl.xml file. 
 
     -->
+    
+    <target name="-pre-compile-test">
+        <antcall target="create-db"/>
+    </target>
+    
+    <!-- BEGIN: livedb.derby.create -->
+    <target name="-check-db">
+        <property name="db" location="build/classes/db"/>
+        <available property="db.exists" file="${db}"/>
+    </target>
+    <target name="create-db" unless="db.exists" depends="init,-check-db">
+        <mkdir dir="${db}"/>
+        <delete dir="${db}"/>
+        <echo message="Creating DB in ${db}"/>
+        <sql classpath="${file.reference.derby.jar}" userid="j1" password="j1" 
+            url="jdbc:derby:${db};create=true" 
+            driver="org.apache.derby.jdbc.EmbeddedDriver"
+        >
+        create table APP.AGE (
+            NAME VARCHAR(30),
+            AGE NUMERIC(3)
+        );
+        insert into APP.AGE values ('apidesign', 3);
+        </sql>
+        <!-- don't forget to shutdown the DB -->
+        <sql classpath="${file.reference.derby.jar}" userid="j1" password="j1" 
+            url="jdbc:derby:${db};shutdown=true" 
+            driver="org.apache.derby.jdbc.EmbeddedDriver" 
+            onerror="continue"
+            errorproperty="ignore.error" 
+            failonconnectionerror="false"
+        >none</sql>
+        <echo message="DB created OK."/>
+    </target>
+    <!-- END: livedb.derby.create -->
 </project>
diff -r afdd66815ee3 -r 9d430d9bc4b1 samples/livedb/nbproject/project.properties
--- a/samples/livedb/nbproject/project.properties	Thu Jul 15 00:40:37 2010 +0200
+++ b/samples/livedb/nbproject/project.properties	Fri Jul 16 23:35:08 2010 +0200
@@ -26,7 +26,7 @@
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.derby.jar=../libs/dist/derbyclient.jar
+file.reference.derby.jar=../libs/dist/derby.jar
 file.reference.junit-4.4.jar=../libs/dist/junit-4.4.jar
 file.reference.org-openide-util-lookup.jar=../libs/dist/org-openide-util-lookup.jar
 includes=**
diff -r afdd66815ee3 -r 9d430d9bc4b1 samples/livedb/test/org/apidesign/livedb/example/LiveDBTest.java
--- a/samples/livedb/test/org/apidesign/livedb/example/LiveDBTest.java	Thu Jul 15 00:40:37 2010 +0200
+++ b/samples/livedb/test/org/apidesign/livedb/example/LiveDBTest.java	Fri Jul 16 23:35:08 2010 +0200
@@ -21,9 +21,10 @@
 
     public void testSomeMethod() throws SQLException {
         List<Age> ages = Age.query();
-        for (Age age : ages) {
-            System.out.printf("%s is %s years old\n", age.NAME, age.AGE);
-        }
+        assertEquals("One record", 1, ages.size());
+        Age age = ages.get(0);
+        assertEquals("name is apidesign", "apidesign", age.NAME);
+        assertEquals("it is three years old", 3, age.AGE.intValue());
     }
 
 }
diff -r afdd66815ee3 -r 9d430d9bc4b1 samples/livedb/test/org/apidesign/livedb/example/package-info.java
--- a/samples/livedb/test/org/apidesign/livedb/example/package-info.java	Thu Jul 15 00:40:37 2010 +0200
+++ b/samples/livedb/test/org/apidesign/livedb/example/package-info.java	Fri Jul 16 23:35:08 2010 +0200
@@ -3,7 +3,7 @@
 @LiveDB(
     classname="Age", password="j1", user="j1",
     query="select * from APP.AGE", 
-    url="jdbc:derby://localhost:1527/livedb"
+    url="jdbc:derby:classpath:db"
 )
 package org.apidesign.livedb.example;