SDNR Add missing status bar to ODLUX Framework

Modify framework and adapt all apps

Issue-ID: SDNC-789
Signed-off-by: Herbert Eiselt <herbert.eiselt@highstreet-technologies.com>
Change-Id: I1ea0a3df6c3f6db08f2bd7a21eb3b4cbf230a08a
Signed-off-by: Herbert Eiselt <herbert.eiselt@highstreet-technologies.com>

1 files changed, 24 insertions, 13 deletions

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 287ed70d9..217735c40 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
@@ -21,7 +21,9 @@ import static org.junit.Assert.*;
 
 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;
@@ -38,6 +40,24 @@ public class TestResFileServlet {
 
     PublicResFilesServlet servlet;
 
+    @Test
+    public void test() throws ServletException {
+        servlet = new PublicResFilesServlet();
+		servlet.init();
+
+        OdluxBundleLoader loader = OdluxBundleLoaderImpl.getInstance();
+        OdluxBundle b = new OdluxBundle();
+        b.setBundleName("b1");
+        b.setIndex(9);
+        b.setLoader(loader);
+        b.initialize();
+        System.out.println("Subtest1");
+        testResReq("odlux/index.html", HttpURLConnection.HTTP_OK);
+        System.out.println("Subtest2");
+        testResReq("odlux/fragmich.txt", HttpURLConnection.HTTP_NOT_FOUND);
+        System.out.println("Done");
+    }
+
     private void testResReq(String res, int responseCode) {
         HttpServletRequest req = mock(HttpServletRequest.class);
         HttpServletResponse resp = mock(HttpServletResponse.class);
@@ -69,19 +89,6 @@ public class TestResFileServlet {
         verify(resp).setStatus(responseCode);
     }
 
-    @Test
-    public void test() {
-        servlet = new PublicResFilesServlet();
-        OdluxBundleLoader loader = OdluxBundleLoaderImpl.getInstance();
-        OdluxBundle b = new OdluxBundle();
-        b.setBundleName("b1");
-        b.setIndex(9);
-        b.setLoader(loader);
-        b.initialize();
-        testResReq("odlux/index.html", 200);
-        testResReq("odlux/fragmich.txt", 404);
-
-    }
 
     @SuppressWarnings("serial")
     private class PublicResFilesServlet extends ResFilesServlet {
@@ -89,5 +96,9 @@ 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";
+        }
     }
 }