MGR-91 fix tests

appNG · Jan 14, 2020 · ea2eb33 · ea2eb33
1 parent 08ffd8a
commit ea2eb33
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/test/java/org/appng/application/manager/business/AbstractTest.java b/src/test/java/org/appng/application/manager/business/AbstractTest.java
@@ -15,12 +15,15 @@
  */
 package org.appng.application.manager.business;
 
+import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
 import javax.persistence.EntityManager;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.appng.api.Platform;
 import org.appng.api.SiteProperties;
@@ -46,7 +49,8 @@
 import org.springframework.test.context.ContextConfiguration;
 
 @Ignore
-@ContextConfiguration(locations = { TestBase.TESTCONTEXT_CORE, TestBase.TESTCONTEXT_JPA }, initializers = AbstractTest.class)
+@ContextConfiguration(locations = { TestBase.TESTCONTEXT_CORE,
+		TestBase.TESTCONTEXT_JPA }, initializers = AbstractTest.class)
 public class AbstractTest extends TestBase {
 
 	@Autowired
@@ -86,6 +90,12 @@ protected AbstractTest() {
 		setUseFullClassname(false);
 		setEntityPackage("org.appng.core.domain");
 		setRepositoryBase("org.appng.core.repository");
+		try {
+			FileUtils.copyInputStreamToFile(getClass().getClassLoader().getResourceAsStream("log4j.properties"),
+					new File("target/ROOT/WEB-INF/conf/log4j.properties"));
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
 	}
 
 	@Before
@@ -114,6 +124,7 @@ protected Properties getProperties() {
 		Properties properties = super.getProperties();
 		properties.put("hibernate.show_sql", "false");
 		properties.put("hibernate.format_sql", "false");
+		properties.put("platform.platformRootPath", "target/ROOT");
 		return properties;
 	}
 

diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties
@@ -3,4 +3,7 @@ log4j.threshold = ALL
 
 log4j.appender.stdout = org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout = org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern = %d{ISO8601} %-5p [%t] %-30c: %m%n
+log4j.appender.stdout.layout.ConversionPattern = %d{ISO8601} %-5p [%t] %-30c: %m%n
+
+# for unit testing
+log4j.appender.appng.File = ${webapp.root}/appNG.log