This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new e86876ddbb8 Rename AgentE2ETestEnvironment.actualLogs to containerLogs
(#32220)
e86876ddbb8 is described below
commit e86876ddbb88dd9efdda70151eb972dd7789f42d
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Jul 22 00:17:52 2024 +0800
Rename AgentE2ETestEnvironment.actualLogs to containerLogs (#32220)
* Add shardingsphere-test-e2e-agent-proxy-fixture module
* Add shardingsphere-test-e2e-agent-proxy-fixture module
* Add shardingsphere-test-e2e-agent-proxy-fixture module
* Rename AgentE2ETestEnvironment.actualLogs to containerLogs
---
.../test/e2e/agent/common/env/AgentE2ETestEnvironment.java | 4 ++--
.../apache/shardingsphere/test/e2e/agent/file/FilePluginE2EIT.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/AgentE2ETestEnvironment.java
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/AgentE2ETestEnvironment.java
index dd17e429920..91b38b2521c 100644
---
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/AgentE2ETestEnvironment.java
+++
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/AgentE2ETestEnvironment.java
@@ -59,7 +59,7 @@ public final class AgentE2ETestEnvironment {
private final AgentE2ETestImageConfiguration imageConfig =
AgentE2ETestImageConfiguration.getInstance();
@Getter
- private final Collection<String> actualLogs = new LinkedList<>();
+ private final Collection<String> containerLogs = new LinkedList<>();
private ITContainers containers;
@@ -138,7 +138,7 @@ public final class AgentE2ETestEnvironment {
private void collectLogs(final OutputFrame outputFrame) {
if (!initialized) {
- actualLogs.add(outputFrame.getUtf8StringWithoutLineEnding());
+ containerLogs.add(outputFrame.getUtf8StringWithoutLineEnding());
}
}
diff --git
a/test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/FilePluginE2EIT.java
b/test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/FilePluginE2EIT.java
index 56c5ee41974..5b96ff19b74 100644
---
a/test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/FilePluginE2EIT.java
+++
b/test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/FilePluginE2EIT.java
@@ -38,8 +38,8 @@ class FilePluginE2EIT {
@ParameterizedTest
@ArgumentsSource(TestCaseArgumentsProvider.class)
void assertLogAgent(final LogE2ETestCase testCase) {
-
assertFalse(AgentE2ETestEnvironment.getInstance().getActualLogs().isEmpty(),
"The actual log is empty");
-
LogContentAssert.assertIs(AgentE2ETestEnvironment.getInstance().getActualLogs(),
testCase.getLogRegex());
+
assertFalse(AgentE2ETestEnvironment.getInstance().getContainerLogs().isEmpty(),
"The actual log is empty");
+
LogContentAssert.assertIs(AgentE2ETestEnvironment.getInstance().getContainerLogs(),
testCase.getLogRegex());
}
private static boolean isEnabled() {