Merge remote-tracking branch 'trunk'

SpagoBILabs · Jan 21, 2016 · ec6bd67 · ec6bd67
2 parents 1c8426b + 047a99b
commit ec6bd67
Show file tree

Hide file tree

Showing 108 changed files with 168 additions and 935 deletions.
diff --git a/ChefCookbooks/spagobi/files/default/mysql-connector-java-5.1.33-bin.jar b/ChefCookbooks/spagobi/files/default/mysql-connector-java-5.1.33-bin.jar
diff --git a/QbeCore/pom.xml b/QbeCore/pom.xml
@@ -77,8 +77,22 @@
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<version>4.2.0.Final</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<version>5.1.38</version>
+			<scope>test</scope>
+		</dependency>
+
 
 	</dependencies>
 
-	
+
 </project>
diff --git a/QbeCore/src/test/java/it/eng/qbe/AbstractQbeTestCase.java b/QbeCore/src/test/java/it/eng/qbe/AbstractQbeTestCase.java
@@ -5,14 +5,13 @@
  * If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 package it.eng.qbe;
 
+import java.util.List;
+import java.util.Set;
+
 import it.eng.qbe.runtime.datasource.IDataSource;
 import it.eng.qbe.runtime.model.structure.IModelEntity;
 import it.eng.qbe.runtime.model.structure.IModelStructure;
 import it.eng.spagobi.tools.datasource.bo.DataSource;
