More tests

Signed-off-by: Peter Nied <petern@amazon.com>

Author: peternied

server/src/internalClusterTest/java/org/opensearch/action/admin/indices/view/ViewIT.java

@@ -8,6 +8,7 @@
 
 package org.opensearch.action.admin.indices.view;
 
+import org.hamcrest.MatcherAssert;
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.index.IndexNotFoundException;
@@ -77,7 +78,7 @@ public void testBasicOperations() throws Exception {
         logger.info("Testing view with no matches");
         createView("no-matches", "this-pattern-will-match-nothing");
         final IndexNotFoundException ex = assertThrows(IndexNotFoundException.class, () -> searchView("no-matches"));
-        assertThat(ex.getMessage(), is("no such index [this-pattern-will-match-nothing]"));
+        MatcherAssert.assertThat(ex.getMessage(), is("no such index [this-pattern-will-match-nothing]"));
 
         logger.info("Testing view with exact index match");
         createView("only-index-1", "index-1");
@@ -93,24 +94,24 @@ public void testListViewNames() throws Exception {
         createView("view1", "*");
         final List<String> viewNames1 = listViews();
 
-        assertThat(viewNames1, contains("view1"));
+        MatcherAssert.assertThat(viewNames1, contains("view1"));
 
         logger.info("Create a second view");
         createView("view2", "*");
         final List<String> viewNames2 = listViews();
 
-        assertThat(viewNames2, contains("view1", "view2"));
+        MatcherAssert.assertThat(viewNames2, contains("view1", "view2"));
 
         logger.info("Delete a view");
         deleteView("view1");
         final List<String> viewNamesAfterDelete = listViews();
 
-        assertThat(viewNamesAfterDelete, contains("view2"));
+        MatcherAssert.assertThat(viewNamesAfterDelete, contains("view2"));
 
         logger.info("Update a view");
         client().admin().indices().updateView(new CreateViewAction.Request("view2", "newDescription", List.of()));
         final List<String> viewNamesAfterUpdate = listViews();
 
-        assertThat(viewNamesAfterUpdate, contains("view2"));
+        MatcherAssert.assertThat(viewNamesAfterUpdate, contains("view2"));
     }
 }

server/src/main/java/org/opensearch/action/admin/indices/view/ViewService.java

@@ -126,7 +126,7 @@ public void searchView(final SearchViewAction.Request request, final ActionListe
         client.executeLocally(SearchAction.INSTANCE, request, listener);
     }
 
