Skip to content

Remove duplicate calls to TestUtils.silenceOperatorLogger #2762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 2, 2022
Merged

Remove duplicate calls to TestUtils.silenceOperatorLogger #2762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions operator/src/test/java/oracle/kubernetes/operator/NamespaceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2019, 2021, Oracle and/or its affiliates.
// Copyright (c) 2019, 2022, Oracle and/or its affiliates.
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.

package oracle.kubernetes.operator;
Expand Down Expand Up @@ -64,13 +64,14 @@ class NamespaceTest {
private final DomainNamespaces domainNamespaces = new DomainNamespaces(null);
private final DomainProcessorStub dp = Stub.createNiceStub(DomainProcessorStub.class);
private final MainDelegateStub delegate = createStrictStub(MainDelegateStub.class, dp, domainNamespaces);
private final TestUtils.ConsoleHandlerMemento loggerControl = TestUtils.silenceOperatorLogger();
private final Collection<LogRecord> logRecords = new ArrayList<>();
private final OnConflictRetryStrategyStub retryStrategy = createStrictStub(OnConflictRetryStrategyStub.class);

private TestUtils.ConsoleHandlerMemento loggerControl;

@BeforeEach
public void setUp() throws Exception {
mementos.add(TestUtils.silenceOperatorLogger());
mementos.add(loggerControl = TestUtils.silenceOperatorLogger());
mementos.add(StubWatchFactory.install());
mementos.add(NoopWatcherStarter.install());
mementos.add(HelmAccessStub.install());
Expand Down
6 changes: 3 additions & 3 deletions operator/src/test/java/oracle/kubernetes/operator/helpers/EventHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2020, 2021, Oracle and/or its affiliates.
// Copyright (c) 2020, 2022, Oracle and/or its affiliates.
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.

package oracle.kubernetes.operator.helpers;
Expand Down Expand Up @@ -116,13 +116,13 @@ class EventHelperTest {
private final MakeRightDomainOperation makeRightOperation
= processor.createMakeRightOperation(info);
private final String jobPodName = LegalNames.toJobIntrospectorName(UID);
private final TestUtils.ConsoleHandlerMemento loggerControl = TestUtils.silenceOperatorLogger();
private final Collection<LogRecord> logRecords = new ArrayList<>();
private final OnConflictRetryStrategyStub retryStrategy = createStrictStub(OnConflictRetryStrategyStub.class);
private TestUtils.ConsoleHandlerMemento loggerControl;

@BeforeEach
void setUp() throws Exception {
mementos.add(TestUtils.silenceOperatorLogger());
mementos.add(loggerControl = TestUtils.silenceOperatorLogger());
mementos.add(testSupport.install());
mementos.add(StaticStubSupport.install(DomainProcessorImpl.class, "DOMAINS", presenceInfoMap));
mementos.add(StaticStubSupport.install(DomainProcessorImpl.class, "domainEventK8SObjects", domainEventObjects));
Expand Down
11 changes: 10 additions & 1 deletion operator/src/test/java/oracle/kubernetes/utils/TestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2018, 2021, Oracle and/or its affiliates.
// Copyright (c) 2018, 2022, Oracle and/or its affiliates.
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.

package oracle.kubernetes.utils;
Expand Down Expand Up @@ -29,6 +29,7 @@ public class TestUtils {
*/
public static ConsoleHandlerMemento silenceOperatorLogger() {
Logger logger = LoggingFactory.getLogger("Operator", "Operator").getUnderlyingLogger();
Arrays.stream(logger.getHandlers()).filter(TestUtils::isTestLogHandler).forEach(TestUtils::rejectCall);
List<Handler> savedHandlers = new ArrayList<>();
for (Handler handler : logger.getHandlers()) {
if (handler instanceof ConsoleHandler) {
Expand All @@ -44,6 +45,14 @@ public static ConsoleHandlerMemento silenceOperatorLogger() {
logger.addHandler(testHandler);

return new ConsoleHandlerMemento(logger, testHandler, savedHandlers);
}

private static boolean isTestLogHandler(Handler handler) {
return handler instanceof TestLogHandler;
}

private static void rejectCall(Handler handler) {
throw new IllegalStateException("silenceOperatorLogger may only called once");
}

/**
Expand Down