1 files changed, 0 insertions, 107 deletions
diff --git a/container-di/src/test/scala/com/yahoo/container/di/ConfigRetrieverTest.scala b/container-di/src/test/scala/com/yahoo/container/di/ConfigRetrieverTest.scala
deleted file mode 100644
index 7f1d9a73a82..00000000000
--- a/container-di/src/test/scala/com/yahoo/container/di/ConfigRetrieverTest.scala
+++ /dev/null
@@ -1,107 +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.container.di
-
-import com.yahoo.config.test.{Bootstrap1Config, Bootstrap2Config, TestConfig}
-import com.yahoo.container.di.ConfigRetriever.{BootstrapConfigs, ComponentsConfigs}
-import com.yahoo.vespa.config.ConfigKey
-import org.hamcrest.CoreMatchers.{is, instanceOf => hamcrestInstanceOf}
-import org.hamcrest.Matcher
-import org.junit.Assert._
-import org.junit.{After, Before, Ignore, Test}
-
-import scala.reflect.ClassTag
-import scala.collection.JavaConverters._
-
-/**
- *
- * @author gjoranv
- * @author tonytv
- */
-class ConfigRetrieverTest {
-
-  var dirConfigSource: DirConfigSource = null
-
-  @Before def setup()  {
-    dirConfigSource = new DirConfigSource("ConfigRetrieverTest-")
-  }
-
-  @After def cleanup() { dirConfigSource.cleanup() }
-
-  @Test
-  def require_that_bootstrap_configs_come_first() {
-    writeConfigs()
-    val retriever = createConfigRetriever()
-    val bootstrapConfigs = retriever.getConfigs(Set(), 0)
-
-    assertThat(bootstrapConfigs, instanceOf[BootstrapConfigs])
-  }
-
-  @Test
-  def require_that_components_comes_after_bootstrap() {
-    writeConfigs()
-    val retriever = createConfigRetriever()
-    val bootstrapConfigs = retriever.getConfigs(Set(), 0)
-
-    val testConfigKey = new ConfigKey(classOf[TestConfig], dirConfigSource.configId)
-    val componentsConfigs = retriever.getConfigs(Set(testConfigKey), 0)
-
-    componentsConfigs match {
-      case ComponentsConfigs(configs) => assertThat(configs.size, is(3))
-      case _ => fail("ComponentsConfigs has unexpected type: " + componentsConfigs)
-    }
-  }
-
-  @Test
-  def require_no_reconfig_when_restart_on_redeploy() {
-    // TODO
-    writeConfigs()
-    val retriever = createConfigRetriever()
-    val bootstrapConfigs = retriever.getConfigs(Set(), 0)
-
-    val testConfigKey = new ConfigKey(classOf[TestConfig], dirConfigSource.configId)
-    val componentsConfigs = retriever.getConfigsOnce(Set(testConfigKey), 0, true)
-
-    componentsConfigs match {
-      case Some(snapshot) => fail("Expected no configs")
-      case _ => // ok
-    }
-  }
-
-  @Test(expected = classOf[IllegalArgumentException])
-  @Ignore
-  def require_exception_upon_modified_components_keys_without_bootstrap() {
-    writeConfigs()
-    val retriever = createConfigRetriever()
-    val testConfigKey = new ConfigKey(classOf[TestConfig], dirConfigSource.configId)
-    val bootstrapConfigs = retriever.getConfigs(Set(), 0)
-    val componentsConfigs = retriever.getConfigs(Set(testConfigKey), 0)
-    retriever.getConfigs(Set(testConfigKey, new ConfigKey(classOf[TestConfig],"")), 0)
-  }
-
-  @Test
-  def require_that_empty_components_keys_after_bootstrap_returns_components_configs() {
-    writeConfigs()
-    val retriever = createConfigRetriever()
-    assertThat(retriever.getConfigs(Set(), 0), instanceOf[BootstrapConfigs])
-    assertThat(retriever.getConfigs(Set(), 0), instanceOf[ComponentsConfigs])
-  }
-
-  def writeConfigs() {
-    writeConfig("bootstrap1", """dummy "ignored" """")
-    writeConfig("bootstrap2", """dummy "ignored" """")
-    writeConfig("test", """stringVal "ignored" """")
-  }
-
-  def createConfigRetriever() = {
-    val configId = dirConfigSource.configId
-    val subscriber = new CloudSubscriberFactory(dirConfigSource.configSource)
-    new ConfigRetriever(
-      Set(new ConfigKey(classOf[Bootstrap1Config], configId),
-          new ConfigKey(classOf[Bootstrap2Config], configId)),
-      (keys) => subscriber.getSubscriber(keys.asJava))
-  }
-
-  def writeConfig = dirConfigSource.writeConfig _
-
-  def instanceOf[T: ClassTag] = hamcrestInstanceOf(implicitly[ClassTag[T]].runtimeClass): Matcher[AnyRef]
-}