Remove demo test cases that are covered elsewhere.

4 files changed, 0 insertions, 131 deletions

diff --git a/container-di/src/test/java/demo/Base.java b/container-di/src/test/java/demo/Base.java
index 95ff2e14d53..e98d85a9193 100644
--- a/container-di/src/test/java/demo/Base.java
+++ b/container-di/src/test/java/demo/Base.java
@@ -56,9 +56,4 @@ public class Base {
         this.injector = injector;
     }
 
-    @SuppressWarnings("unchecked")
-    public void addConfig(ConfigInstance configInstance, ComponentId id) {
-        configs.put(new ConfigKey<>((Class<ConfigInstance>)configInstance.getClass(), id.toString()),
-                configInstance);
-    }
 }
diff --git a/container-di/src/test/java/demo/ComponentConfigTest.java b/container-di/src/test/java/demo/ComponentConfigTest.java
deleted file mode 100644
index 02e98bbc325..00000000000
--- a/container-di/src/test/java/demo/ComponentConfigTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package demo;
-
-import com.yahoo.config.test.ThreadPoolConfig;
-import com.yahoo.container.di.componentgraph.Provider;
-import org.junit.Test;
-
-import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import static org.junit.Assert.assertNotNull;
-
-
-/**
- * @author Tony Vaagenes
- * @author gjoranv
- */
-public class ComponentConfigTest extends Base {
-    public static class ThreadPoolExecutorProvider implements Provider<Executor> {
-        private ExecutorService executor;
-
-        public ThreadPoolExecutorProvider(ThreadPoolConfig config) {
-            executor = Executors.newFixedThreadPool(config.numThreads());
-        }
-
-        @Override
-        public Executor get() {
-            return executor;
-        }
-
-        @Override
-        public void deconstruct() {
-            executor.shutdown();
-        }
-    }
-
-    @Test
-    public void require_that_non_components_can_be_configured() {
-        register(ThreadPoolExecutorProvider.class);
-        addConfig(new ThreadPoolConfig(new ThreadPoolConfig.Builder().numThreads(4)),
-                toId(ThreadPoolExecutorProvider.class));
-        complete();
-
-        Executor executor = getInstance(Executor.class);
-        assertNotNull(executor);
-    }
-}
diff --git a/container-di/src/test/java/demo/ComponentRegistryTest.java b/container-di/src/test/java/demo/ComponentRegistryTest.java
deleted file mode 100644
index 26ef0a476d7..00000000000
--- a/container-di/src/test/java/demo/ComponentRegistryTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package demo;
-
-import com.yahoo.component.AbstractComponent;
-import com.yahoo.component.provider.ComponentRegistry;
-import org.junit.Test;
-
-import static org.junit.Assert.assertNotNull;
-
-
-/**
- * @author Tony Vaagenes
- * @author gjoranv
- */
-public class ComponentRegistryTest extends Base {
-    public static class SearchHandler extends AbstractComponent {
-        private final ComponentRegistry<Searcher> searchers;
-
-        public SearchHandler(ComponentRegistry<Searcher> searchers) {
-            this.searchers = searchers;
-        }
-    }
-
-    public static class Searcher extends AbstractComponent {}
-
-    public static class FooSearcher extends Searcher {}
-    public static class BarSearcher extends Searcher {}
-
-    @Test
-    public void require_that_component_registry_can_be_injected() {
-        register(SearchHandler.class);
-        register(FooSearcher.class);
-        register(BarSearcher.class);
-        complete();
-
-        SearchHandler handler = getInstance(SearchHandler.class);
-
-        ComponentRegistry<Searcher> searchers = handler.searchers;
-        assertNotNull(searchers.getComponent(toId(FooSearcher.class)));
-        assertNotNull(searchers.getComponent(toId(BarSearcher.class)));
-    }
-}
diff --git a/container-di/src/test/java/demo/DeconstructTest.java b/container-di/src/test/java/demo/DeconstructTest.java
deleted file mode 100644
index e3dc5e22416..00000000000
--- a/container-di/src/test/java/demo/DeconstructTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package demo;
-
-import com.yahoo.container.di.ContainerTest;
-import com.yahoo.container.di.ContainerTestBase;
-import org.junit.Test;
-
-import static org.junit.Assert.assertTrue;
-
-/**
- * @author Tony Vaagenes
- * @author gjoranv
- */
-public class DeconstructTest extends ContainerTestBase  {
-    public static class DeconstructableComponent extends ContainerTest.DestructableComponent {
-        private boolean isDeconstructed = false;
-
-        @Override
-        public void deconstruct() {
-            isDeconstructed = true;
-        }
-    }
-
-    @Test
-    public void require_that_unused_components_are_deconstructed() {
-        writeBootstrapConfigs("d1", DeconstructableComponent.class);
-        complete();
-
-        DeconstructableComponent d1 = getInstance(DeconstructableComponent.class);
-
-        writeBootstrapConfigs("d2", DeconstructableComponent.class);
-        complete();
-
-        assertTrue(d1.isDeconstructed);
-    }
-}