Skip to content

Commit

Permalink
test fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
vchizhevsky committed Mar 21, 2016
1 parent 4e8cbed commit 78931d1
Show file tree
Hide file tree
Showing 8 changed files with 55 additions and 13 deletions.
8 changes: 6 additions & 2 deletions pom.xml
View file
Expand Up @@ -41,6 +41,7 @@ Copyright 2014-2016 CyberVision, Inc.
<hikari.cp.version>2.4.2</hikari.cp.version>
<pgsql.driver.ver>9.3-1101-jdbc41</pgsql.driver.ver>
<mariadb-driver.version>1.3.0</mariadb-driver.version>
<mysql-driver.version>5.1.6</mysql-driver.version>
<h2.driver.ver>1.4.179</h2.driver.ver>
<oracle-nosql-client.version>3.0.14</oracle-nosql-client.version>
<oracle-kvstore.version>3.1.7</oracle-kvstore.version>
Expand Down Expand Up @@ -1018,13 +1019,16 @@ Copyright 2014-2016 CyberVision, Inc.
<artifactId>postgresql</artifactId>
<version>${pgsql.driver.ver}</version>
</dependency>

<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>${mariadb-driver.version}</version>
</dependency>

<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql-driver.version}</version>
</dependency>
<dependency>
<groupId>com.oracle.kv</groupId>
<artifactId>oracle-nosql-client</artifactId>
Expand Down
5 changes: 5 additions & 0 deletions server/common/dao/pom.xml
View file
Expand Up @@ -152,8 +152,13 @@
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

<build>
Expand Down
2 changes: 1 addition & 1 deletion ...common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/GenericModel.java
View file
Expand Up @@ -31,7 +31,7 @@ public abstract class GenericModel<T> implements Serializable, ToDto<T> {
private static final long serialVersionUID = 8371621337499494435L;

@Id
@GeneratedValue(strategy=GenerationType.SEQUENCE)
@GeneratedValue(strategy=GenerationType.TABLE)
protected Long id;

public Long getId() {
Expand Down
7 changes: 6 additions & 1 deletion server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/AbstractTest.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
Expand Down
6 changes: 6 additions & 0 deletions .../kaaproject/kaa/server/common/dao/impl/sql/HibernateApplicationEventFamilyMapDaoTest.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -95,9 +96,14 @@ public void testFindByIds() {
ids.add(applicationEventFamilyMaps.get(0).getId().toString());
ids.add(applicationEventFamilyMaps.get(1).getId().toString());
List<ApplicationEventFamilyMap> found = applicationEventFamilyMapDao.findByIds(ids);
sortList(found);
Assert.assertEquals(applicationEventFamilyMaps, found);
}

private void sortList(List<ApplicationEventFamilyMap> found){
found.sort((o1, o2) -> (int) (o1.getId()-o2.getId()));
}

@Test
public void testFindByEcfIdAndVersion() {
List<ApplicationEventFamilyMap> applicationEventFamilyMaps = generateApplicationEventFamilyMap(null, null, null, 2, true);
Expand Down
22 changes: 22 additions & 0 deletions ...on/dao/src/test/java/org/kaaproject/kaa/server/common/dao/impl/sql/MariaDBTestRunner.java
View file
@@ -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();
}
}
10 changes: 4 additions & 6 deletions server/common/dao/src/test/resources/common-dao-sql-test-context.xml
View file
Expand Up @@ -70,7 +70,6 @@
</bean>
</beans>

<!-- //////////////////////// -->
<beans profile="mariadb">

<bean id="sessionFactory" class="org.springframework.orm.hibernate4.LocalSessionFactoryBean">
Expand All @@ -79,7 +78,7 @@
<property name="hibernateProperties">
<props>
<prop key="hibernate.hbm2ddl.auto">#{sql_dao[hibernate_hbm2ddl_auto]}</prop>
<prop key="hibernate.dialect">#{sql_dao[hibernate_dialect]}</prop>
<prop key="hibernate.dialect">org.hibernate.dialect.MySQL5Dialect</prop>
<prop key="hibernate.format_sql">#{sql_dao[hibernate_format_sql]}</prop>
<prop key="hibernate.show_sql">#{sql_dao[hibernate_show_sql]}</prop>

Expand All @@ -97,9 +96,9 @@
<property name="idleTimeout" value="120000" />
<property name="dataSourceProperties">
<props>
<prop key="url">jdbc:#{sql_dao[sql_provider_name]}://#{sql_dao[jdbc_host]}/#{sql_dao[db_name]}</prop>
<prop key="user">#{sql_dao[jdbc_username]</prop>
<prop key="password">#{sql_dao[jdbc_password]</prop>
<prop key="url">jdbc:mysql://localhost:3306/kaa</prop>
<prop key="user">sqladmin</prop>
<prop key="password">admin</prop>
</props>
</property>
</bean>
Expand All @@ -108,7 +107,6 @@
<constructor-arg ref="hikariConfig" />
</bean>
</beans>
<!-- //////////////////////// -->

<beans profile="h2">

Expand Down
8 changes: 5 additions & 3 deletions server/node/pom.xml
View file
Expand Up @@ -448,7 +448,11 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-annotations</artifactId>
</dependency>

<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down Expand Up @@ -642,9 +646,7 @@
<include>common-dao-context.xml</include>
<include>common-dao-sql-context.xml</include>
<include>sql-dao.properties</include>
<!-- /////////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
<include>nosql-dao.properties</include>
<!-- /////////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
</includes>
</resource>
<resource>
Expand Down

0 comments on commit 78931d1

Please sign in to comment.