Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-07-04 09:28:06 +02:00
Code Issues Packages Projects Releases Activity

Order repo info extensions (#2041)

Browse Source 
Set order priority for repository information extensions.
Also add new annotation to set custom resource bundles for cli commands.
This commit is contained in:
Eduard Heimbuch
2022-05-23 15:06:08 +02:00
committed by GitHub
parent 1cac44972f
commit 8f0facf394
8 changed files with 145 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scm-webapp/src/test/java/sonia/scm/cli/CliProcessorTest.java
View File

@@ -35,6 +35,7 @@ import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import picocli.CommandLine;
import sonia.scm.plugin.PluginLoader;
import javax.annotation.Nonnull;
import java.io.ByteArrayOutputStream;
@@ -55,6 +56,8 @@ class CliProcessorTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private CliContext context;
@Mock
private PluginLoader pluginLoader;
@Mock
private CliExceptionHandlerFactory exceptionHandlerFactory;
@Mock
@@ -62,6 +65,11 @@ class CliProcessorTest {
@Mock
private CliParameterExceptionHandler parameterExceptionHandler;
@BeforeEach
void mockPluginLoader() {
when(pluginLoader.getUberClassLoader()).thenReturn(this.getClass().getClassLoader());
}
@Nested
class ForDefaultLanguageTest {
@@ -76,7 +84,7 @@ class CliProcessorTest {
void shouldExecutePingCommand() {
when(registry.createCommandTree()).thenReturn(ImmutableList.of(new RegisteredCommandNode("ping", PingCommand.class)));
Injector injector = Guice.createInjector();
CliProcessor cliProcessor = new CliProcessor(registry, injector, exceptionHandlerFactory);
CliProcessor cliProcessor = new CliProcessor(registry, injector, exceptionHandlerFactory, pluginLoader);
cliProcessor.execute(context, "ping");
@@ -87,7 +95,7 @@ class CliProcessorTest {
void shouldExecutePingCommandWithExitCode0() {
when(registry.createCommandTree()).thenReturn(ImmutableList.of(new RegisteredCommandNode("ping", PingCommand.class)));
Injector injector = Guice.createInjector();
CliProcessor cliProcessor = new CliProcessor(registry, injector, exceptionHandlerFactory);
CliProcessor cliProcessor = new CliProcessor(registry, injector, exceptionHandlerFactory, pluginLoader);
int exitCode = cliProcessor.execute(context, "ping");
@@ -170,7 +178,7 @@ class CliProcessorTest {
when(context.getStdout()).thenReturn(new PrintWriter(baos));
Injector injector = Guice.createInjector();
CliProcessor cliProcessor = new CliProcessor(registry, injector, exceptionHandlerFactory);
CliProcessor cliProcessor = new CliProcessor(registry, injector, exceptionHandlerFactory, pluginLoader);
cliProcessor.execute(context, args);
return baos.toString();
@@ -194,7 +202,8 @@ class CliProcessorTest {
}
}
@CommandLine.Command(name = "three", resourceBundle = "sonia.scm.cli.test")
@CommandLine.Command(name = "three")
@CliResourceBundle("sonia.scm.cli.test")
static class SubSubCommand implements Runnable {
@Override
public void run() {