summaryrefslogtreecommitdiffstats
path: root/jdisc_core_test
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2019-10-03 13:28:45 +0200
committergjoranv <gv@verizonmedia.com>2019-10-03 13:28:45 +0200
commit399e86e2374327f6cee7e6ee4cc5eeae7181dfd5 (patch)
tree8bd4d643835246b7eb0caec6f3323c7203e603b7 /jdisc_core_test
parentadf22d3886ccd6de163278434a1a6d502584d0f9 (diff)
Remove unused BootstrapDaemon
Diffstat (limited to 'jdisc_core_test')
-rw-r--r--jdisc_core_test/integration_test/pom.xml1
-rw-r--r--jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/core/BootstrapDaemonIntegrationTest.java58
-rw-r--r--jdisc_core_test/integration_test/src/test/resources/config.properties1
3 files changed, 0 insertions, 60 deletions
diff --git a/jdisc_core_test/integration_test/pom.xml b/jdisc_core_test/integration_test/pom.xml
index 392d1105716..670d812c9e9 100644
--- a/jdisc_core_test/integration_test/pom.xml
+++ b/jdisc_core_test/integration_test/pom.xml
@@ -301,7 +301,6 @@
</java.util.logging.config.file>
<jdisc.bundle.path>${project.build.directory}/dependency</jdisc.bundle.path>
<jdisc.cache.path>${project.build.directory}/bundlecache</jdisc.cache.path>
- <jdisc.config.file>src/test/resources/config.properties</jdisc.config.file>
<jdisc.logger.level>ALL</jdisc.logger.level>
</systemPropertyVariables>
</configuration>
diff --git a/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/core/BootstrapDaemonIntegrationTest.java b/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/core/BootstrapDaemonIntegrationTest.java
deleted file mode 100644
index d052d2d4715..00000000000
--- a/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/core/BootstrapDaemonIntegrationTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.jdisc.core;
-
-import com.google.inject.Inject;
-import com.google.inject.name.Named;
-import com.yahoo.jdisc.application.Application;
-import org.apache.commons.daemon.DaemonContext;
-import org.junit.Test;
-import org.mockito.Mockito;
-
-import static org.junit.Assert.assertEquals;
-
-
-/**
- * @author Simon Thoresen Hult
- */
-public class BootstrapDaemonIntegrationTest {
-
- @Test
- public void requireThatConfigFileIsInjected() throws Exception {
- BootstrapDaemon daemon = new BootstrapDaemon();
-
- DaemonContext ctx = Mockito.mock(DaemonContext.class);
- Mockito.doReturn(new String[] { MyApplication.class.getName() }).when(ctx).getArguments();
- daemon.init(ctx);
- daemon.start();
-
- assertEquals("bar", ((MyApplication)((ApplicationLoader)daemon.loader()).application()).foo);
-
- daemon.stop();
- daemon.destroy();
- }
-
- public static class MyApplication implements Application {
-
- final String foo;
-
- @Inject
- public MyApplication(@Named("foo") String foo) {
- this.foo = foo;
- }
-
- @Override
- public void start() {
-
- }
-
- @Override
- public void stop() {
-
- }
-
- @Override
- public void destroy() {
-
- }
- }
-}
diff --git a/jdisc_core_test/integration_test/src/test/resources/config.properties b/jdisc_core_test/integration_test/src/test/resources/config.properties
deleted file mode 100644
index 74d0a43fccf..00000000000
--- a/jdisc_core_test/integration_test/src/test/resources/config.properties
+++ /dev/null
@@ -1 +0,0 @@
-foo=bar