Tweaking some test failures

Author: ghillert

pom.xml

@@ -376,6 +376,10 @@
 				<artifactId>servlet-api</artifactId>
 				<groupId>javax.servlet</groupId>
 				</exclusion>
+				<exclusion>
+					<artifactId>slf4j-nop</artifactId>
+					<groupId>org.slf4j</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 
@@ -707,12 +711,12 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-spring-service-connector</artifactId>
-			<version>1.1.1.RELEASE</version>
+			<version>1.2.0.RC1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-cloudfoundry-connector</artifactId>
-			<version>1.1.1.RELEASE</version>
+			<version>1.2.0.RC1</version>
 		</dependency>
 	</dependencies>
 

src/main/java/com/devnexus/ting/core/service/impl/SystemSetupServiceImpl.java

@@ -61,7 +61,6 @@
  * @since 1.0
  */
 @Service("systemSetupService")
-@Transactional
 public class SystemSetupServiceImpl implements SystemSetupService {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(SystemSetupServiceImpl.class);
@@ -149,6 +148,7 @@ private void createDatabase() {
 		systemDao.createDatabase(false, null);
 	}
 
+	@Transactional
 	@Override
 	public void updateDatabase() {
 		systemDao.updateDatabase();
@@ -192,6 +192,7 @@ public void setupDatabase() {
 			}
 	}
 
+	@Transactional
 	@Override
 	public void setupDemoData() {
 		LOGGER.info("Ting Database is not setup, yet. Populating Demo Data...");

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

@@ -23,6 +23,8 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.devnexus.ting.model.FileData;
@@ -32,6 +34,7 @@
  * @author Gunnar Hillert
  */
 @Transactional
+@DirtiesContext(classMode=ClassMode.AFTER_EACH_TEST_METHOD)
 public class DocumentDaoTest extends BaseDaoIntegrationTest {
 
 	@Autowired private FileDataRepository documentDao;

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

@@ -20,6 +20,8 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.devnexus.ting.model.PresentationTag;
@@ -30,6 +32,7 @@
  *
  */
 @Transactional
+@DirtiesContext(classMode=ClassMode.AFTER_EACH_TEST_METHOD)
 public class PresentationTagDaoTest extends BaseDaoIntegrationTest {
 
 	@Autowired private PresentationTagRepository presentationTagDao;

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

@@ -20,6 +20,8 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.devnexus.ting.model.Speaker;
@@ -30,6 +32,7 @@
  *
  */
 @Transactional
+@DirtiesContext(classMode=ClassMode.AFTER_EACH_TEST_METHOD)
 public class SpeakerDaoTest extends BaseDaoIntegrationTest {
 
 	@Autowired private SpeakerRepository speakerDao;

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

@@ -15,14 +15,16 @@
  */
 package com.devnexus.ting.core.dao;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
 
 /**
  * @author Gunnar Hillert
  *
  */
+@DirtiesContext(classMode=ClassMode.AFTER_EACH_TEST_METHOD)
 public class SystemDaoTest extends BaseDaoIntegrationTest {
 
 	@Autowired private SystemDao systemDao;
@@ -31,7 +33,6 @@ public class SystemDaoTest extends BaseDaoIntegrationTest {
 	 *
 	 */
 	@Test
-	@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/TrackDaoTest.java

@@ -20,6 +20,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.devnexus.ting.model.Track;
@@ -30,6 +31,7 @@
  *
  */
 @Transactional
+@DirtiesContext
 public class TrackDaoTest extends BaseDaoIntegrationTest {
 
 	@Autowired private TrackRepository trackDao;

src/test/resources/logback-test.xml

@@ -25,10 +25,10 @@
 		<level value="WARN"/>
 	</logger>
 	<logger name="org.hibernate">
-		<level value="WARN"/>
+		<level value="INFO"/>
 	</logger>
 	<logger name="org.hibernate.tool.hbm2ddl">
-		<level value="WARN"/>
+		<level value="INFO"/>
 	</logger>
 	<logger name="com.hillert.apptools.spring">
 		<level value="INFO"/>
@@ -41,7 +41,7 @@
 	</logger>
 
 	<root>
-		<level value="WARN"/>
+		<level value="INFO"/>
 		<appender-ref ref="CONSOLE"/>
 	</root>
 </configuration>