diff options
Diffstat (limited to 'configserver/src/test')
3 files changed, 12 insertions, 14 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileDBRegistryTestCase.java b/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileDBRegistryTestCase.java index cdb01f2013b..6d7074aef3c 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileDBRegistryTestCase.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileDBRegistryTestCase.java @@ -27,7 +27,7 @@ public class FileDBRegistryTestCase { private static final String NO_FOO_FILE = "files/no_foo.json"; private static final String BOO_FILE = "/files/no_foo.json"; private static final String BAR_FILE = "../files/no_foo.json"; - private static final String BLOB_NAME = "myblob.name"; + private static final String BLOB_NAME = "././myblob.name"; private static final FileReference BLOB_REF = new FileReference("12f292a25163dd9"); private static final FileReference FOO_REF = new FileReference("b5ce94ca1feae86c"); @@ -54,7 +54,7 @@ public class FileDBRegistryTestCase { fileRegistry.addFile(BAR_FILE); fail(); } catch (IllegalArgumentException e) { - assertEquals("src/test/apps/zkapp/../files/no_foo.json is not a descendant of src/test/apps/zkapp", e.getMessage()); + assertEquals("'..' is not allowed in path", e.getMessage()); } assertEquals(BLOB_REF, fileRegistry.addBlob(BLOB_NAME, ByteBuffer.wrap(BLOB.getBytes(StandardCharsets.UTF_8)))); String serializedRegistry = FileDBRegistry.exportRegistry(fileRegistry); @@ -78,4 +78,5 @@ public class FileDBRegistryTestCase { void checkConsistentEntry(FileRegistry.Entry entry, FileRegistry registry) { assertEquals(entry.reference, registry.addFile(entry.relativePath)); } + } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/MockFileDistributionFactory.java b/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/MockFileDistributionFactory.java index 3ac621f7ac4..6c65a2dee81 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/MockFileDistributionFactory.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/MockFileDistributionFactory.java @@ -17,7 +17,7 @@ public class MockFileDistributionFactory extends FileDistributionFactory { @Override public FileRegistry createFileRegistry(File applicationPackage) { - return new MockFileRegistry(applicationPackage, getFileReferencesDir().toPath()); + return new MockFileRegistry(applicationPackage, getFileReferencesDir()); } @Override diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/MockFileRegistry.java b/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/MockFileRegistry.java index be2d087478d..9a9c224627a 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/MockFileRegistry.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/MockFileRegistry.java @@ -3,11 +3,11 @@ package com.yahoo.vespa.config.server.filedistribution; import com.yahoo.config.FileReference; import com.yahoo.config.application.api.FileRegistry; +import com.yahoo.path.Path; import java.io.File; import java.io.IOException; import java.nio.ByteBuffer; -import java.nio.file.Path; import java.util.ArrayList; import java.util.List; @@ -21,18 +21,15 @@ public class MockFileRegistry implements FileRegistry { private final List<Entry> entries = new ArrayList<>(); private final AddFileInterface addFileInterface; - public MockFileRegistry(File applicationDir, Path rootPath) { - FileDirectory fileDirectory = new FileDirectory(rootPath.toFile()); + public MockFileRegistry(File applicationDir, File rootPath) { + FileDirectory fileDirectory = new FileDirectory(rootPath); this.addFileInterface = new ApplicationFileManager(applicationDir, fileDirectory); } public FileReference addFile(String relativePath) { - if (relativePath.isEmpty()) - relativePath = "./"; - + if (relativePath.isEmpty()) relativePath = "./"; try { - addFileInterface.addFile(relativePath); - + addFileInterface.addFile(Path.fromString(relativePath)); FileReference fileReference = new FileReference(relativePath); entries.add(new Entry(relativePath, fileReference)); return fileReference; @@ -50,10 +47,10 @@ public class MockFileRegistry implements FileRegistry { @Override public FileReference addBlob(String name, ByteBuffer blob) { - String relativePath = "./" + name; - FileReference fileReference = addFileInterface.addBlob(blob, relativePath); + name = "./" + name; + FileReference fileReference = addFileInterface.addBlob(blob, Path.fromString(name)); - entries.add(new Entry(relativePath, fileReference)); + entries.add(new Entry(name, fileReference)); return fileReference; } |