From 78931d1f5a24ea9fd827a1f3cfb56ca9a269e40d Mon Sep 17 00:00:00 2001 From: vchizhevsky Date: Mon, 21 Mar 2016 16:27:09 +0200 Subject: [PATCH] test fixed --- pom.xml | 8 +++++-- server/common/dao/pom.xml | 5 +++++ .../common/dao/model/sql/GenericModel.java | 2 +- .../kaa/server/common/dao/AbstractTest.java | 7 +++++- ...rnateApplicationEventFamilyMapDaoTest.java | 6 +++++ .../dao/impl/sql/MariaDBTestRunner.java | 22 +++++++++++++++++++ .../resources/common-dao-sql-test-context.xml | 10 ++++----- server/node/pom.xml | 8 ++++--- 8 files changed, 55 insertions(+), 13 deletions(-) create mode 100644 server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/impl/sql/MariaDBTestRunner.java diff --git a/pom.xml b/pom.xml index 929684c07a..b899724793 100644 --- a/pom.xml +++ b/pom.xml @@ -41,6 +41,7 @@ Copyright 2014-2016 CyberVision, Inc. 2.4.2 9.3-1101-jdbc41 1.3.0 + 5.1.6 1.4.179 3.0.14 3.1.7 @@ -1018,13 +1019,16 @@ Copyright 2014-2016 CyberVision, Inc. postgresql ${pgsql.driver.ver} - org.mariadb.jdbc mariadb-java-client ${mariadb-driver.version} - + + mysql + mysql-connector-java + ${mysql-driver.version} + com.oracle.kv oracle-nosql-client diff --git a/server/common/dao/pom.xml b/server/common/dao/pom.xml index aa03992279..597be1567e 100644 --- a/server/common/dao/pom.xml +++ b/server/common/dao/pom.xml @@ -152,8 +152,13 @@ org.mariadb.jdbc mariadb-java-client + + + mysql + mysql-connector-java test + diff --git a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/GenericModel.java b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/GenericModel.java index f6609afd0f..b0a9e7dbba 100644 --- a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/GenericModel.java +++ b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/GenericModel.java @@ -31,7 +31,7 @@ public abstract class GenericModel implements Serializable, ToDto { private static final long serialVersionUID = 8371621337499494435L; @Id - @GeneratedValue(strategy=GenerationType.SEQUENCE) + @GeneratedValue(strategy=GenerationType.TABLE) protected Long id; public Long getId() { diff --git a/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/AbstractTest.java b/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/AbstractTest.java index 1163caaf9a..bdc7ba0e13 100644 --- a/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/AbstractTest.java +++ b/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/AbstractTest.java @@ -103,6 +103,7 @@ import org.kaaproject.kaa.server.common.dao.impl.UserDao; import org.kaaproject.kaa.server.common.dao.impl.UserVerifierDao; import org.kaaproject.kaa.server.common.dao.impl.sql.H2DBTestRunner; +import org.kaaproject.kaa.server.common.dao.impl.sql.MariaDBTestRunner; import org.kaaproject.kaa.server.common.dao.impl.sql.PostgreDBTestRunner; import org.kaaproject.kaa.server.common.dao.model.Notification; import org.kaaproject.kaa.server.common.dao.model.sql.Application; @@ -245,10 +246,14 @@ protected void clearDBData() { if (url.contains("h2")) { LOG.info("Deleting data from H2 database"); new H2DBTestRunner().truncateTables(dataSource); - } else { + } else if(url.contains("postgres")){ LOG.info("Deleting data from PostgreSQL database"); new PostgreDBTestRunner().truncateTables(dataSource); } + else{ + LOG.info("Deleting data from MariaDB database"); + new MariaDBTestRunner().truncateTables(dataSource); + } } catch (SQLException ex) { LOG.error("Can't delete data from databases.", ex); } diff --git a/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateApplicationEventFamilyMapDaoTest.java b/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateApplicationEventFamilyMapDaoTest.java index d367a812f2..cbe4dbcef4 100644 --- a/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateApplicationEventFamilyMapDaoTest.java +++ b/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateApplicationEventFamilyMapDaoTest.java @@ -17,6 +17,7 @@ package org.kaaproject.kaa.server.common.dao.impl.sql; import java.util.ArrayList; +import java.util.Comparator; import java.util.List; import org.junit.Assert; @@ -95,9 +96,14 @@ public void testFindByIds() { ids.add(applicationEventFamilyMaps.get(0).getId().toString()); ids.add(applicationEventFamilyMaps.get(1).getId().toString()); List found = applicationEventFamilyMapDao.findByIds(ids); + sortList(found); Assert.assertEquals(applicationEventFamilyMaps, found); } + private void sortList(List found){ + found.sort((o1, o2) -> (int) (o1.getId()-o2.getId())); + } + @Test public void testFindByEcfIdAndVersion() { List applicationEventFamilyMaps = generateApplicationEventFamilyMap(null, null, null, 2, true); diff --git a/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/impl/sql/MariaDBTestRunner.java b/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/impl/sql/MariaDBTestRunner.java new file mode 100644 index 0000000000..ed2244f203 --- /dev/null +++ b/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/impl/sql/MariaDBTestRunner.java @@ -0,0 +1,22 @@ +package org.kaaproject.kaa.server.common.dao.impl.sql; + +import org.kaaproject.kaa.server.common.dao.DBTestRunner; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; + +/** + * Created by chvova on 21.03.16. + */ +public class MariaDBTestRunner extends DBTestRunner { + @Override + protected PreparedStatement prepareStatement(Connection connection) throws SQLException { + return connection.prepareStatement("SELECT tablename FROM pg_tables where schemaname = 'public'"); + } + + @Override + protected String getTrancateSql() { + return new StringBuilder("TRUNCATE TABLE ").append(FORMATER).append(" CASCADE").toString(); + } +} diff --git a/server/common/dao/src/test/resources/common-dao-sql-test-context.xml b/server/common/dao/src/test/resources/common-dao-sql-test-context.xml index 8e798c8cab..211eac3427 100644 --- a/server/common/dao/src/test/resources/common-dao-sql-test-context.xml +++ b/server/common/dao/src/test/resources/common-dao-sql-test-context.xml @@ -70,7 +70,6 @@ - @@ -79,7 +78,7 @@ #{sql_dao[hibernate_hbm2ddl_auto]} - #{sql_dao[hibernate_dialect]} + org.hibernate.dialect.MySQL5Dialect #{sql_dao[hibernate_format_sql]} #{sql_dao[hibernate_show_sql]} @@ -97,9 +96,9 @@ - jdbc:#{sql_dao[sql_provider_name]}://#{sql_dao[jdbc_host]}/#{sql_dao[db_name]} - #{sql_dao[jdbc_username] - #{sql_dao[jdbc_password] + jdbc:mysql://localhost:3306/kaa + sqladmin + admin @@ -108,7 +107,6 @@ - diff --git a/server/node/pom.xml b/server/node/pom.xml index 70a5bdfb1c..063ebba958 100644 --- a/server/node/pom.xml +++ b/server/node/pom.xml @@ -448,7 +448,11 @@ org.eclipse.jetty jetty-annotations - + + mysql + mysql-connector-java + test + @@ -642,9 +646,7 @@ common-dao-context.xml common-dao-sql-context.xml sql-dao.properties - nosql-dao.properties -