summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2022-06-08 08:34:35 +0200
committergjoranv <gv@verizonmedia.com>2022-06-08 11:45:32 +0200
commit789634f8caa3319d0498577985e4a09165b7f713 (patch)
treec092d65f6b6624c5a861ce215d9d83b521724d3a /controller-server
parentcf8562045b641389a7b728e1d8e5a586590c63c4 (diff)
Use 'schemas'
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java2
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java
index b0ba4287e89..ea8f4db0346 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java
@@ -342,7 +342,7 @@ public class ApplicationPackageBuilder {
out.setLevel(Deflater.NO_COMPRESSION); // This is for testing purposes so we skip compression for performance
writeZipEntry(out, "deployment.xml", deploymentSpec());
writeZipEntry(out, "validation-overrides.xml", validationOverrides());
- writeZipEntry(out, "search-definitions/test.sd", searchDefinition());
+ writeZipEntry(out, "schemas/test.sd", searchDefinition());
writeZipEntry(out, "build-meta.json", buildMeta(compileVersion));
if (!trustedCertificates.isEmpty()) {
writeZipEntry(out, "security/clients.pem", X509CertificateUtils.toPem(trustedCertificates).getBytes(UTF_8));
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
index 6bfbb044944..d9f0f010104 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
@@ -305,7 +305,7 @@ public class ApplicationApiTest extends ControllerContainerTest {
tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/instance/myuser/job/dev-us-east-1/diff/1", GET).userIdentity(HOSTED_VESPA_OPERATOR),
(response) -> assertTrue(response.getBodyAsString(),
- response.getBodyAsString().contains("--- search-definitions/test.sd\n" +
+ response.getBodyAsString().contains("--- schemas/test.sd\n" +
"@@ -1,0 +1,1 @@\n" +
"+ search test { }\n")),
200);