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 2020/05/15 21:05:47 UTC
[logging-log4j2] branch master updated: Fix possible resource leaks
in MongoDB tests.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/master by this push:
new 0d0d30c Fix possible resource leaks in MongoDB tests.
0d0d30c is described below
commit 0d0d30c351b0bfd413cb4eea3114df1e1230fbe6
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri May 15 17:05:41 2020 -0400
Fix possible resource leaks in MongoDB tests.
---
.../logging/log4j/mongodb2/MongoDbAuthFailureTest.java | 5 ++++-
.../apache/logging/log4j/mongodb2/MongoDbCappedTest.java | 13 +++++++++----
.../logging/log4j/mongodb2/MongoDbMapMessageTest.java | 15 +++++++++------
.../org/apache/logging/log4j/mongodb2/MongoDbTest.java | 9 ++++++---
.../logging/log4j/mongodb3/MongoDbMapMessageTest.java | 2 +-
5 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/log4j-mongodb2/src/test/java/org/apache/logging/log4j/mongodb2/MongoDbAuthFailureTest.java b/log4j-mongodb2/src/test/java/org/apache/logging/log4j/mongodb2/MongoDbAuthFailureTest.java
index 0fb61c6..a7c4a1d 100644
--- a/log4j-mongodb2/src/test/java/org/apache/logging/log4j/mongodb2/MongoDbAuthFailureTest.java
+++ b/log4j-mongodb2/src/test/java/org/apache/logging/log4j/mongodb2/MongoDbAuthFailureTest.java
@@ -32,6 +32,7 @@ import org.junit.rules.RuleChain;
import com.mongodb.DB;
import com.mongodb.DBCollection;
+import com.mongodb.DBCursor;
import com.mongodb.MongoClient;
/**
@@ -64,7 +65,9 @@ public class MongoDbAuthFailureTest {
Assert.assertNotNull(database);
final DBCollection collection = database.getCollection("applog");
Assert.assertNotNull(collection);
- Assert.assertFalse(collection.find().hasNext());
+ try (DBCursor cursor = collection.find()) {
+ Assert.assertFalse(cursor.hasNext());
+ }
} finally {
mongoClient.close();
}
diff --git a/log4j-mongodb2/src/test/java/org/apache/logging/log4j/mongodb2/MongoDbCappedTest.java b/log4j-mongodb2/src/test/java/org/apache/logging/log4j/mongodb2/MongoDbCappedTest.java
index ffd368a..aa171c8 100644
--- a/log4j-mongodb2/src/test/java/org/apache/logging/log4j/mongodb2/MongoDbCappedTest.java
+++ b/log4j-mongodb2/src/test/java/org/apache/logging/log4j/mongodb2/MongoDbCappedTest.java
@@ -31,6 +31,7 @@ import org.junit.rules.RuleChain;
import com.mongodb.DB;
import com.mongodb.DBCollection;
+import com.mongodb.DBCursor;
import com.mongodb.DBObject;
import com.mongodb.MongoClient;
@@ -61,10 +62,14 @@ public class MongoDbCappedTest {
Assert.assertNotNull(database);
final DBCollection collection = database.getCollection("applog");
Assert.assertNotNull(collection);
- Assert.assertTrue(collection.find().hasNext());
- final DBObject first = collection.find().next();
- Assert.assertNotNull(first);
- Assert.assertEquals(first.toMap().toString(), "Hello log", first.get("message"));
+ try (DBCursor cursor = collection.find()) {
+ Assert.assertTrue(cursor.hasNext());
+ }
+ try (DBCursor cursor = collection.find()) {
+ final DBObject first = cursor.next();
+ Assert.assertNotNull(first);
+ Assert.assertEquals(first.toMap().toString(), "Hello log", first.get("message"));
+ }
} finally {
mongoClient.close();
}
diff --git a/log4j-mongodb2/src/test/java/org/apache/logging/log4j/mongodb2/MongoDbMapMessageTest.java b/log4j-mongodb2/src/test/java/org/apache/logging/log4j/mongodb2/MongoDbMapMessageTest.java
index 99350aa..cec53d7 100644
--- a/log4j-mongodb2/src/test/java/org/apache/logging/log4j/mongodb2/MongoDbMapMessageTest.java
+++ b/log4j-mongodb2/src/test/java/org/apache/logging/log4j/mongodb2/MongoDbMapMessageTest.java
@@ -32,6 +32,7 @@ import org.junit.rules.RuleChain;
import com.mongodb.DB;
import com.mongodb.DBCollection;
+import com.mongodb.DBCursor;
import com.mongodb.DBObject;
import com.mongodb.MongoClient;
@@ -55,7 +56,7 @@ public class MongoDbMapMessageTest {
@Test
public void test() {
final Logger logger = LogManager.getLogger();
- final MapMessage mapMessage = new MapMessage();
+ final MapMessage<?, Object> mapMessage = new MapMessage<>();
mapMessage.with("SomeName", "SomeValue");
mapMessage.with("SomeInt", 1);
logger.info(mapMessage);
@@ -66,11 +67,13 @@ public class MongoDbMapMessageTest {
Assert.assertNotNull(database);
final DBCollection collection = database.getCollection("applog");
Assert.assertNotNull(collection);
- final DBObject first = collection.find().next();
- Assert.assertNotNull(first);
- final String firstMapString = first.toMap().toString();
- Assert.assertEquals(firstMapString, "SomeValue", first.get("SomeName"));
- Assert.assertEquals(firstMapString, Integer.valueOf(1), first.get("SomeInt"));
+ try (DBCursor cursor = collection.find()) {
+ final DBObject first = cursor.next();
+ Assert.assertNotNull(first);
+ final String firstMapString = first.toMap().toString();
+ Assert.assertEquals(firstMapString, "SomeValue", first.get("SomeName"));
+ Assert.assertEquals(firstMapString, Integer.valueOf(1), first.get("SomeInt"));
+ }
} finally {
mongoClient.close();
}
diff --git a/log4j-mongodb2/src/test/java/org/apache/logging/log4j/mongodb2/MongoDbTest.java b/log4j-mongodb2/src/test/java/org/apache/logging/log4j/mongodb2/MongoDbTest.java
index 2a73f8c..00f39b9 100644
--- a/log4j-mongodb2/src/test/java/org/apache/logging/log4j/mongodb2/MongoDbTest.java
+++ b/log4j-mongodb2/src/test/java/org/apache/logging/log4j/mongodb2/MongoDbTest.java
@@ -31,6 +31,7 @@ import org.junit.rules.RuleChain;
import com.mongodb.DB;
import com.mongodb.DBCollection;
+import com.mongodb.DBCursor;
import com.mongodb.DBObject;
import com.mongodb.MongoClient;
@@ -61,9 +62,11 @@ public class MongoDbTest {
Assert.assertNotNull(database);
final DBCollection collection = database.getCollection("applog");
Assert.assertNotNull(collection);
- final DBObject first = collection.find().next();
- Assert.assertNotNull(first);
- Assert.assertEquals(first.toMap().toString(), "Hello log", first.get("message"));
+ try (DBCursor cursor = collection.find()) {
+ final DBObject first = cursor.next();
+ Assert.assertNotNull(first);
+ Assert.assertEquals(first.toMap().toString(), "Hello log", first.get("message"));
+ }
} finally {
mongoClient.close();
}
diff --git a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbMapMessageTest.java b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbMapMessageTest.java
index 70f910e..cceb8ef 100644
--- a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbMapMessageTest.java
+++ b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbMapMessageTest.java
@@ -56,7 +56,7 @@ public class MongoDbMapMessageTest {
@Test
public void test() {
final Logger logger = LogManager.getLogger();
- final MapMessage mapMessage = new MapMessage();
+ final MapMessage<?, Object> mapMessage = new MapMessage<>();
mapMessage.with("SomeName", "SomeValue");
mapMessage.with("SomeInt", 1);
logger.info(mapMessage);