enabled testing by default in the embedded marmotta
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/c5f0d767 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/c5f0d767 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/c5f0d767 Branch: refs/heads/ldp Commit: c5f0d7675240bd378f8c7986d5dee0fac06cf956 Parents: db70ff7 Author: Sergio Fernández <[email protected]> Authored: Wed Apr 16 12:25:50 2014 +0200 Committer: Sergio Fernández <[email protected]> Committed: Wed Apr 16 12:25:50 2014 +0200 ---------------------------------------------------------------------- .../core/services/logging/LoggingServiceImpl.java | 11 +++++++---- .../platform/core/test/base/AbstractMarmotta.java | 15 +++++++-------- .../platform/core/test/base/EmbeddedMarmotta.java | 9 +++++---- .../platform/core/test/base/JettyMarmotta.java | 6 ++---- 4 files changed, 21 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/c5f0d767/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/logging/LoggingServiceImpl.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/logging/LoggingServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/logging/LoggingServiceImpl.java index dc53656..3bd7ecc 100644 --- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/logging/LoggingServiceImpl.java +++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/logging/LoggingServiceImpl.java @@ -143,23 +143,26 @@ public class LoggingServiceImpl implements LoggingService { } public void startEventHandler(@Observes LoggingStartEvent event) { - if(!configurationService.getBooleanConfiguration("testing.enabled")) { + if(!isTestEnvironment()) { log.warn("LOGGING: Switching to Apache Marmotta logging configuration; further output will be found in {}{}log{}*.log", configurationService.getHome(), File.separator, File.separator); - configureLoggers(); } } public void configurationEventHandler(@Observes ConfigurationChangedEvent event) { - if(!configurationService.getBooleanConfiguration("testing.enabled")) { + if(!isTestEnvironment()) { if (event.containsChangedKeyWithPrefix("logging.")) { log.warn("LOGGING: Reloading logging configuration"); - configureLoggers(); } } } + private boolean isTestEnvironment() { + //TODO: Thread.currentThread().getContextClassLoader().getResource("/logback-test.xml") != null + // .getResource("/logback-testing.xml") != null + return configurationService.getBooleanConfiguration("testing.enabled", false); + } /** * Configure all loggers according to their configuration and set some reasonable fallback for the root level http://git-wip-us.apache.org/repos/asf/marmotta/blob/c5f0d767/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/AbstractMarmotta.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/AbstractMarmotta.java b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/AbstractMarmotta.java index b4fb48b..51ca188 100644 --- a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/AbstractMarmotta.java +++ b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/AbstractMarmotta.java @@ -36,9 +36,9 @@ import java.io.IOException; import java.util.HashMap; /** - * Add file description here! - * <p/> - * Author: Sebastian Schaffert + * Abstract Marmotta + * + * @author Sebastian Schaffert */ public abstract class AbstractMarmotta { @@ -52,7 +52,7 @@ public abstract class AbstractMarmotta { protected File home; protected AbstractMarmotta() { - + // initialise JNDI environment try { NamingManager.setInitialContextFactoryBuilder(new MarmottaInitialContextFactoryBuilder()); @@ -75,25 +75,23 @@ public abstract class AbstractMarmotta { log.error("error adding bean manager to JNDI",e); } - // create temporary LMF home directory home = Files.createTempDir(); - // create a temporary configuration with an in-memory database URL for h2 + // create a temporary configuration with an in-memory database URL for H2 override = new MapConfiguration(new HashMap<String,Object>()); override.setProperty("database.h2.url","jdbc:h2:mem;MVCC=true;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=10"); override.setProperty("logging.template", "/logback-testing.xml"); + override.setProperty("testing.enabled", true); // initialise LMF using a temporary directory startupService = getService(MarmottaStartupService.class); } - public <T> T getService(Class<T> serviceClass) { return container.instance().select(serviceClass).get(); } - public void shutdown() { // remove bean manager from JNDI cleanJNDI(); @@ -124,4 +122,5 @@ public abstract class AbstractMarmotta { } } + } http://git-wip-us.apache.org/repos/asf/marmotta/blob/c5f0d767/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/EmbeddedMarmotta.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/EmbeddedMarmotta.java b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/EmbeddedMarmotta.java index a804bad..8d92592 100644 --- a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/EmbeddedMarmotta.java +++ b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/EmbeddedMarmotta.java @@ -21,10 +21,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * An embedded version of the LMF. Provides support to startup and shutdown the CDI container and the LMF for test cases. - * After the embedded LMF has been used, it should always be shutdown before being reused. - * <p/> - * Author: Sebastian Schaffert + * An embedded version of the Marmotta. Provides support to startup and shutdown the CDI container + * and the Marmotta for test cases. After the embedded Marmotta has been used, it should always be + * shutdown before being reused. + * + * @author Sebastian Schaffert */ public class EmbeddedMarmotta extends AbstractMarmotta { http://git-wip-us.apache.org/repos/asf/marmotta/blob/c5f0d767/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/JettyMarmotta.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/JettyMarmotta.java b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/JettyMarmotta.java index 5004848..97a7ef1 100644 --- a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/JettyMarmotta.java +++ b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/JettyMarmotta.java @@ -56,8 +56,8 @@ public class JettyMarmotta extends AbstractMarmotta { private int port; - private String context; - + private String context; + public JettyMarmotta(String context) { this(context, getRandomPort()); } @@ -86,7 +86,6 @@ public class JettyMarmotta extends AbstractMarmotta { this(override, context, getRandomPort(), webservices); } - public JettyMarmotta(String context, Set<Class<?>> webservices) { this(context, getRandomPort(), webservices); } @@ -110,7 +109,6 @@ public class JettyMarmotta extends AbstractMarmotta { // create a new jetty & run it on port 8080 jetty = new Server(this.port); - TestInjectorFactory.setManager(container.getBeanManager()); ServletContextHandler ctx = new ServletContextHandler(jetty, this.context);
