Revert "Simplify tests (stop using low-level code to setup test environment)"

2 files changed, 0 insertions, 88 deletions

diff --git a/configserver/src/test/apps/content2/schemas/music.sd b/configserver/src/test/apps/content2/schemas/music.sd
deleted file mode 100644
index 7670e78f22b..00000000000
--- a/configserver/src/test/apps/content2/schemas/music.sd
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-# A basic search definition - called music, should be saved to music.sd
-search music {
-
-  # It contains one document type only - called music as well
-  document music {
-
-    field title type string {
-      indexing: summary | index   # How this field should be indexed
-      # index-to: title, default    # Create two indexes
-      weight: 75 # Ranking importancy of this field, used by the built in nativeRank feature
-    }
-
-    field artist type string {
-      indexing: summary | attribute | index
-      # index-to: artist, default
-
-      weight: 25 
-    }
-
-    field year type int {
-      indexing: summary | attribute
-    }
-
-    # Increase query
-    field popularity type int {
-      indexing: summary | attribute
-    }
-
-    field url type uri {
-      indexing: summary | index
-    }
-
-  }
-
-  rank-profile default inherits default {
-    first-phase {
-      expression: nativeRank(title,artist) + attribute(popularity)
-    }
-
-  }
-
-  rank-profile textmatch inherits default {
-    first-phase {
-      expression: nativeRank(title,artist) 
-    }
-
-  }
-
-}
diff --git a/configserver/src/test/apps/content2/services.xml b/configserver/src/test/apps/content2/services.xml
deleted file mode 100644
index 509d7786be0..00000000000
--- a/configserver/src/test/apps/content2/services.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<services version="1.0">
-
-    <admin version="2.0">
-        <adminserver hostalias="node1"/>
-        <logserver hostalias="node1" />
-    </admin>
-
-    <content version="1.0">
-        <redundancy>2</redundancy>
-        <documents>
-            <document type="music" mode="index"/>
-        </documents>
-        <nodes>
-            <node hostalias="node1" distribution-key="0"/>
-        </nodes>
-
-    </content>
-
-    <container version="1.0">
-        <document-processing compressdocuments="true">
-            <chain id="ContainerWrapperTest">
-                <documentprocessor id="com.yahoo.vespa.config.AppleDocProc"/>
-            </chain>
-        </document-processing>
-
-        <config name="project.specific">
-            <value>someval</value>
-        </config>
-
-        <nodes>
-            <node hostalias="node1" />
-        </nodes>
-
-    </container>
-
-</services>