-    private View getViewOrThrowException(final String viewName) {
+    View getViewOrThrowException(final String viewName) {
         return Optional.ofNullable(clusterService)
             .map(ClusterService::state)
             .map(ClusterState::metadata)
@@ -135,7 +135,7 @@ private View getViewOrThrowException(final String viewName) {
             .orElseThrow(() -> new ResourceNotFoundException("no such view [" + viewName + "]"));
     }
 
-    private static enum Operation {
+    private enum Operation {
         CreateView("create"),
         UpdateView("update");
 

server/src/test/java/org/opensearch/action/admin/indices/view/ViewServiceTest.java

@@ -0,0 +1,178 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.opensearch.action.admin.indices.view;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.opensearch.ResourceNotFoundException;
+import org.opensearch.action.search.SearchAction;
+import org.opensearch.client.node.NodeClient;
+import org.opensearch.cluster.ClusterName;
+import org.opensearch.cluster.ClusterState;
+import org.opensearch.cluster.metadata.Metadata;
+import org.opensearch.cluster.metadata.View;
+import org.opensearch.cluster.service.ClusterService;
+import org.opensearch.core.action.ActionListener;
+
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.LongSupplier;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+
+public class ViewServiceTest {
+
+    private final View.Target typicalTarget = new View.Target("my-index-*");
+    private final View typicalView = new View("actualView", "actual description", -1L, -1L, List.of(typicalTarget));
+
+    private ClusterService clusterService;
+    private NodeClient nodeClient;
+    private AtomicLong currentTime = new AtomicLong(0);
+    private LongSupplier timeProvider = currentTime::longValue;
+    private ViewService viewService;
+
+    @Before
+    public void before() {
+        clusterService = mock(ClusterService.class);
+        nodeClient = mock(NodeClient.class);
+        timeProvider = mock(LongSupplier.class);
+        doAnswer(invocation -> currentTime.get()).when(timeProvider).getAsLong();
+        viewService = spy(new ViewService(clusterService, nodeClient, timeProvider));
+    }
+
+    @After
+    public void after() {
+        verifyNoMoreInteractions(timeProvider, clusterService, nodeClient);
+    }
+
+    @Test
+    public void createView() {
+        final var request = new CreateViewAction.Request("a", "b", List.of(new CreateViewAction.Request.Target("my-index-*")));
+        final var listener = mock(ActionListener.class);
+        setGetViewOrThrowExceptionToReturnTypicalView();
+
+        viewService.createView(request, listener);
+
+        verify(clusterService).submitStateUpdateTask(eq("create_view_task"), any());
+        verify(timeProvider).getAsLong();
+    }
+
+    @Test
+    public void updateView() {
+        final var request = new CreateViewAction.Request("a", "b", List.of(new CreateViewAction.Request.Target("my-index-*")));
+        final var listener = mock(ActionListener.class);
+        setGetViewOrThrowExceptionToReturnTypicalView();
+
+        viewService.updateView(request, listener);
+
+        verify(clusterService).submitStateUpdateTask(eq("update_view_task"), any());
+        verify(timeProvider).getAsLong();
+    }
+
+    @Test
+    public void updateView_doesNotExist() {
+        final var request = new CreateViewAction.Request("a", "b", List.of(new CreateViewAction.Request.Target("my-index-*")));
+        final var listener = mock(ActionListener.class);
+        doThrow(new ResourceNotFoundException("abc")).when(viewService).getViewOrThrowException(anyString());
+
+        final Exception ex = assertThrows(ResourceNotFoundException.class, () -> viewService.updateView(request, listener));
+        assertThat(ex.getMessage(), equalTo("abc"));
+    }
+
+    @Test
+    public void deleteView() {
+        final var request = new DeleteViewAction.Request("viewName");
+        final var listener = mock(ActionListener.class);
+        setGetViewOrThrowExceptionToReturnTypicalView();
+
+        viewService.deleteView(request, listener);
+
+        verify(clusterService).submitStateUpdateTask(eq("delete_view_task"), any());
+    }
+
+    @Test
+    public void deleteView_doesNotExist() {
+        final var request = new DeleteViewAction.Request("viewName");
+        final var listener = mock(ActionListener.class);
+        doThrow(new ResourceNotFoundException("abc")).when(viewService).getViewOrThrowException(anyString());
+
+        final ResourceNotFoundException ex = assertThrows(ResourceNotFoundException.class, () -> viewService.deleteView(request, listener));
+
+        assertThat(ex.getMessage(), equalTo("abc"));
+    }
+
+    @Test
+    public void getView() {
+        final var request = new GetViewAction.Request("viewName");
+        final var listener = mock(ActionListener.class);
+        setGetViewOrThrowExceptionToReturnTypicalView();
+
+        viewService.getView(request, listener);
+
+        verify(listener).onResponse(any());
+    }
+
+    @Test
+    public void getView_doesNotExist() {
+        final var request = new GetViewAction.Request("viewName");
+        final var listener = mock(ActionListener.class);
+        doThrow(new ResourceNotFoundException("abc")).when(viewService).getViewOrThrowException(anyString());
+
+        final ResourceNotFoundException ex = assertThrows(ResourceNotFoundException.class, () -> viewService.getView(request, listener));
+
+        assertThat(ex.getMessage(), equalTo("abc"));
+    }
+
+    @Test
+    public void listViewNames() {
+        final var clusterState = new ClusterState.Builder(new ClusterName("MyCluster"))
+            .metadata(new Metadata.Builder().views(Map.of(typicalView.getName(), typicalView)).build())
+            .build();
+        final var listener = mock(ActionListener.class);
+        when(clusterService.state()).thenReturn(clusterState);
+
+        viewService.listViewNames(listener);
+
+        verify(clusterService).state();
+        verify(listener).onResponse(any());
+    }
+
+    @Test
+    public void listViewNames_noViews() {
+        final var clusterState = new ClusterState.Builder(new ClusterName("MyCluster")).build();
+        final var listener = mock(ActionListener.class);
+        when(clusterService.state()).thenReturn(clusterState);
+
+        viewService.listViewNames(listener);
+
+        verify(clusterService).state();
+        verify(listener).onResponse(any());
+    }
+
+    @Test
+    public void searchView() {
+        final var request = spy(new SearchViewAction.Request("view"));
+        final var listener = mock(ActionListener.class);
+        setGetViewOrThrowExceptionToReturnTypicalView();
+
+        viewService.searchView(request, listener);
+
+        verify(nodeClient).executeLocally(eq(SearchAction.INSTANCE), any(), any(ActionListener.class));
+        verify(request).indices(typicalTarget.getIndexPattern());
+    }
+
+    private void setGetViewOrThrowExceptionToReturnTypicalView() {
+        doAnswer(invocation -> typicalView).when(viewService).getViewOrThrowException(anyString());
+    }
+}