db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r935800 - in /db/torque/torque4/trunk/torque-test: ./ src/test/profile/derby/ src/test/profile/derbyEmbedded/ src/test/profile/derbyNetwork/
Date Tue, 20 Apr 2010 04:38:28 GMT
Author: tfischer
Date: Tue Apr 20 04:38:27 2010
New Revision: 935800

URL: http://svn.apache.org/viewvc?rev=935800&view=rev
Log:
streamlined derby test profiles
- use latest derby version
- use the network driver in the normal derby profile because the embedded driver does not
run in maven
- create an extra profile for the embedded driver
- updated the notes

Added:
    db/torque/torque4/trunk/torque-test/src/test/profile/derbyEmbedded/
      - copied from r910609, db/torque/torque4/trunk/torque-test/src/test/profile/derbyNetwork/
Removed:
    db/torque/torque4/trunk/torque-test/src/test/profile/derbyEmbedded/derby.properties
    db/torque/torque4/trunk/torque-test/src/test/profile/derbyNetwork/
Modified:
    db/torque/torque4/trunk/torque-test/profiles.xml
    db/torque/torque4/trunk/torque-test/src/test/profile/derby/Torque.properties
    db/torque/torque4/trunk/torque-test/src/test/profile/derby/notes.txt
    db/torque/torque4/trunk/torque-test/src/test/profile/derbyEmbedded/Torque.properties
    db/torque/torque4/trunk/torque-test/src/test/profile/derbyEmbedded/notes.txt

Modified: db/torque/torque4/trunk/torque-test/profiles.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/profiles.xml?rev=935800&r1=935799&r2=935800&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/profiles.xml (original)
+++ db/torque/torque4/trunk/torque-test/profiles.xml Tue Apr 20 04:38:27 2010
@@ -57,24 +57,43 @@
       </properties>
     </profile>
 
-    <profile>
-      <id>derby</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <properties>
-        <torque.test.profileDirectory>derby</torque.test.profileDirectory>
-        <torque.test.idmethod>native</torque.test.idmethod>
-        <torque.test.driver.artifactId>derby</torque.test.driver.artifactId>
-        <torque.test.driver.groupId>org.apache.derby</torque.test.driver.groupId>
-        <torque.test.driver.version>10.1.2.1</torque.test.driver.version>
-        <torque.driver>org.apache.derby.jdbc.EmbeddedDriver</torque.driver>
-        <torque.targetDatabase>derby</torque.targetDatabase>
-        <torque.database.url>jdbc:derby:bookstore</torque.database.url>
-        <torque.database.user>test</torque.database.user>
-        <torque.database.password>test</torque.database.password>
-      </properties>
-    </profile>
+    <profile>
+      <id>derby</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <torque.test.profileDirectory>derby</torque.test.profileDirectory>
+        <torque.test.idmethod>native</torque.test.idmethod>
+        <torque.test.driver.artifactId>derbyclient</torque.test.driver.artifactId>
+        <torque.test.driver.groupId>org.apache.derby</torque.test.driver.groupId>
+        <torque.test.driver.version>10.5.3.0_1</torque.test.driver.version>
+        <torque.driver>org.apache.derby.jdbc.ClientDriver</torque.driver>
+        <torque.targetDatabase>derby</torque.targetDatabase>
+        <torque.database.url>jdbc:derby://localhost:1527/bookstore;create=true</torque.database.url>
+        <torque.database.user>SA</torque.database.user>
+        <torque.database.password>SA</torque.database.password>
+      </properties>
+    </profile>
+
+    <profile>
+      <id>derbyEmbedded</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <torque.test.profileDirectory>derbyEmbedded</torque.test.profileDirectory>
+        <torque.test.idmethod>native</torque.test.idmethod>
+        <torque.test.driver.artifactId>derby</torque.test.driver.artifactId>
+        <torque.test.driver.groupId>org.apache.derby</torque.test.driver.groupId>
+        <torque.test.driver.version>10.5.3.0_1</torque.test.driver.version>
+        <torque.driver>org.apache.derby.jdbc.EmbeddedDriver</torque.driver>
+        <torque.targetDatabase>derby</torque.targetDatabase>
+        <torque.database.url>jdbc:derby:target/bookstore;create=true</torque.database.url>
+        <torque.database.user></torque.database.user>
+        <torque.database.password></torque.database.password>
+      </properties>
+    </profile>
 
     <profile>
       <id>firebird</id>

Modified: db/torque/torque4/trunk/torque-test/src/test/profile/derby/Torque.properties
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/profile/derby/Torque.properties?rev=935800&r1=935799&r2=935800&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/profile/derby/Torque.properties (original)
+++ db/torque/torque4/trunk/torque-test/src/test/profile/derby/Torque.properties Tue Apr 20
04:38:27 2010
@@ -24,13 +24,13 @@ torque.database.bookstore.adapter = derb
 #Using commons-dbcp
 torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPoolDataSourceFactory
 
-#torque.dsfactory.bookstore.connection.driver = org.apache.derby.jdbc.EmbeddedDriver
-#torque.dsfactory.bookstore.connection.url = jdbc:derby:d:/temp/derby2/bookstore
-
 torque.dsfactory.bookstore.connection.driver = org.apache.derby.jdbc.ClientDriver
 torque.dsfactory.bookstore.connection.url = jdbc:derby://localhost:1527/bookstore
 
