remove old version

of devicemodel devicemanager oldux featureaggregator

Issue-ID: SDNC-1004
Signed-off-by: herbert <herbert.eiselt@highstreet-technologies.com>
Change-Id: I5337643181e2398e5a8097e4ee14fa4ac96d0d4c

4 files changed, 0 insertions, 273 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
deleted file mode 100644
index bebbffdcf..000000000
--- a/sdnr/wt/odlux/core/provider/src/test/java/org/onap/ccsdk/features/sdnr/odlux/test/TestBundleLoaderImpl.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * 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.
- * ============LICENSE_END==========================================================================
- ******************************************************************************/
-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;
-import org.onap.ccsdk.features.sdnr.wt.odlux.model.bundles.OdluxBundleLoader;
-
-public class TestBundleLoaderImpl {
-
-    @Test
-    public void test() {
-        OdluxBundleLoader loader = OdluxBundleLoaderImpl.getInstance();
-        int loaded = loader.getNumberOfBundles();
-
-        OdluxBundle bundle1 = new OdluxBundle();
-        bundle1.setBundleName("b1");
-        bundle1.setIndex(0);
-        bundle1.setLoader(loader);
-        OdluxBundle bundle2 = new OdluxBundle();
-        bundle2.setBundleName("b2");
-        bundle2.setIndex(55);
-        bundle2.setLoader(loader);
-        bundle1.initialize();
-        bundle2.initialize();
-        assertNotNull(bundle1.getResourceFileContent("index.html"));
-        assertNotNull(bundle2.getResourceFileContent("index2.html"));
-        assertEquals(loaded+2, loader.getNumberOfBundles());
-        loader.addBundle(bundle1);
-        loader.addBundle(bundle2);
-        assertEquals(loaded+2, loader.getNumberOfBundles());
-        loader.removeBundle(bundle1);
-        loader.removeBundle(bundle2);
-        assertEquals(loaded, loader.getNumberOfBundles());
-
-        assertTrue(bundle1.hasResource("index.html"));
-        assertTrue(bundle2.hasResource("index2.html"));
-        assertNotNull(bundle1.getLoader());
-        assertEquals(0,bundle1.getIndex());
-        bundle1.clean();
-        bundle2.clean();
-        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
deleted file mode 100644
index 3c9ad4308..000000000
--- a/sdnr/wt/odlux/core/provider/src/test/java/org/onap/ccsdk/features/sdnr/odlux/test/TestLoadResources.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * 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.
- * ============LICENSE_END==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.odlux.test;
-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;
-
-public class TestLoadResources {
-
-    @Test
-    public void test() {
-        ResFilesServlet servlet = new ResFilesServlet();
-        String indexhtml=null;
-        indexhtml=servlet.loadFileContent("odlux/index.html");
-        assertNotNull(indexhtml);
-        final String regex = "require\\(\\[.*\"run\".*\\]";
-        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());
-    }
-    @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
deleted file mode 100644
index 78d5eb8fe..000000000
--- a/sdnr/wt/odlux/core/provider/src/test/java/org/onap/ccsdk/features/sdnr/odlux/test/TestRedirect.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * 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.
- * ============LICENSE_END==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.odlux.test;
-
-import static org.junit.Assert.*;
-
-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);
-		}
-	}
-
-}
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
deleted file mode 100644
index 217735c40..000000000
--- a/sdnr/wt/odlux/core/provider/src/test/java/org/onap/ccsdk/features/sdnr/odlux/test/TestResFileServlet.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * 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.
- * ============LICENSE_END==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.odlux.test;
-
-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;
-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;
-import org.onap.ccsdk.features.sdnr.wt.odlux.model.bundles.OdluxBundle;
-import org.onap.ccsdk.features.sdnr.wt.odlux.model.bundles.OdluxBundleLoader;
-
-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);
-        when(req.getRequestURI()).thenReturn(res);
-        StringWriter out = new StringWriter();
-        ServletOutputStream printOut = new ServletOutputStream() {
-
-            @Override
-            public void write(int arg0) throws IOException {
-                out.write(arg0);
-            }
-
-            @Override
-            public boolean isReady() {
-                return false;
-            }
-
-            @Override
-            public void setWriteListener(WriteListener writeListener) {
-
-            }
-        };
-        try {
-            when(resp.getOutputStream()).thenReturn(printOut);
-            servlet.doGet(req, resp);
-        } catch (ServletException | IOException e) {
-            fail(e.getMessage());
-        }
-        verify(resp).setStatus(responseCode);
-    }
-
-
-    @SuppressWarnings("serial")
-    private class PublicResFilesServlet extends ResFilesServlet {
-        @Override
-        public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-            super.doGet(req, resp);
-        }
-        @Override
-        public String getMimeType(String fileName) {
-        	return "mimetype";
-        }
-    }
-}