empire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From franci...@apache.org
Subject svn commit: r1367472 - in /empire-db/trunk/empire-db-examples/empire-db-example-codegen: pom.xml src/test/java/org/apache/empire/db/examples/codegen/ValidatePluginRunTest.java
Date Tue, 31 Jul 2012 09:50:34 GMT
Author: francisdb
Date: Tue Jul 31 09:50:33 2012
New Revision: 1367472

URL: http://svn.apache.org/viewvc?rev=1367472&view=rev
Log:
fix example by adding missing driver dependency and fixing the test for the recent exception
handling updates

Modified:
    empire-db/trunk/empire-db-examples/empire-db-example-codegen/pom.xml
    empire-db/trunk/empire-db-examples/empire-db-example-codegen/src/test/java/org/apache/empire/db/examples/codegen/ValidatePluginRunTest.java

Modified: empire-db/trunk/empire-db-examples/empire-db-example-codegen/pom.xml
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-examples/empire-db-example-codegen/pom.xml?rev=1367472&r1=1367471&r2=1367472&view=diff
==============================================================================
--- empire-db/trunk/empire-db-examples/empire-db-example-codegen/pom.xml (original)
+++ empire-db/trunk/empire-db-examples/empire-db-example-codegen/pom.xml Tue Jul 31 09:50:33
2012
@@ -25,9 +25,20 @@
 	<build>
 		<plugins>
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.5.1</version>
+				<configuration>
+					<source>1.5</source>
+					<target>1.5</target>
+					<optimise>true</optimise>
+					<debug>true</debug>
+				</configuration>
+			</plugin>
+			<plugin>
 				<groupId>org.apache.empire-db</groupId>
 				<artifactId>empire-db-maven-plugin</artifactId>
-				<version>2.0.6-incubating</version>
+				<version>2.3.0</version>
 				<configuration>
 					<goalPrefix>empiredb</goalPrefix>
 					<jdbcClass>org.hsqldb.jdbcDriver</jdbcClass>
@@ -42,11 +53,18 @@
 					to leave out this section and call mvn empiredb:codegen
 					 -->
 					<execution>
-		            	<goals>
-			              	<goal>codegen</goal>
-			            </goals>
+						<goals>
+							<goal>codegen</goal>
+						</goals>
 					</execution>
 				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>hsqldb</groupId>
+						<artifactId>hsqldb</artifactId>
+						<version>1.8.0.10</version>
+					</dependency> 
+				</dependencies>
 			</plugin>
 		</plugins>
 	</build>
@@ -55,7 +73,7 @@
 		<dependency>
 			<groupId>org.apache.empire-db</groupId>
 			<artifactId>empire-db</artifactId>
-			<version>2.0.6-incubating</version>
+			<version>2.3.0</version>
 		</dependency>
 		<dependency>
 		    <groupId>hsqldb</groupId>

Modified: empire-db/trunk/empire-db-examples/empire-db-example-codegen/src/test/java/org/apache/empire/db/examples/codegen/ValidatePluginRunTest.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-examples/empire-db-example-codegen/src/test/java/org/apache/empire/db/examples/codegen/ValidatePluginRunTest.java?rev=1367472&r1=1367471&r2=1367472&view=diff
==============================================================================
--- empire-db/trunk/empire-db-examples/empire-db-example-codegen/src/test/java/org/apache/empire/db/examples/codegen/ValidatePluginRunTest.java
(original)
+++ empire-db/trunk/empire-db-examples/empire-db-example-codegen/src/test/java/org/apache/empire/db/examples/codegen/ValidatePluginRunTest.java
Tue Jul 31 09:50:33 2012
@@ -32,7 +32,7 @@ import org.apache.empire.db.DBCommand;
 import org.apache.empire.db.DBDatabaseDriver;
 import org.apache.empire.db.DBReader;
 import org.apache.empire.db.example.MyDB;
-import org.apache.empire.db.example.tables.EMPLOYEES;
+import org.apache.empire.db.example.tables.Employees;
 import org.apache.empire.db.hsql.DBDatabaseDriverHSql;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -79,7 +79,7 @@ public class ValidatePluginRunTest {
 	public void useGeneratedCode() throws Exception {
 
 		MyDB db = MyDB.get();
-		EMPLOYEES EMP = db.EMPLOYEES;
+		Employees EMP = db.EMPLOYEES;
 
 		DBDatabaseDriver driver = new DBDatabaseDriverHSql();
 		db.open(driver, conn);
@@ -90,8 +90,7 @@ public class ValidatePluginRunTest {
 		DBReader reader = new DBReader();
 		try {
 			System.err.println(cmd.getSelect());
-			boolean succes = reader.open(cmd, conn);
-			assertTrue(db.getErrorMessage(), succes);
+			reader.open(cmd, conn);
 			while (reader.moveNext()) {
 				rowCount++;
 				System.out.println(reader.getString(EMP.EMPLOYEE_ID) + "\t" + reader.getString(EMP.FIRSTNAME));



Mime
View raw message