forked from apache/geode
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
GEODE-10084: CliFunction should handle all throwable (apache#7395)
* Update ImportDataFunction to extend CliFunction (cherry picked from commit 41e7a17)
- Loading branch information
1 parent
d607a91
commit d3e1ca8
Showing
4 changed files
with
163 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 62 additions & 0 deletions
62
...fsh/src/test/java/org/apache/geode/management/internal/cli/functions/CliFunctionTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /* | ||
| * | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more contributor license | ||
| * agreements. See the NOTICE file distributed with this work for additional information regarding | ||
| * copyright ownership. The ASF licenses this file to You 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. | ||
| * | ||
| */ | ||
|
|
||
| package org.apache.geode.management.internal.cli.functions; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.mockito.Mockito.mock; | ||
| import static org.mockito.Mockito.verify; | ||
| import static org.mockito.Mockito.when; | ||
|
|
||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
| import org.mockito.ArgumentCaptor; | ||
|
|
||
| import org.apache.geode.InternalGemFireError; | ||
| import org.apache.geode.cache.execute.FunctionContext; | ||
| import org.apache.geode.cache.execute.ResultSender; | ||
| import org.apache.geode.management.cli.CliFunction; | ||
| import org.apache.geode.management.internal.functions.CliFunctionResult; | ||
|
|
||
| public class CliFunctionTest { | ||
|
|
||
| private FunctionContext<Object[]> context; | ||
| private ResultSender<Object> resultSender; | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| @Before | ||
| public void before() { | ||
| context = mock(FunctionContext.class); | ||
| resultSender = mock(ResultSender.class); | ||
| when(context.getResultSender()).thenReturn(resultSender); | ||
| } | ||
|
|
||
| @Test | ||
| public void executeShouldSendCliFunctionResultIfErrorHappens() throws Exception { | ||
| CliFunction<Object[]> function = new CliFunction<Object[]>() { | ||
| @Override | ||
| public CliFunctionResult executeFunction(FunctionContext<Object[]> context) { | ||
| throw new InternalGemFireError("test"); | ||
| } | ||
| }; | ||
| function.execute(context); | ||
|
|
||
| ArgumentCaptor<Object> captor = ArgumentCaptor.forClass(Object.class); | ||
| verify(resultSender).lastResult(captor.capture()); | ||
| assertThat(captor.getValue()).isInstanceOf(CliFunctionResult.class); | ||
| } | ||
| } |
78 changes: 78 additions & 0 deletions
78
.../test/java/org/apache/geode/management/internal/cli/functions/ImportDataFunctionTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| /* | ||
| * | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more contributor license | ||
| * agreements. See the NOTICE file distributed with this work for additional information regarding | ||
| * copyright ownership. The ASF licenses this file to You 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. | ||
| * | ||
| */ | ||
|
|
||
| package org.apache.geode.management.internal.cli.functions; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.mockito.Mockito.mock; | ||
| import static org.mockito.Mockito.verify; | ||
| import static org.mockito.Mockito.when; | ||
|
|
||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
| import org.mockito.ArgumentCaptor; | ||
|
|
||
| import org.apache.geode.cache.execute.FunctionContext; | ||
| import org.apache.geode.cache.execute.ResultSender; | ||
| import org.apache.geode.management.cli.CliFunction; | ||
| import org.apache.geode.management.internal.functions.CliFunctionResult; | ||
|
|
||
| public class ImportDataFunctionTest { | ||
|
|
||
| private ImportDataFunction importer; | ||
| private FunctionContext<Object[]> context; | ||
| private ResultSender<Object> resultSender; | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| @Before | ||
| public void before() { | ||
| importer = new ImportDataFunction(); | ||
| context = mock(FunctionContext.class); | ||
| resultSender = mock(ResultSender.class); | ||
| when(context.getResultSender()).thenReturn(resultSender); | ||
| } | ||
|
|
||
| @Test | ||
| public void importDataFunctionShouldSendCliFunctionResultIfExceptionHappens() { | ||
| assertThat(importer).isInstanceOf(CliFunction.class); | ||
| when(context.getArguments()).thenReturn(new Object[0]); | ||
| importer.execute(context); | ||
|
|
||
| ArgumentCaptor<Object> captor = ArgumentCaptor.forClass(Object.class); | ||
| verify(resultSender).lastResult(captor.capture()); | ||
| Object value = captor.getValue(); | ||
| assertThat(value).isInstanceOf(CliFunctionResult.class); | ||
| assertThat(((CliFunctionResult) value).getStatusMessage()) | ||
| .contains("Arguments length does not match required length"); | ||
| } | ||
|
|
||
| @Test | ||
| public void importDataFunctionShouldSendCliFunctionResultIfErrorHappens() { | ||
| Object[] arguments = new Object[4]; | ||
| arguments[2] = true; | ||
| arguments[3] = true; | ||
| when(context.getArguments()).thenReturn(arguments); | ||
| when(context.getCache()).thenThrow(new Error("test error")); | ||
| importer.execute(context); | ||
|
|
||
| ArgumentCaptor<Object> captor = ArgumentCaptor.forClass(Object.class); | ||
| verify(resultSender).lastResult(captor.capture()); | ||
| Object value = captor.getValue(); | ||
| assertThat(value).isInstanceOf(CliFunctionResult.class); | ||
| assertThat(((CliFunctionResult) value).getStatusMessage()).contains("test error"); | ||
| } | ||
| } |