diff options
Diffstat (limited to 'tools/tools-common/src')
-rw-r--r-- | tools/tools-common/src/main/java/org/onap/policy/apex/tools/common/OutputFile.java | 5 | ||||
-rw-r--r-- | tools/tools-common/src/test/java/org/onap/policy/apex/tools/common/OutputFileTest.java | 83 |
2 files changed, 84 insertions, 4 deletions
diff --git a/tools/tools-common/src/main/java/org/onap/policy/apex/tools/common/OutputFile.java b/tools/tools-common/src/main/java/org/onap/policy/apex/tools/common/OutputFile.java index 59d15d19d..5b386861a 100644 --- a/tools/tools-common/src/main/java/org/onap/policy/apex/tools/common/OutputFile.java +++ b/tools/tools-common/src/main/java/org/onap/policy/apex/tools/common/OutputFile.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * Modifications Copyright (c) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -116,10 +117,6 @@ public class OutputFile { * @return null on success, an error message on error */ public String validate() { - if (StringUtils.isBlank(fileName)) { - return "file name was blank"; - } - final File file = toFile(); if (file.exists()) { if (!overwrite) { diff --git a/tools/tools-common/src/test/java/org/onap/policy/apex/tools/common/OutputFileTest.java b/tools/tools-common/src/test/java/org/onap/policy/apex/tools/common/OutputFileTest.java new file mode 100644 index 000000000..36c64e517 --- /dev/null +++ b/tools/tools-common/src/test/java/org/onap/policy/apex/tools/common/OutputFileTest.java @@ -0,0 +1,83 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (c) 2020 Nordix Foundation. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ +package org.onap.policy.apex.tools.common; + +import static org.junit.Assert.*; + +import java.io.File; +import java.nio.file.FileSystems; +import java.nio.file.Path; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class OutputFileTest { + + final String testFileName = "testing.txt"; + final Path fp = FileSystems.getDefault().getPath(testFileName); + File file = fp.toFile(); + + @Before + public void setUp() { + if (file.exists()){ + file.delete(); + } + } + + @Test + public void testToWriter() { + OutputFile testFile = new OutputFile(testFileName,false); + testFile.validate(); + file.setReadable(false); + file.setWritable(false); + assertNull(testFile.toWriter()); + file.setWritable(true); + assertNotNull(testFile.toWriter()); + } + + @Test + public void testValidate() { + OutputFile testFile = new OutputFile(testFileName,true); + assertNull(testFile.validate()); + file.setReadable(false); + file.setWritable(false); + assertNotNull(testFile.validate()); + OutputFile testFile2 = new OutputFile(testFileName); + assertNotNull(testFile2.validate()); + assertEquals("file already exists",testFile2.validate()); + } + + @Test + public void testToOutputStream() { + OutputFile testFile = new OutputFile(testFileName,true); + assertNotNull(testFile.toOutputStream()); + file.setReadable(false); + file.setWritable(false); + assertNull(testFile.toOutputStream()); + } + + @After + public void testDown() { + if (file.exists()){ + file.delete(); + } + } +} |