diff options
author | Michael Dürre <michael.duerre@highstreet-technologies.com> | 2020-07-16 05:55:07 +0200 |
---|---|---|
committer | Michael Dürre <michael.duerre@highstreet-technologies.com> | 2020-07-16 05:55:21 +0200 |
commit | 7dbe38ba0522b346a0fcd9851e797f0fd71ecd5e (patch) | |
tree | cc19db7e0637c8e392d40cdf3a53bb5e5f3e0d30 /sdnr/wt/odlux/core/provider/src/test/java | |
parent | 25b3759a0907d06e0d8e391f751c6fcf067087f5 (diff) |
switch to rfc8040 restconf
change rest interface and some small code cleanups
Issue-ID: CCSDK-2572
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
Change-Id: I3475bd2574b32950c4bf84fbd1c2a9dac9af208a
Diffstat (limited to 'sdnr/wt/odlux/core/provider/src/test/java')
4 files changed, 36 insertions, 42 deletions
diff --git a/sdnr/wt/odlux/core/provider/src/test/java/org/onap/ccsdk/features/sdnr/odlux/test/TestBundleLoaderImpl.java b/sdnr/wt/odlux/core/provider/src/test/java/org/onap/ccsdk/features/sdnr/odlux/test/TestBundleLoaderImpl.java index c973d530b..3d817a2d2 100644 --- a/sdnr/wt/odlux/core/provider/src/test/java/org/onap/ccsdk/features/sdnr/odlux/test/TestBundleLoaderImpl.java +++ b/sdnr/wt/odlux/core/provider/src/test/java/org/onap/ccsdk/features/sdnr/odlux/test/TestBundleLoaderImpl.java @@ -20,7 +20,6 @@ package org.onap.ccsdk.features.sdnr.odlux.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; - import org.junit.Test; import org.onap.ccsdk.features.sdnr.wt.odlux.OdluxBundleLoaderImpl; import org.onap.ccsdk.features.sdnr.wt.odlux.model.bundles.OdluxBundle; @@ -45,10 +44,10 @@ public class TestBundleLoaderImpl { bundle2.initialize(); assertNotNull(bundle1.getResourceFileContent("index.html")); assertNotNull(bundle2.getResourceFileContent("index2.html")); - assertEquals(loaded+2, loader.getNumberOfBundles()); + assertEquals(loaded + 2, loader.getNumberOfBundles()); loader.addBundle(bundle1); loader.addBundle(bundle2); - assertEquals(loaded+2, loader.getNumberOfBundles()); + assertEquals(loaded + 2, loader.getNumberOfBundles()); loader.removeBundle(bundle1); loader.removeBundle(bundle2); assertEquals(loaded, loader.getNumberOfBundles()); @@ -56,10 +55,10 @@ public class TestBundleLoaderImpl { assertTrue(bundle1.hasResource("index.html")); assertTrue(bundle2.hasResource("index2.html")); assertNotNull(bundle1.getLoader()); - assertEquals(0,bundle1.getIndex()); + assertEquals(0, bundle1.getIndex()); bundle1.clean(); bundle2.clean(); - assertEquals(loaded,loader.getNumberOfBundles()); + assertEquals(loaded, loader.getNumberOfBundles()); } diff --git a/sdnr/wt/odlux/core/provider/src/test/java/org/onap/ccsdk/features/sdnr/odlux/test/TestLoadResources.java b/sdnr/wt/odlux/core/provider/src/test/java/org/onap/ccsdk/features/sdnr/odlux/test/TestLoadResources.java index d9cd920de..bef3dba28 100644 --- a/sdnr/wt/odlux/core/provider/src/test/java/org/onap/ccsdk/features/sdnr/odlux/test/TestLoadResources.java +++ b/sdnr/wt/odlux/core/provider/src/test/java/org/onap/ccsdk/features/sdnr/odlux/test/TestLoadResources.java @@ -16,11 +16,10 @@ * ============LICENSE_END========================================================================== */ package org.onap.ccsdk.features.sdnr.odlux.test; -import static org.junit.Assert.*; +import static org.junit.Assert.*; import java.util.regex.Matcher; import java.util.regex.Pattern; - import org.junit.Test; import org.onap.ccsdk.features.sdnr.wt.odlux.ResFilesServlet; @@ -29,15 +28,16 @@ public class TestLoadResources { @Test public void test() { ResFilesServlet servlet = new ResFilesServlet(); - String indexhtml=null; - indexhtml=servlet.loadFileContent("odlux/index.html"); + String indexhtml = null; + indexhtml = servlet.loadFileContent("odlux/index.html"); assertNotNull(indexhtml); final String regex = "require\\(\\[.*\"run\".*\\]"; - final Pattern pattern = Pattern.compile(regex,Pattern.MULTILINE); + final Pattern pattern = Pattern.compile(regex, Pattern.MULTILINE); System.out.println(indexhtml); final Matcher matcher = pattern.matcher(indexhtml); - assertTrue("Can not find patter '"+regex+"'",matcher.find()); + assertTrue("Can not find patter '" + regex + "'", matcher.find()); } + @Test public void test2() { diff --git a/sdnr/wt/odlux/core/provider/src/test/java/org/onap/ccsdk/features/sdnr/odlux/test/TestRedirect.java b/sdnr/wt/odlux/core/provider/src/test/java/org/onap/ccsdk/features/sdnr/odlux/test/TestRedirect.java index bbf542441..68bcae547 100644 --- a/sdnr/wt/odlux/core/provider/src/test/java/org/onap/ccsdk/features/sdnr/odlux/test/TestRedirect.java +++ b/sdnr/wt/odlux/core/provider/src/test/java/org/onap/ccsdk/features/sdnr/odlux/test/TestRedirect.java @@ -18,40 +18,36 @@ package org.onap.ccsdk.features.sdnr.odlux.test; import static org.junit.Assert.*; - +import static org.mockito.Mockito.*; import org.junit.Test; import org.onap.ccsdk.features.sdnr.wt.odlux.IndexServlet; - -import static org.mockito.Mockito.*; - import java.io.IOException; - import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; public class TestRedirect { - private static final int RESPONSECODE_REDIRECT = 301; - - @Test - public void test() { - PublicIndexServlet servlet =new PublicIndexServlet(); - HttpServletRequest req = mock(HttpServletRequest.class); - HttpServletResponse resp = mock(HttpServletResponse.class); - try { - servlet.doGet(req,resp); - } catch (Exception e) { - fail(e.getMessage()); - } - verify(resp).setStatus(RESPONSECODE_REDIRECT); - } - - private static class PublicIndexServlet extends IndexServlet{ - @Override - public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - super.doGet(req, resp); - } - } + private static final int RESPONSECODE_REDIRECT = 301; + + @Test + public void test() { + PublicIndexServlet servlet = new PublicIndexServlet(); + HttpServletRequest req = mock(HttpServletRequest.class); + HttpServletResponse resp = mock(HttpServletResponse.class); + try { + servlet.doGet(req, resp); + } catch (Exception e) { + fail(e.getMessage()); + } + verify(resp).setStatus(RESPONSECODE_REDIRECT); + } + + private static class PublicIndexServlet extends IndexServlet { + @Override + public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + super.doGet(req, resp); + } + } } diff --git a/sdnr/wt/odlux/core/provider/src/test/java/org/onap/ccsdk/features/sdnr/odlux/test/TestResFileServlet.java b/sdnr/wt/odlux/core/provider/src/test/java/org/onap/ccsdk/features/sdnr/odlux/test/TestResFileServlet.java index 0490c80d5..6d537e38b 100644 --- a/sdnr/wt/odlux/core/provider/src/test/java/org/onap/ccsdk/features/sdnr/odlux/test/TestResFileServlet.java +++ b/sdnr/wt/odlux/core/provider/src/test/java/org/onap/ccsdk/features/sdnr/odlux/test/TestResFileServlet.java @@ -18,18 +18,16 @@ package org.onap.ccsdk.features.sdnr.odlux.test; import static org.junit.Assert.*; - +import static org.mockito.Mockito.*; import java.io.IOException; import java.io.StringWriter; import java.net.HttpURLConnection; - import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; import javax.servlet.WriteListener; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import static org.mockito.Mockito.*; import org.junit.Test; import org.onap.ccsdk.features.sdnr.wt.odlux.OdluxBundleLoaderImpl; import org.onap.ccsdk.features.sdnr.wt.odlux.ResFilesServlet; @@ -43,7 +41,7 @@ public class TestResFileServlet { @Test public void test() throws ServletException { servlet = new PublicResFilesServlet(); - servlet.init(); + servlet.init(); OdluxBundleLoader loader = OdluxBundleLoaderImpl.getInstance(); OdluxBundle b = new OdluxBundle(); @@ -96,9 +94,10 @@ public class TestResFileServlet { public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { super.doGet(req, resp); } + @Override public String getMimeType(String fileName) { - return "mimetype"; + return "mimetype"; } } } |