opendev/gerrit
Code Issues Proposed changes

SshTraceIT: Use ExtensionRegistry for ProjectCreationValidationListener

Browse Source 
Change-Id: If7469210eda12a526eb48ffab68aa34849f2404e
This commit is contained in:
David Pursehouse
2019-10-11 21:25:17 +09:00
parent 14235f61e6
commit 524975d565
1 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
javatests/com/google/gerrit/acceptance/ssh/SshTraceIT.java
View File

@@ -20,6 +20,8 @@ import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.ExtensionRegistry;
import com.google.gerrit.acceptance.ExtensionRegistry.Registration;
import com.google.gerrit.acceptance.UseSsh; import com.google.gerrit.acceptance.UseSsh;
import com.google.gerrit.extensions.registration.DynamicSet; import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.extensions.registration.RegistrationHandle; import com.google.gerrit.extensions.registration.RegistrationHandle;
@@ -39,60 +41,69 @@ import org.junit.Test;
@UseSsh @UseSsh
public class SshTraceIT extends AbstractDaemonTest { public class SshTraceIT extends AbstractDaemonTest {
@Inject private DynamicSet<ProjectCreationValidationListener> projectCreationValidationListeners;
@Inject private DynamicSet<PerformanceLogger> performanceLoggers; @Inject private DynamicSet<PerformanceLogger> performanceLoggers;
@Inject private ExtensionRegistry extensionRegistry;
private TraceValidatingProjectCreationValidationListener projectCreationListener;
private RegistrationHandle projectCreationListenerRegistrationHandle;
private TestPerformanceLogger testPerformanceLogger; private TestPerformanceLogger testPerformanceLogger;
private RegistrationHandle performanceLoggerRegistrationHandle; private RegistrationHandle performanceLoggerRegistrationHandle;
@Before @Before
public void setup() { public void setup() {
projectCreationListener = new TraceValidatingProjectCreationValidationListener();
projectCreationListenerRegistrationHandle =
projectCreationValidationListeners.add("gerrit", projectCreationListener);
testPerformanceLogger = new TestPerformanceLogger(); testPerformanceLogger = new TestPerformanceLogger();
performanceLoggerRegistrationHandle = performanceLoggers.add("gerrit", testPerformanceLogger); performanceLoggerRegistrationHandle = performanceLoggers.add("gerrit", testPerformanceLogger);
} }
@After @After
public void cleanup() { public void cleanup() {
projectCreationListenerRegistrationHandle.remove();
performanceLoggerRegistrationHandle.remove(); performanceLoggerRegistrationHandle.remove();
} }
@Test @Test
public void sshCallWithoutTrace() throws Exception { public void sshCallWithoutTrace() throws Exception {
adminSshSession.exec("gerrit create-project new1"); TraceValidatingProjectCreationValidationListener projectCreationListener =
adminSshSession.assertSuccess(); new TraceValidatingProjectCreationValidationListener();
assertThat(projectCreationListener.traceId).isNull(); try (Registration registration =
assertThat(projectCreationListener.foundTraceId).isFalse(); extensionRegistry.newRegistration().add(projectCreationListener)) {
assertThat(projectCreationListener.isLoggingForced).isFalse(); adminSshSession.exec("gerrit create-project new1");
adminSshSession.assertSuccess();
assertThat(projectCreationListener.traceId).isNull();
assertThat(projectCreationListener.foundTraceId).isFalse();
assertThat(projectCreationListener.isLoggingForced).isFalse();
}
} }
@Test @Test
public void sshCallWithTrace() throws Exception { public void sshCallWithTrace() throws Exception {
adminSshSession.exec("gerrit create-project --trace new2"); TraceValidatingProjectCreationValidationListener projectCreationListener =
new TraceValidatingProjectCreationValidationListener();
try (Registration registration =
extensionRegistry.newRegistration().add(projectCreationListener)) {
adminSshSession.exec("gerrit create-project --trace new2");
// The trace ID is written to stderr. // The trace ID is written to stderr.
adminSshSession.assertFailure(RequestId.Type.TRACE_ID.name()); adminSshSession.assertFailure(RequestId.Type.TRACE_ID.name());
assertThat(projectCreationListener.traceId).isNotNull(); assertThat(projectCreationListener.traceId).isNotNull();
assertThat(projectCreationListener.foundTraceId).isTrue(); assertThat(projectCreationListener.foundTraceId).isTrue();
assertThat(projectCreationListener.isLoggingForced).isTrue(); assertThat(projectCreationListener.isLoggingForced).isTrue();
}
} }
@Test @Test
public void sshCallWithTraceAndProvidedTraceId() throws Exception { public void sshCallWithTraceAndProvidedTraceId() throws Exception {
adminSshSession.exec("gerrit create-project --trace --trace-id issue/123 new3"); TraceValidatingProjectCreationValidationListener projectCreationListener =
new TraceValidatingProjectCreationValidationListener();
try (Registration registration =
extensionRegistry.newRegistration().add(projectCreationListener)) {
adminSshSession.exec("gerrit create-project --trace --trace-id issue/123 new3");
// The trace ID is written to stderr. // The trace ID is written to stderr.
adminSshSession.assertFailure(RequestId.Type.TRACE_ID.name()); adminSshSession.assertFailure(RequestId.Type.TRACE_ID.name());
assertThat(projectCreationListener.traceId).isEqualTo("issue/123"); assertThat(projectCreationListener.traceId).isEqualTo("issue/123");
assertThat(projectCreationListener.foundTraceId).isTrue(); assertThat(projectCreationListener.foundTraceId).isTrue();
assertThat(projectCreationListener.isLoggingForced).isTrue(); assertThat(projectCreationListener.isLoggingForced).isTrue();
}
} }
@Test @Test