move dir

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
opensearch-project · Apr 19, 2023 · 9891f85 · 9891f85
1 parent b12300c
commit 9891f85
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/...ity-shiro/src/internalClusterTest/java/org/opensearch/identity/BasicAuthenticationIT.java b/...ity-shiro/src/internalClusterTest/java/org/opensearch/identity/BasicAuthenticationIT.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.identity.shiro;
+package org.opensearch.identity;
 
 import org.opensearch.client.Request;
 import org.opensearch.client.RequestOptions;
@@ -23,7 +23,7 @@
 import static org.hamcrest.core.StringContains.containsString;
 import static org.junit.Assert.assertThat;
 
-@ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST, numDataNodes = 0)
+@OpenSearchIntegTestCase.ClusterScope(numDataNodes = 0, numClientNodes = 0, scope = OpenSearchIntegTestCase.Scope.TEST)
 public class BasicAuthenticationIT extends HttpSmokeTestCaseWithIdentity {
 
     public void testBasicAuthSuccess() throws Exception {
@@ -32,7 +32,6 @@ public void testBasicAuthSuccess() throws Exception {
 
         assertThat(content, response.getStatusLine().getStatusCode(), equalTo(RestStatus.OK.getStatus()));
         assertThat(content, containsString("green"));
-        System.out.println("Successfully passed assertions in basic auth success");
     }
 
     public void testBasicAuthUnauthorized_invalidHeader() throws Exception {

diff --git a/...o/src/internalClusterTest/java/org/opensearch/identity/HttpSmokeTestCaseWithIdentity.java b/...o/src/internalClusterTest/java/org/opensearch/identity/HttpSmokeTestCaseWithIdentity.java
@@ -6,10 +6,11 @@
  * compatible open source license.
  */
 
-package org.opensearch.identity.shiro;
+package org.opensearch.identity;
 
 import org.opensearch.common.network.NetworkModule;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.identity.shiro.ShiroIdentityPlugin;
 import org.opensearch.plugins.Plugin;
 import org.opensearch.test.OpenSearchIntegTestCase;
 import org.opensearch.transport.Netty4ModulePlugin;
@@ -27,6 +28,7 @@
  *
  * @opensearch.experimental
  */
+@OpenSearchIntegTestCase.ClusterScope(numDataNodes = 0, numClientNodes = 0, scope = OpenSearchIntegTestCase.Scope.TEST)
 public abstract class HttpSmokeTestCaseWithIdentity extends OpenSearchIntegTestCase {
 
     private static String nodeTransportTypeKey;