You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2016/09/07 23:35:03 UTC
logging-log4j2 git commit: Adjust tests for previous commit about
cleaning up resources and tracking success.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 53826fff9 -> 2d3f23fb3
Adjust tests for previous commit about cleaning up resources and
tracking success.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/2d3f23fb
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2d3f23fb
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2d3f23fb
Branch: refs/heads/master
Commit: 2d3f23fb30d9ebf786a4802b35f4f897f284db50
Parents: 53826ff
Author: Gary Gregory <gg...@apache.org>
Authored: Wed Sep 7 16:34:59 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Wed Sep 7 16:34:59 2016 -0700
----------------------------------------------------------------------
.../appender/db/AbstractDatabaseAppenderTest.java | 8 ++++----
.../appender/db/AbstractDatabaseManagerTest.java | 18 +++++++++---------
2 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2d3f23fb/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppenderTest.java
index 738b2d5..276930c 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppenderTest.java
@@ -80,7 +80,7 @@ public class AbstractDatabaseAppenderTest {
verify(this.manager, this.appender);
reset(this.manager, this.appender);
this.manager.shutdownInternal();
- expectLastCall();
+ expectLastCall().andReturn(Boolean.TRUE);
replay(this.manager, this.appender);
this.appender.stop();
@@ -112,7 +112,7 @@ public class AbstractDatabaseAppenderTest {
verify(this.manager, this.appender, newManager);
reset(this.manager, this.appender, newManager);
newManager.shutdownInternal();
- expectLastCall();
+ expectLastCall().andReturn(Boolean.TRUE);
replay(this.manager, this.appender, newManager);
this.appender.stop();
@@ -132,7 +132,7 @@ public class AbstractDatabaseAppenderTest {
this.manager.writeInternal(same(event1));
expectLastCall();
this.manager.commitAndClose();
- expectLastCall();
+ expectLastCall().andReturn(Boolean.TRUE);
replay(this.manager, this.appender);
this.appender.append(event1);
@@ -144,7 +144,7 @@ public class AbstractDatabaseAppenderTest {
this.manager.writeInternal(same(event2));
expectLastCall();
this.manager.commitAndClose();
- expectLastCall();
+ expectLastCall().andReturn(Boolean.TRUE);
replay(this.manager, this.appender);
this.appender.append(event2);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2d3f23fb/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManagerTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManagerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManagerTest.java
index 36c89d2..3a8ae8f 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManagerTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManagerTest.java
@@ -61,7 +61,7 @@ public class AbstractDatabaseManagerTest {
verify(this.manager);
reset(this.manager);
this.manager.shutdownInternal();
- expectLastCall();
+ expectLastCall().andReturn(Boolean.TRUE);
replay(this.manager);
this.manager.shutdown();
@@ -89,7 +89,7 @@ public class AbstractDatabaseManagerTest {
verify(this.manager);
reset(this.manager);
this.manager.shutdownInternal();
- expectLastCall();
+ expectLastCall().andReturn(Boolean.TRUE);
replay(this.manager);
this.manager.releaseSub(-1, null);
@@ -135,7 +135,7 @@ public class AbstractDatabaseManagerTest {
this.manager.writeInternal(same(event1));
expectLastCall();
this.manager.commitAndClose();
- expectLastCall();
+ expectLastCall().andReturn(Boolean.TRUE);
replay(this.manager);
this.manager.write(event1);
@@ -147,7 +147,7 @@ public class AbstractDatabaseManagerTest {
this.manager.writeInternal(same(event2));
expectLastCall();
this.manager.commitAndClose();
- expectLastCall();
+ expectLastCall().andReturn(Boolean.TRUE);
replay(this.manager);
this.manager.write(event2);
@@ -159,7 +159,7 @@ public class AbstractDatabaseManagerTest {
this.manager.writeInternal(same(event3));
expectLastCall();
this.manager.commitAndClose();
- expectLastCall();
+ expectLastCall().andReturn(Boolean.TRUE);
replay(this.manager);
this.manager.write(event3);
@@ -197,7 +197,7 @@ public class AbstractDatabaseManagerTest {
this.manager.writeInternal(same(event4));
expectLastCall();
this.manager.commitAndClose();
- expectLastCall();
+ expectLastCall().andReturn(Boolean.TRUE);
replay(this.manager);
this.manager.write(event4);
@@ -232,7 +232,7 @@ public class AbstractDatabaseManagerTest {
this.manager.writeInternal(same(event3));
expectLastCall();
this.manager.commitAndClose();
- expectLastCall();
+ expectLastCall().andReturn(Boolean.TRUE);
replay(this.manager);
this.manager.flush();
@@ -267,9 +267,9 @@ public class AbstractDatabaseManagerTest {
this.manager.writeInternal(same(event3));
expectLastCall();
this.manager.commitAndClose();
- expectLastCall();
+ expectLastCall().andReturn(Boolean.TRUE);
this.manager.shutdownInternal();
- expectLastCall();
+ expectLastCall().andReturn(Boolean.TRUE);
replay(this.manager);
this.manager.shutdown();