-
-import java.util.List;
-import java.util.Set;
-
 import junit.framework.TestCase;
 
 /**
@@ -27,9 +26,9 @@ public abstract class AbstractQbeTestCase extends TestCase {
 
 	public static String CONNECTION_DIALECT = "org.hibernate.dialect.MySQLDialect";
 	public static String CONNECTION_DRIVER = "com.mysql.jdbc.Driver";
-	public static String CONNECTION_URL = "jdbc:mysql://localhost:3306/foodmart_key";
-	public static String CONNECTION_USER = "root";
-	public static String CONNECTION_PWD = "root";
+	public static String CONNECTION_URL = "jdbc:mysql://localhost/foodmart_key_test";
+	public static String CONNECTION_USER = "spagobi_test";
+	public static String CONNECTION_PWD = "";
 
 	@Override
 	protected void setUp() throws Exception {

diff --git a/...re/src/test/java/it/eng/qbe/datasource/hibernate/StandardHibernateDataSourceTestCase.java b/...re/src/test/java/it/eng/qbe/datasource/hibernate/StandardHibernateDataSourceTestCase.java
@@ -5,15 +5,15 @@
  * If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 package it.eng.qbe.datasource.hibernate;
 
+import java.io.File;
+
 import it.eng.qbe.datasource.AbstractDataSourceTestCase;
 import it.eng.qbe.hibernate.datasource.hibernate.HibernateDataSource;
 import it.eng.qbe.hibernate.datasource.hibernate.HibernateDriver;
 import it.eng.qbe.runtime.datasource.DriverManager;
 import it.eng.qbe.runtime.datasource.configuration.FileDataSourceConfiguration;
 import it.eng.qbe.runtime.datasource.configuration.IDataSourceConfiguration;
 
-import java.io.File;
-
 /**
  * @author Andrea Gioia (andrea.gioia@eng.it)
  *
@@ -30,7 +30,7 @@ protected void setUpDataSource() {
 
 		File file = new File(QBE_FILE);
 		configuration = new FileDataSourceConfiguration(modelName, file);
-		configuration.loadDataSourceProperties().put("connection", connection);
+		configuration.loadDataSourceProperties().put("datasource", connection);
 		dataSource = DriverManager.getDataSource(HibernateDriver.DRIVER_ID, configuration);
 
 		testEntityUniqueName = "it.eng.spagobi.Customer::Customer";

diff --git a/.../src/test/java/it/eng/qbe/datasource/jpa/impl/StandardJPAELinkImplDataSourceTestCase.java b/.../src/test/java/it/eng/qbe/datasource/jpa/impl/StandardJPAELinkImplDataSourceTestCase.java
@@ -5,15 +5,15 @@
  * If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 package it.eng.qbe.datasource.jpa.impl;
 
+import java.io.File;
+
 import it.eng.qbe.datasource.AbstractDataSourceTestCase;
 import it.eng.qbe.jpa.datasource.jpa.JPADataSource;
 import it.eng.qbe.jpa.datasource.jpa.JPADriver;
 import it.eng.qbe.runtime.datasource.DriverManager;
 import it.eng.qbe.runtime.datasource.configuration.FileDataSourceConfiguration;
 import it.eng.qbe.runtime.datasource.configuration.IDataSourceConfiguration;
 
-import java.io.File;
-
 /**
  * @author Andrea Gioia (andrea.gioia@eng.it)
  *
@@ -30,7 +30,7 @@ protected void setUpDataSource() {
 
 		File file = new File(QBE_FILE);
 		configuration = new FileDataSourceConfiguration(modelName, file);
-		configuration.loadDataSourceProperties().put("connection", connection);
+		configuration.loadDataSourceProperties().put("datasource", connection);
 		dataSource = DriverManager.getDataSource(JPADriver.DRIVER_ID, configuration);
 
 		testEntityUniqueName = "it.eng.spagobi.meta.Customer::Customer";

diff --git a/.../test/java/it/eng/qbe/datasource/jpa/impl/StandardJPAHibernateImplDataSourceTestCase.java b/.../test/java/it/eng/qbe/datasource/jpa/impl/StandardJPAHibernateImplDataSourceTestCase.java
@@ -5,15 +5,15 @@
  * If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 package it.eng.qbe.datasource.jpa.impl;
 
+import java.io.File;
+
 import it.eng.qbe.datasource.AbstractDataSourceTestCase;
 import it.eng.qbe.jpa.datasource.jpa.JPADataSource;
 import it.eng.qbe.jpa.datasource.jpa.JPADriver;
 import it.eng.qbe.runtime.datasource.DriverManager;
 import it.eng.qbe.runtime.datasource.configuration.FileDataSourceConfiguration;
 import it.eng.qbe.runtime.datasource.configuration.IDataSourceConfiguration;
 
-import java.io.File;
-
 /**
  * @author Andrea Gioia (andrea.gioia@eng.it)
  *
@@ -30,7 +30,7 @@ protected void setUpDataSource() {
 
 		File file = new File(QBE_FILE);
 		configuration = new FileDataSourceConfiguration(modelName, file);
-		configuration.loadDataSourceProperties().put("connection", connection);
+		configuration.loadDataSourceProperties().put("datasource", connection);
 		dataSource = DriverManager.getDataSource(JPADriver.DRIVER_ID, configuration);
 
 		testEntityUniqueName = "it.eng.spagobi.meta.Customer::Customer";

diff --git a/QbeCore/src/test/java/it/eng/qbe/datasource/jpa/keys/CompKeyJpaDataSourceTestCase.java b/QbeCore/src/test/java/it/eng/qbe/datasource/jpa/keys/CompKeyJpaDataSourceTestCase.java
@@ -5,13 +5,13 @@
  * If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 package it.eng.qbe.datasource.jpa.keys;
 
+import java.io.File;
+
 import it.eng.qbe.jpa.datasource.jpa.JPADriver;
 import it.eng.qbe.runtime.datasource.DriverManager;
 import it.eng.qbe.runtime.datasource.configuration.FileDataSourceConfiguration;
 import it.eng.qbe.runtime.datasource.configuration.IDataSourceConfiguration;
 
-import java.io.File;
-
 /**
  * @author Andrea Gioia (andrea.gioia@eng.it)
  *
@@ -28,7 +28,7 @@ protected void setUpDataSource() {
 
 		File file = new File(QBE_FILE);
 		configuration = new FileDataSourceConfiguration(modelName, file);
-		configuration.loadDataSourceProperties().put("connection", connection);
+		configuration.loadDataSourceProperties().put("datasource", connection);
 		dataSource = DriverManager.getDataSource(JPADriver.DRIVER_ID, configuration, false);
 	}
 

diff --git a/QbeCore/src/test/java/it/eng/qbe/datasource/jpa/keys/KeyJpaDataSourceTestSuite.java b/QbeCore/src/test/java/it/eng/qbe/datasource/jpa/keys/KeyJpaDataSourceTestSuite.java
@@ -1,16 +1,14 @@
 /* SpagoBI, the Open Source Business Intelligence suite
 
  * Copyright (C) 2012 Engineering Ingegneria Informatica S.p.A. - SpagoBI Competency Center
- * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0, without the "Incompatible With Secondary Licenses" notice. 
+ * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0, without the "Incompatible With Secondary Licenses" notice.
  * If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 package it.eng.qbe.datasource.jpa.keys;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-
-
 /**
  * @author Andrea Gioia (andrea.gioia@eng.it)
  *
@@ -21,9 +19,7 @@ static public Test suite() {
 		suite.addTestSuite(NoKeyJpaDataSourceTestCase.class);
 		suite.addTestSuite(SimpleKeyJpaDataSourceTestCase.class);
 		suite.addTestSuite(CompKeyJpaDataSourceTestCase.class);
-		//suite.addTestSuite(RelNoKeyJpaDataSourceTestCase.class);
 		suite.addTestSuite(RelSimpleKeyJpaDataSourceTestCase.class);
-		//suite.addTestSuite(RelCompKeyJpaDataSourceTestCase.class);
 		return suite;
 	}
 }
diff --git a/QbeCore/src/test/java/it/eng/qbe/datasource/jpa/keys/NoKeyJpaDataSourceTestCase.java b/QbeCore/src/test/java/it/eng/qbe/datasource/jpa/keys/NoKeyJpaDataSourceTestCase.java
@@ -5,13 +5,13 @@
  * If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 package it.eng.qbe.datasource.jpa.keys;
 
+import java.io.File;
+
 import it.eng.qbe.jpa.datasource.jpa.JPADriver;
 import it.eng.qbe.runtime.datasource.DriverManager;
 import it.eng.qbe.runtime.datasource.configuration.FileDataSourceConfiguration;
 import it.eng.qbe.runtime.datasource.configuration.IDataSourceConfiguration;
 
-import java.io.File;
-
 /**
  * @author Andrea Gioia (andrea.gioia@eng.it)
  *
@@ -28,7 +28,7 @@ protected void setUpDataSource() {
 
 		File file = new File(QBE_FILE);
 		configuration = new FileDataSourceConfiguration(modelName, file);
-		configuration.loadDataSourceProperties().put("connection", connection);
+		configuration.loadDataSourceProperties().put("datasource", connection);
 		dataSource = DriverManager.getDataSource(JPADriver.DRIVER_ID, configuration, false);
 	}
 

diff --git a/QbeCore/src/test/java/it/eng/qbe/datasource/jpa/keys/RelCompKeyJpaDataSourceTestCase.java b/QbeCore/src/test/java/it/eng/qbe/datasource/jpa/keys/RelCompKeyJpaDataSourceTestCase.java
diff --git a/QbeCore/src/test/java/it/eng/qbe/datasource/jpa/keys/RelNoKeyJpaDataSourceTestCase.java b/QbeCore/src/test/java/it/eng/qbe/datasource/jpa/keys/RelNoKeyJpaDataSourceTestCase.java
diff --git a/QbeCore/src/test/java/it/eng/qbe/datasource/jpa/keys/RelSimpleKeyJpaDataSourceTestCase.java b/QbeCore/src/test/java/it/eng/qbe/datasource/jpa/keys/RelSimpleKeyJpaDataSourceTestCase.java
@@ -5,13 +5,13 @@
  * If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 package it.eng.qbe.datasource.jpa.keys;
 
+import java.io.File;
+
 import it.eng.qbe.jpa.datasource.jpa.JPADriver;
 import it.eng.qbe.runtime.datasource.DriverManager;
 import it.eng.qbe.runtime.datasource.configuration.FileDataSourceConfiguration;
 import it.eng.qbe.runtime.datasource.configuration.IDataSourceConfiguration;
 
-import java.io.File;
-
 /**
  * @author Andrea Gioia (andrea.gioia@eng.it)
  *
@@ -28,7 +28,7 @@ protected void setUpDataSource() {
 
 		File file = new File(QBE_FILE);
 		configuration = new FileDataSourceConfiguration(modelName, file);
-		configuration.loadDataSourceProperties().put("connection", connection);
+		configuration.loadDataSourceProperties().put("datasource", connection);
 		dataSource = DriverManager.getDataSource(JPADriver.DRIVER_ID, configuration, false);
 	}
 

diff --git a/QbeCore/src/test/java/it/eng/qbe/datasource/jpa/keys/SimpleKeyJpaDataSourceTestCase.java b/QbeCore/src/test/java/it/eng/qbe/datasource/jpa/keys/SimpleKeyJpaDataSourceTestCase.java
@@ -5,13 +5,13 @@
  * If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 package it.eng.qbe.datasource.jpa.keys;
 
+import java.io.File;
+
 import it.eng.qbe.jpa.datasource.jpa.JPADriver;
 import it.eng.qbe.runtime.datasource.DriverManager;
 import it.eng.qbe.runtime.datasource.configuration.FileDataSourceConfiguration;
 import it.eng.qbe.runtime.datasource.configuration.IDataSourceConfiguration;
 
-import java.io.File;
-
 /**
  * @author Andrea Gioia (andrea.gioia@eng.it)
  *
@@ -28,7 +28,7 @@ protected void setUpDataSource() {
 
 		File file = new File(QBE_FILE);
 		configuration = new FileDataSourceConfiguration(modelName, file);
-		configuration.loadDataSourceProperties().put("connection", connection);
+		configuration.loadDataSourceProperties().put("datasource", connection);
 		dataSource = DriverManager.getDataSource(JPADriver.DRIVER_ID, configuration, false);
 	}
 

diff --git a/QbeCore/src/test/java/it/eng/qbe/datasource/jpa/query/QueryDataSourceTestCase.java b/QbeCore/src/test/java/it/eng/qbe/datasource/jpa/query/QueryDataSourceTestCase.java
@@ -5,18 +5,18 @@
  * If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 package it.eng.qbe.datasource.jpa.query;
 
+import java.io.File;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+
 import it.eng.qbe.datasource.AbstractDataSourceTestCase;
 import it.eng.qbe.jpa.datasource.jpa.IJpaDataSource;
 import it.eng.qbe.jpa.datasource.jpa.JPADriver;
 import it.eng.qbe.runtime.datasource.DriverManager;
 import it.eng.qbe.runtime.datasource.configuration.FileDataSourceConfiguration;
 import it.eng.qbe.runtime.datasource.configuration.IDataSourceConfiguration;
 
-import java.io.File;
-import java.util.List;
-
-import javax.persistence.EntityManager;
-
 /**
  * @author Andrea Gioia (andrea.gioia@eng.it)
  *
@@ -33,7 +33,7 @@ protected void setUpDataSource() {
 
 		File file = new File(QBE_FILE);
 		configuration = new FileDataSourceConfiguration(modelName, file);
-		configuration.loadDataSourceProperties().put("connection", connection);
+		configuration.loadDataSourceProperties().put("datasource", connection);
 		dataSource = DriverManager.getDataSource(JPADriver.DRIVER_ID, configuration, false);
 	}