From e1f64b59b76a923e3136d83d839c078ce5168907 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 16 Sep 2022 19:39:05 +0200
Subject: [PATCH] Remove aaa.web.tests

Unit tests should be in the same package, fix that up.

Change-Id: I6e41daecd47065be6fd60dc2eb8c57813861e3a8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../aaa/web/{tests => }/FilterDetailsTest.java           | 9 ++-------
 .../aaa/web/{tests => }/ServletDetailsTest.java          | 8 ++------
 .../aaa/web/{tests => }/WebContextApiTest.java           | 7 +------
 3 files changed, 5 insertions(+), 19 deletions(-)
 rename web/api/src/test/java/org/opendaylight/aaa/web/{tests => }/FilterDetailsTest.java (90%)
 rename web/api/src/test/java/org/opendaylight/aaa/web/{tests => }/ServletDetailsTest.java (90%)
 rename web/api/src/test/java/org/opendaylight/aaa/web/{tests => }/WebContextApiTest.java (94%)

diff --git a/web/api/src/test/java/org/opendaylight/aaa/web/tests/FilterDetailsTest.java b/web/api/src/test/java/org/opendaylight/aaa/web/FilterDetailsTest.java
similarity index 90%
rename from web/api/src/test/java/org/opendaylight/aaa/web/tests/FilterDetailsTest.java
rename to web/api/src/test/java/org/opendaylight/aaa/web/FilterDetailsTest.java
index b5fea2900..2fd6c20da 100644
--- a/web/api/src/test/java/org/opendaylight/aaa/web/tests/FilterDetailsTest.java
+++ b/web/api/src/test/java/org/opendaylight/aaa/web/FilterDetailsTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.aaa.web.tests;
+package org.opendaylight.aaa.web;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThrows;
@@ -14,10 +14,8 @@ import static org.mockito.Mockito.mock;
 
 import javax.servlet.Filter;
 import org.junit.Test;
-import org.opendaylight.aaa.web.FilterDetails;
 
 public class FilterDetailsTest {
-
     @Test
     public void testDefaultValue() {
         FilterDetails filterDetails = FilterDetails.builder()
@@ -61,9 +59,6 @@ public class FilterDetailsTest {
 
     @Test
     public void testException() {
-        assertThrows(IllegalStateException.class, () -> {
-            FilterDetails.builder().build();
-        });
+        assertThrows(IllegalStateException.class, () -> FilterDetails.builder().build());
     }
-
 }
diff --git a/web/api/src/test/java/org/opendaylight/aaa/web/tests/ServletDetailsTest.java b/web/api/src/test/java/org/opendaylight/aaa/web/ServletDetailsTest.java
similarity index 90%
rename from web/api/src/test/java/org/opendaylight/aaa/web/tests/ServletDetailsTest.java
rename to web/api/src/test/java/org/opendaylight/aaa/web/ServletDetailsTest.java
index 5f2018607..a57a6c97a 100644
--- a/web/api/src/test/java/org/opendaylight/aaa/web/tests/ServletDetailsTest.java
+++ b/web/api/src/test/java/org/opendaylight/aaa/web/ServletDetailsTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.aaa.web.tests;
+package org.opendaylight.aaa.web;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThrows;
@@ -14,10 +14,8 @@ import static org.mockito.Mockito.mock;
 
 import javax.servlet.Servlet;
 import org.junit.Test;
-import org.opendaylight.aaa.web.ServletDetails;
 
 public class ServletDetailsTest {
-
     @Test
     public void testDefaultValue() {
         ServletDetails servletDetails = ServletDetails.builder()
@@ -61,8 +59,6 @@ public class ServletDetailsTest {
 
     @Test
     public void testException() {
-        assertThrows(IllegalStateException.class, () -> {
-            ServletDetails.builder().build();
-        });
+        assertThrows(IllegalStateException.class, () -> ServletDetails.builder().build());
     }
 }
diff --git a/web/api/src/test/java/org/opendaylight/aaa/web/tests/WebContextApiTest.java b/web/api/src/test/java/org/opendaylight/aaa/web/WebContextApiTest.java
similarity index 94%
rename from web/api/src/test/java/org/opendaylight/aaa/web/tests/WebContextApiTest.java
rename to web/api/src/test/java/org/opendaylight/aaa/web/WebContextApiTest.java
index 9e225941d..12ae81413 100644
--- a/web/api/src/test/java/org/opendaylight/aaa/web/tests/WebContextApiTest.java
+++ b/web/api/src/test/java/org/opendaylight/aaa/web/WebContextApiTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.aaa.web.tests;
+package org.opendaylight.aaa.web;
 
 import static org.hamcrest.CoreMatchers.startsWith;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -21,11 +21,6 @@ import javax.servlet.Servlet;
 import javax.servlet.ServletContextListener;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.opendaylight.aaa.web.FilterDetails;
-import org.opendaylight.aaa.web.ServletDetails;
-import org.opendaylight.aaa.web.WebContext;
-import org.opendaylight.aaa.web.WebContextBuilder;
-import org.opendaylight.aaa.web.WebServer;
 
 /**
  * Tests for Web Server {@link WebContext} API. These tests don't test an
-- 
2.36.6