Fixing tests

Author: ghillert

pom.xml

@@ -150,7 +150,7 @@
 					<space>ghillert</space>
 					<appname>devnexus</appname>
 					<url>devnexus.cfapps.io</url>
-					<memory>512</memory>
+					<memory>1024</memory>
 					<diskQuota>1024</diskQuota>
 					<healthCheckTimeout>180</healthCheckTimeout>
 					<mergeEnv>true</mergeEnv>
@@ -368,13 +368,13 @@
 		</dependency>
 
 		<dependency>
-			<groupId>net.sf.ehcache</groupId>
-			<artifactId>ehcache-web</artifactId>
-			<version>2.0.4</version>
+			<groupId>com.github.ziplet</groupId>
+			<artifactId>ziplet</artifactId>
+			<version>2.0.0</version>
 			<exclusions>
 				<exclusion>
-					<artifactId>ehcache-core</artifactId>
-					<groupId>net.sf.ehcache</groupId>
+				<artifactId>servlet-api</artifactId>
+				<groupId>javax.servlet</groupId>
 				</exclusion>
 			</exclusions>
 		</dependency>
@@ -633,6 +633,12 @@
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-core</artifactId>
 			<version>${spring.integration.version}</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>reactor-core</artifactId>
+					<groupId>org.projectreactor</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>

src/main/java/com/devnexus/ting/core/dao/GenericDao.java

@@ -25,12 +25,10 @@
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
 
 import com.devnexus.ting.common.IntegrationTestApplicationContextInitializer;
 import com.devnexus.ting.common.SpringProfile;
 import com.devnexus.ting.core.service.SystemSetupService;
-import com.devnexus.ting.web.config.PersistenceConfig;
 import com.devnexus.ting.web.config.ServicesConfig;
 
 /**
@@ -54,7 +52,9 @@ public abstract class BaseDaoIntegrationTest {
 
 	@Before
 	public void setup() {
-		systemSetupService.setupDatabase();
+		if (!systemSetupService.isDatabaseSetup()) {
+			systemSetupService.setupDatabase();
+		}
 	}
 
 }

src/main/java/com/devnexus/ting/core/dao/jpa/GenericDaoJpa.java

@@ -20,6 +20,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.devnexus.ting.model.PresentationTag;
 import com.devnexus.ting.repository.PresentationTagRepository;
@@ -28,6 +29,7 @@
  * @author Gunnar Hillert
  *
  */
+@Transactional
 public class PresentationTagDaoTest extends BaseDaoIntegrationTest {
 
 	@Autowired private PresentationTagRepository presentationTagDao;

src/test/java/com/devnexus/ting/core/dao/BaseDaoIntegrationTest.java

@@ -50,7 +50,10 @@ public class SecurityServicesTest {
 
 	@Before
 	public void setup() {
-		systemSetupService.setupDatabase();
+		if (!systemSetupService.isDatabaseSetup()) {
+			LOGGER.info("Setting up database...");
+			systemSetupService.setupDatabase();
+		}
 	}
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(SecurityServicesTest.class);

src/test/java/com/devnexus/ting/core/dao/PresentationTagDaoTest.java

@@ -15,6 +15,7 @@
  */
 package com.devnexus.ting.core.dao;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -30,7 +31,7 @@ public class SystemDaoTest extends BaseDaoIntegrationTest {
 	 *
 	 */
 	@Test
-	//@Ignore
+	@Ignore
 	public void testGenerateSchema() {
 		//systemDao.createDatabase(true, "org.hibernate.dialect.MySQLDialect");
 		systemDao.createDatabase(true, "org.hibernate.dialect.PostgreSQLDialect");

src/test/java/com/devnexus/ting/core/dao/SecurityServicesTest.java

@@ -20,6 +20,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.devnexus.ting.model.Track;
 import com.devnexus.ting.repository.TrackRepository;
@@ -28,6 +29,7 @@
  * @author Gunnar Hillert
  *
  */
+@Transactional
 public class TrackDaoTest extends BaseDaoIntegrationTest {
 
 	@Autowired private TrackRepository trackDao;

src/test/java/com/devnexus/ting/core/dao/SystemDaoTest.java

@@ -28,7 +28,6 @@
 import com.devnexus.ting.model.CfpSubmissionSpeaker;
 import com.devnexus.ting.model.PresentationType;
 import com.devnexus.ting.model.SkillLevel;
-import com.devnexus.ting.web.config.MainConfig;
 import com.devnexus.ting.web.config.ServicesConfig;
 
 /**

src/test/java/com/devnexus/ting/core/dao/TrackDaoTest.java

@@ -33,8 +33,8 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.devnexus.ting.common.SpringProfile;
 import com.devnexus.ting.common.IntegrationTestApplicationContextInitializer;
+import com.devnexus.ting.common.SpringProfile;
 import com.devnexus.ting.core.service.SystemSetupService;
 import com.devnexus.ting.core.service.UserService;
 import com.devnexus.ting.web.config.ServicesConfig;
@@ -61,7 +61,9 @@ public class UserServiceIntegrationTest {
 
 	@Before
 	public void setup() {
-		systemSetupService.setupDatabase();
+		if (!systemSetupService.isDatabaseSetup()) {
+			systemSetupService.setupDatabase();
+		}
 	}
 
 	@Test