From 4da15282e4715d6b359873f260399a7b9a3d8666 Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Mon, 6 Aug 2018 15:51:35 +0300 Subject: Revert commit Fixes of sonar violations sdc and refactor This reverts commit baf7f0a965d0ffebd5308d44758bfa9ba96c0c76. except the catalog files. the onbording files will be resubmited. Change-Id: I84c00cec41665211e0bd16ff9cc0c87073d6b897 Issue-ID: SDC-1484 Signed-off-by: Michael Lando --- .../onap/config/type/NonConfigResourceTest.java | 82 ---------------------- 1 file changed, 82 deletions(-) delete mode 100644 common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/type/NonConfigResourceTest.java (limited to 'common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org') diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/type/NonConfigResourceTest.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/type/NonConfigResourceTest.java deleted file mode 100644 index 0671996fb5..0000000000 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/type/NonConfigResourceTest.java +++ /dev/null @@ -1,82 +0,0 @@ -package org.onap.config.type; - -import com.google.common.collect.ImmutableMap; -import org.junit.Test; -import org.onap.config.NonConfigResource; - -import java.io.File; -import java.net.MalformedURLException; -import java.net.URISyntaxException; -import java.net.URL; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Map; - -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - -public class NonConfigResourceTest { - - private final URL sampleUrlResource = NonConfigResourceTest.class.getResource("NonConfigResourceTest.class"); - private final String sampleResourcePath = sampleUrlResource.getPath(); - private final File sampleResourceFile = new File(sampleResourcePath); - - @Test - public void testShouldLocateResourceWhenAbsPathProvided2() { - Map properties = ImmutableMap.of(); - Path actualResourcePath = NonConfigResource.create(properties::get).locate(sampleResourceFile.toString()); - - assertTrue(actualResourcePath.compareTo(sampleResourceFile.toPath()) == 0); - } - - @Test - public void testShouldLocateResourceWhenPresentInFiles2() { - Map properties = ImmutableMap.of(); - NonConfigResource testedObject = NonConfigResource.create(properties::get); - testedObject.add(sampleResourceFile); - - Path thisFilePath = testedObject.locate("NonConfigResourceTest.class"); - - assertTrue(thisFilePath.compareTo(sampleResourceFile.toPath()) == 0); - } - - @Test - public void testShouldLocateResourceWhenNodeConfigPropertyIsSet2() throws URISyntaxException, MalformedURLException { - Map properties = ImmutableMap.of("node.config.location", new File(sampleResourcePath).getParentFile().getPath()); - NonConfigResource testedNonConfigResource = NonConfigResource.create(properties::get); - System.getProperties().setProperty("node.config.location", new File(sampleResourcePath).getParentFile().getPath()); - Path thisFilePath = testedNonConfigResource.locate("NonConfigResourceTest.class"); - - assertTrue(thisFilePath.compareTo(new File(sampleResourcePath).toPath()) == 0); - } - - @Test - public void testShouldLocateResourceWhenConfigPropertyIsSet2() { - Map properties = ImmutableMap.of("config.location", new File(sampleResourcePath).getParentFile().getPath()); - NonConfigResource testedNonConfigResource = NonConfigResource.create(properties::get); - Path thisFilePath = testedNonConfigResource.locate("NonConfigResourceTest.class"); - - assertTrue(thisFilePath.compareTo(new File(sampleResourcePath).toPath()) == 0); - } - - @Test - public void testShouldLocatePathWhenResourcePresentInUrls2() throws URISyntaxException { - Map properties = ImmutableMap.of(); - NonConfigResource testedObject = NonConfigResource.create(properties::get); - testedObject.add(sampleUrlResource); - - Path thisFilePath = testedObject.locate("NonConfigResourceTest.class"); - - assertTrue(thisFilePath.compareTo(Paths.get(sampleUrlResource.toURI())) == 0); - } - - @Test - public void testShouldNotLocateResource2() throws URISyntaxException { - Map properties = ImmutableMap.of(); - NonConfigResource testedObject = NonConfigResource.create(properties::get); - - Path thisFilePath = testedObject.locate("nonexistingresource"); - - assertNull(thisFilePath); - } -} -- cgit 1.2.3-korg