-torque.dsfactory.bookstore.connection.user = test
-torque.dsfactory.bookstore.connection.password = test
+torque.dsfactory.bookstore.connection.user = SA
+torque.dsfactory.bookstore.connection.password = SA
+
+torque.dsfactory.bookstore.pool.validationQuery = values(1)
 
-torque.dsfactory.bookstore.pool.validationQuery = values(1)
\ No newline at end of file
+# use Caching. This property is only used if managers are used by generators.
+torque.manager.useCache = true

Modified: db/torque/torque4/trunk/torque-test/src/test/profile/derby/notes.txt
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/profile/derby/notes.txt?rev=935800&r1=935799&r2=935800&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/profile/derby/notes.txt (original)
+++ db/torque/torque4/trunk/torque-test/src/test/profile/derby/notes.txt Tue Apr 20 04:38:27
2010
@@ -1,15 +1,8 @@
-Notes on running the tests with Derby's Embedded Server
+Notes on running the tests with Derby's Network Server.
 
-1) The default goal (torque-test:run) will fail with the embedded driver because
-     it is hard to shutdown the embedded server between operations.
-     
-     In order to test the embedded driver, the four sub-goals need to be run
-     separately.  E.g:
-     
-     maven -Dtorque.test.profile=derby torque-test:pre-test
-     maven -Dtorque.test.profile=derby torque-test:test
-     maven -Dtorque.test.profile=derby torque-test:post-test1
-     maven -Dtorque.test.profile=derby torque-test:post-test2
-
- 2) The Bookstore database directory should be manually deleted between
-     test case runs because some tables can not be dropped.
\ No newline at end of file
+1) Obviously, you have to have the Derby Network Server installed and 
+   running...d'oh.  Make sure the ports match in your JDBC URL and the
+   derby server. (Some Derby documentation uses different ports).
+      
+2) The Bookstore database directory should be manually deleted between
+   test runs because some tables can not be dropped.

Modified: db/torque/torque4/trunk/torque-test/src/test/profile/derbyEmbedded/Torque.properties
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/profile/derbyEmbedded/Torque.properties?rev=935800&r1=910609&r2=935800&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/profile/derbyEmbedded/Torque.properties (original)
+++ db/torque/torque4/trunk/torque-test/src/test/profile/derbyEmbedded/Torque.properties Tue
Apr 20 04:38:27 2010
@@ -24,13 +24,13 @@ torque.database.bookstore.adapter = derb
 #Using commons-dbcp
 torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPoolDataSourceFactory
 
-#torque.dsfactory.bookstore.connection.driver = org.apache.derby.jdbc.EmbeddedDriver
-#torque.dsfactory.bookstore.connection.url = jdbc:derby:d:/temp/derby2/bookstore
-
 torque.dsfactory.bookstore.connection.driver = org.apache.derby.jdbc.ClientDriver
-torque.dsfactory.bookstore.connection.url = jdbc:derby://localhost:1527/bookstore
+torque.dsfactory.bookstore.connection.url = jdbc:derby:target/bookstore;create=true
+
+torque.dsfactory.bookstore.connection.user = 
+torque.dsfactory.bookstore.connection.password = 
 
-torque.dsfactory.bookstore.connection.user = test
-torque.dsfactory.bookstore.connection.password = test
+torque.dsfactory.bookstore.pool.validationQuery = values(1)
 
-torque.dsfactory.bookstore.pool.validationQuery = values(1)
\ No newline at end of file
+# use Caching. This property is only used if managers are used by generators.
+torque.manager.useCache = true

Modified: db/torque/torque4/trunk/torque-test/src/test/profile/derbyEmbedded/notes.txt
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/profile/derbyEmbedded/notes.txt?rev=935800&r1=910609&r2=935800&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/profile/derbyEmbedded/notes.txt (original)
+++ db/torque/torque4/trunk/torque-test/src/test/profile/derbyEmbedded/notes.txt Tue Apr 20
04:38:27 2010
@@ -1,12 +1,10 @@
-Notes on running the tests with Derby's Network Server.
+Notes on running the tests with Derby's Embedded Server
 
-1) Obviously, you have to have the Derby Network Server installed and 
-   running...d'oh.  Make sure the ports match in your JDBC URL and the
-   derby server. (Some Derby documentation uses different ports).
-   
-   The derby.properties file in this directory has the   basic setup info for users
-    and rights needed to run this test.  This should be located in your 
-    derby.system.home directory. 
-   
- 2) The Bookstore database directory should be manually deleted between
-     test runs because some tables can not be dropped.
\ No newline at end of file
+1) The tests will not run in maven because derby complains about the database
+   being opened by another process. But the tests will run in an IDE. However,
+   before running the tests in an IDE, mvn clean process-classes should be run
+   to create the tables in the file database.
+
+2) The target/ookstore database directory should be manually deleted 
+   after schema changes because some tables can not be dropped.
+   This can be done by running the clean and process-classes goals in maven.



---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org


Mime
View raw message