From d29de4a867577220a6afb838175fe73c39f1bccd Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@verizonmedia.com>
Date: Mon, 7 Sep 2020 14:24:26 +0200
Subject: Simplify and move in the direction of unifying remote and local
 sessions Move tests and avoid a lot of low-level setup code

Do not use `synchronized` for ensureApplicationLoaded()
---
 .../test/apps/app-major-version-2/deployment.xml   |  1 +
 .../src/test/apps/app-major-version-2/hosts.xml    |  7 +++
 .../app-major-version-2/searchdefinitions/music.sd | 50 ++++++++++++++++++++++
 .../src/test/apps/app-major-version-2/services.xml | 38 ++++++++++++++++
 4 files changed, 96 insertions(+)
 create mode 100644 configserver/src/test/apps/app-major-version-2/deployment.xml
 create mode 100644 configserver/src/test/apps/app-major-version-2/hosts.xml
 create mode 100644 configserver/src/test/apps/app-major-version-2/searchdefinitions/music.sd
 create mode 100644 configserver/src/test/apps/app-major-version-2/services.xml

(limited to 'configserver/src/test/apps')

diff --git a/configserver/src/test/apps/app-major-version-2/deployment.xml b/configserver/src/test/apps/app-major-version-2/deployment.xml
new file mode 100644
index 00000000000..7523c104b7e
--- /dev/null
+++ b/configserver/src/test/apps/app-major-version-2/deployment.xml
@@ -0,0 +1 @@
+<deployment version='1.0' major-version='2'/>
diff --git a/configserver/src/test/apps/app-major-version-2/hosts.xml b/configserver/src/test/apps/app-major-version-2/hosts.xml
new file mode 100644
index 00000000000..f4256c9fc81
--- /dev/null
+++ b/configserver/src/test/apps/app-major-version-2/hosts.xml
@@ -0,0 +1,7 @@
+<?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. -->
+<hosts>
+  <host name="mytesthost">
+    <alias>node1</alias>
+  </host>
+</hosts>
diff --git a/configserver/src/test/apps/app-major-version-2/searchdefinitions/music.sd b/configserver/src/test/apps/app-major-version-2/searchdefinitions/music.sd
new file mode 100644
index 00000000000..7670e78f22b
--- /dev/null
+++ b/configserver/src/test/apps/app-major-version-2/searchdefinitions/music.sd
@@ -0,0 +1,50 @@
+# 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/app-major-version-2/services.xml b/configserver/src/test/apps/app-major-version-2/services.xml
new file mode 100644
index 00000000000..509d7786be0
--- /dev/null
+++ b/configserver/src/test/apps/app-major-version-2/services.xml
@@ -0,0 +1,38 @@
+<?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>
-- 
cgit v1.2.3