From 96c29caed67d013be683f74f2c0f9b2e9b73b38d Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@vespa.ai>
Date: Mon, 9 Oct 2023 11:24:14 +0200
Subject: Expect copyright headers

---
 .../application/HostedOverrideProcessorComplexTest.java      |  8 ++++----
 .../com/yahoo/config/application/IncludeProcessorTest.java   |  2 +-
 .../com/yahoo/config/application/XmlPreprocessorTest.java    | 12 ++++++------
 .../application/provider/FilesApplicationPackageTest.java    |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'config-application-package/src/test/java/com/yahoo/config')

diff --git a/config-application-package/src/test/java/com/yahoo/config/application/HostedOverrideProcessorComplexTest.java b/config-application-package/src/test/java/com/yahoo/config/application/HostedOverrideProcessorComplexTest.java
index 2831edfb439..5687084713c 100644
--- a/config-application-package/src/test/java/com/yahoo/config/application/HostedOverrideProcessorComplexTest.java
+++ b/config-application-package/src/test/java/com/yahoo/config/application/HostedOverrideProcessorComplexTest.java
@@ -23,11 +23,11 @@ public class HostedOverrideProcessorComplexTest {
     private static final String servicesFile = "src/test/resources/complex-app/services.xml";
 
     @Test
-    public void testProdBetaUsWest2a() throws TransformerException, IOException {
+    public void testProdBetaUsWest2a() throws TransformerException {
         String expected =
                 """
                 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-                <services xmlns:deploy="vespa" xmlns:preprocess="properties" version="1.0">
+                <!-- Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --><services xmlns:deploy="vespa" xmlns:preprocess="properties" version="1.0">
                     <container id="docsgateway" version="1.0">
                         <nodes count="3">
                             <resources disk="1800Gb" disk-speed="fast" memory="96Gb" storage-type="local" vcpu="48"/>
@@ -66,11 +66,11 @@ public class HostedOverrideProcessorComplexTest {
     }
 
     @Test
-    public void testProdBetaUsEast1b() throws TransformerException, IOException {
+    public void testProdBetaUsEast1b() throws TransformerException {
         String expected =
                 """
                 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-                <services xmlns:deploy="vespa" xmlns:preprocess="properties" version="1.0">
+                <!-- Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --><services xmlns:deploy="vespa" xmlns:preprocess="properties" version="1.0">
                     <container id="docsgateway" version="1.0">
                         <nodes count="3">
                             <resources disk="1800Gb" disk-speed="fast" memory="96Gb" storage-type="local" vcpu="48"/>
diff --git a/config-application-package/src/test/java/com/yahoo/config/application/IncludeProcessorTest.java b/config-application-package/src/test/java/com/yahoo/config/application/IncludeProcessorTest.java
index 3076c5df9d6..dbc85dfb821 100644
--- a/config-application-package/src/test/java/com/yahoo/config/application/IncludeProcessorTest.java
+++ b/config-application-package/src/test/java/com/yahoo/config/application/IncludeProcessorTest.java
@@ -29,7 +29,7 @@ public class IncludeProcessorTest {
         String expected =
                 """
                 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-                <!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --><services xmlns:deploy="vespa" xmlns:preprocess="properties" version="1.0">
+                <!-- Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --><services xmlns:deploy="vespa" xmlns:preprocess="properties" version="1.0">
                     <preprocess:properties>
                         <qrs.port>4099</qrs.port>
                         <qrs.port>5000</qrs.port>
diff --git a/config-application-package/src/test/java/com/yahoo/config/application/XmlPreprocessorTest.java b/config-application-package/src/test/java/com/yahoo/config/application/XmlPreprocessorTest.java
index e6a40e874c0..b187c4c8837 100644
--- a/config-application-package/src/test/java/com/yahoo/config/application/XmlPreprocessorTest.java
+++ b/config-application-package/src/test/java/com/yahoo/config/application/XmlPreprocessorTest.java
@@ -24,7 +24,7 @@ public class XmlPreprocessorTest {
         String expectedDev =
                 """
                 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-                <!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+                <!-- Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
                 <services xmlns:deploy="vespa" xmlns:preprocess="properties" version="1.0">
                     <admin version="2.0">
                         <adminserver hostalias="node0"/>
@@ -60,7 +60,7 @@ public class XmlPreprocessorTest {
         String expectedStaging =
                 """
                 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-                <!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+                <!-- Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
                 <services xmlns:deploy="vespa" xmlns:preprocess="properties" version="1.0">
                     <admin version="2.0">
                         <adminserver hostalias="node0"/>
@@ -93,7 +93,7 @@ public class XmlPreprocessorTest {
         String expectedPerfUsWest =
                 """
                 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-                <!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+                <!-- Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
                 <services xmlns:deploy="vespa" xmlns:preprocess="properties" version="1.0">
                     <admin version="2.0">
                         <adminserver hostalias="node0"/>
@@ -126,7 +126,7 @@ public class XmlPreprocessorTest {
         String expectedPerfUsEastAndCentral =
                 """
                 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-                <!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+                <!-- Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
                 <services xmlns:deploy="vespa" xmlns:preprocess="properties" version="1.0">
                     <admin version="2.0">
                         <adminserver hostalias="node0"/>
@@ -167,7 +167,7 @@ public class XmlPreprocessorTest {
         String expectedProdUsWest =
                 """
                 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-                <!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+                <!-- Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
                 <services xmlns:deploy="vespa" xmlns:preprocess="properties" version="1.0">
                     <admin version="2.0">
                         <adminserver hostalias="node0"/>
@@ -209,7 +209,7 @@ public class XmlPreprocessorTest {
         String expectedProdUsEastAndCentral =
                 """
                 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-                <!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+                <!-- Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
                 <services xmlns:deploy="vespa" xmlns:preprocess="properties" version="1.0">
                     <admin version="2.0">
                         <adminserver hostalias="node1"/>
diff --git a/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java b/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java
index b9dc030e4cd..c93e1a16726 100644
--- a/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java
+++ b/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java
@@ -43,7 +43,7 @@ public class FilesApplicationPackageTest {
         assertTrue(new File(appDir, ".preprocessed").exists());
         String expectedServices = """
                                   <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-                                  <!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+                                  <!-- Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
                                   <services xmlns:deploy="vespa" xmlns:preprocess="properties" version="1.0">
                                       <admin version="2.0">
                                           <adminserver hostalias="node0"/>
@@ -69,7 +69,7 @@ public class FilesApplicationPackageTest {
         TestBase.assertDocument(expectedServices, processed.getServices());
         String expectedHosts = """
                                <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-                               <!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+                               <!-- Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
                                <hosts xmlns:deploy="vespa" xmlns:preprocess="properties">
                                    <host name="bar.yahoo.com">
                                        <alias>node1</alias>
-- 
cgit v1.2.3