[1.4] reorganized test directory structure (refs #274)

test/README

@@ -11,7 +11,7 @@
 
 You must configure both the generator and the runtime connection settings.
 {{{
-// in test/projects/bookstore/build.properties
+// in test/fixtures/bookstore/build.properties
 propel.database = mysql
 propel.database.url = mysql:dbname=test
 propel.mysqlTableType = InnoDB
@@ -22,7 +22,7 @@ propel.database.password = p@ssw0rd
 }}}
 
 {{{
-// in test/projects/bookstore/runtime-conf.xml
+// in test/fixtures/bookstore/runtime-conf.xml
 <datasource id="bookstore">
   <!-- the Propel adapter to use for this connection -->
   <adapter>mysql</adapter>
@@ -52,9 +52,9 @@ propel.database.password = p@ssw0rd
 
 {{{
 > cd /path/to/propel/test
-> ../generator/bin/propel-gen projects/bookstore
+> ../generator/bin/propel-gen fixtures/bookstore
 > mysqladmin create test
-> ../generator/bin/propel-gen projects/bookstore insert-sql
+> ../generator/bin/propel-gen fixtures/bookstore insert-sql
 }}}
 
 == Run the Unit Tests ==

test/projects/bookstore/build.properties → test/fixtures/bookstore/build.properties

@@ -17,8 +17,8 @@ propel.mysqlTableType = InnoDB
 propel.disableIdentifierQuoting=true
 
 # For MySQL or Oracle, you also need to specify username & password 
-#propel.database.user = [db username]
-#propel.database.password = [db password]
+propel.database.user = root
+propel.database.password = root
 
 # Note that if you do not wish to specify the database (e.g. if you
 # are using multiple databses) you can use the @DB@ token which

test/projects/bookstore/runtime-conf.xml → test/fixtures/bookstore/runtime-conf.xml

@@ -46,11 +46,8 @@
 				<connection>
 					<classname>DebugPDO</classname>
 					<dsn>mysql:dbname=test</dsn>
-					<!--
-					For MySQL and Oracle you must specify username + password separate from DSN:
-					<user>bookstore</user>
-					<password></password>
-					-->
+					<user>root</user>
+					<password>root</password>
 					<options>
 						<option id="ATTR_PERSISTENT">false</option>
 					</options>
@@ -81,11 +78,8 @@
 				<connection>
 					<classname>DebugPDO</classname>
 					<dsn>mysql:dbname=test</dsn>
-					<!--
-					For MySQL and Oracle you must specify username + password separate from DSN:
-					<user>bookstore</user>
-					<password></password>
-					-->
+					<user>root</user>
+					<password>root</password>
 					<options>
 						<option id="ATTR_PERSISTENT">false</option>
 					</options>

test/test.xml

@@ -32,11 +32,11 @@
 	<property name="test.class" value="${test}" />
 
 	<resolvepath propertyName="tests.dir.resolved" file="${tests.phpunit.dir}" />
-	<resolvepath propertyName="tests.classes.dir.resolved" file="${tests.phpunit.dir}/tests" />
+	<resolvepath propertyName="tests.classes.dir.resolved" file="${tests.phpunit.dir}/testsuite" />
 	<resolvepath propertyName="propel-generator.classes.dir.resolved" file="../generator/classes" />
 	<resolvepath propertyName="propel-runtime.classes.dir.resolved" file="../runtime/classes" />
-	<resolvepath propertyName="bookstore.classes.dir.resolved" file="projects/bookstore/build/classes" />
-	<resolvepath propertyName="bookstore.conf.dir.resolved" file="projects/bookstore/build/conf" />
+	<resolvepath propertyName="bookstore.classes.dir.resolved" file="fixtures/bookstore/build/classes" />
+	<resolvepath propertyName="bookstore.conf.dir.resolved" file="fixtures/bookstore/build/conf" />
 
 	<path id="incthis">
 		<pathelement dir="${tests.dir.resolved}" />