From f8000a9d35928f136216be504828ef9074dfb42a Mon Sep 17 00:00:00 2001 From: liamfallon Date: Thu, 23 Jan 2020 16:50:47 +0000 Subject: Remove apex-pdp TextFileUtils class This class was moved to policy-common some time ago. Removing it in apex-pdp. Issue-ID: POLICY-1913 Change-Id: I982fbd799334b34f1526e19f339236b52205b91e Signed-off-by: liamfallon --- .../apex/model/utilities/DirectoryUtilsTest.java | 18 +++++++++--------- .../policy/apex/model/utilities/TextFileUtilsTest.java | 9 ++++++--- 2 files changed, 15 insertions(+), 12 deletions(-) (limited to 'model/utilities/src/test') diff --git a/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/DirectoryUtilsTest.java b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/DirectoryUtilsTest.java index 95839cd72..c1d255c28 100644 --- a/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/DirectoryUtilsTest.java +++ b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/DirectoryUtilsTest.java @@ -1,19 +1,20 @@ /* * ============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. * 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========================================================= */ @@ -26,26 +27,25 @@ import java.nio.file.Files; import java.util.Arrays; import org.junit.Test; -import org.onap.policy.apex.model.utilities.DirectoryUtils; -import org.onap.policy.apex.model.utilities.TextFileUtils; +import org.onap.policy.common.utils.resources.TextFileUtils; public class DirectoryUtilsTest { @Test public void test() throws IOException { DirectoryUtils.emptyDirectory(new File("/i/dont/exist")); - + File tempDir = Files.createTempDirectory("test").toFile(); Files.createTempDirectory(tempDir.toPath(), "testsubprefix"); TextFileUtils.putStringAsTextFile("Temp File 0 contents", tempDir.getAbsolutePath() + "/tempFile0.tmp"); TextFileUtils.putStringAsTextFile("Temp File 1 contents", tempDir.getAbsolutePath() + "/tempFile1.tmp"); - + DirectoryUtils.emptyDirectory(tempDir); - + DirectoryUtils.getLocalTempDirectory(null); - + byte[] byteArray = new byte[] {0, 0, 0}; DirectoryUtils.getLocalTempDirectory(Arrays.toString(byteArray)); } diff --git a/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/TextFileUtilsTest.java b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/TextFileUtilsTest.java index d03dc7135..62f36946d 100644 --- a/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/TextFileUtilsTest.java +++ b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/TextFileUtilsTest.java @@ -1,19 +1,20 @@ /*- * ============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. * 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========================================================= */ @@ -27,9 +28,11 @@ import java.io.FileInputStream; import java.io.IOException; import org.junit.Test; +import org.onap.policy.common.utils.resources.TextFileUtils; /** * Test text file utilities. + * * @author Liam Fallon (liam.fallon@ericsson.com) */ public class TextFileUtilsTest { -- cgit 1.2.3-korg