Skip to content

Commit fe7dd2a

Browse files
committed
Revert "Follow unacknowledged write with a find in spec tests (#1355)"
This reverts commit 87559cf.
1 parent 87559cf commit fe7dd2a

File tree

4 files changed

+10
-49
lines changed

4 files changed

+10
-49
lines changed

driver-core/src/test/resources/unified-test-format/command-logging/unacknowledged-write.json

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"description": "unacknowledged-write",
3-
"schemaVersion": "1.16",
2+
"description": "command-logging",
3+
"schemaVersion": "1.13",
44
"createEntities": [
55
{
66
"client": {
@@ -53,27 +53,11 @@
5353
"_id": 2
5454
}
5555
}
56-
},
57-
{
58-
"name": "find",
59-
"object": "collection",
60-
"arguments": {
61-
"filter": {}
62-
},
63-
"expectResult": [
64-
{
65-
"_id": 1
66-
},
67-
{
68-
"_id": 2
69-
}
70-
]
7156
}
7257
],
7358
"expectLogMessages": [
7459
{
7560
"client": "client",
76-
"ignoreExtraMessages": true,
7761
"messages": [
7862
{
7963
"level": "debug",
@@ -148,3 +132,5 @@
148132
}
149133
]
150134
}
135+
136+

driver-core/src/test/resources/unified-test-format/command-monitoring/unacknowledgedBulkWrite.json

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"description": "unacknowledgedBulkWrite",
3-
"schemaVersion": "1.7",
3+
"schemaVersion": "1.0",
44
"createEntities": [
55
{
66
"client": {
@@ -64,29 +64,11 @@
6464
],
6565
"ordered": false
6666
}
67-
},
68-
{
69-
"name": "find",
70-
"object": "collection",
71-
"arguments": {
72-
"filter": {}
73-
},
74-
"expectResult": [
75-
{
76-
"_id": 1,
77-
"x": 11
78-
},
79-
{
80-
"_id": "unorderedBulkWriteInsertW0",
81-
"x": 44
82-
}
83-
]
8467
}
8568
],
8669
"expectEvents": [
8770
{
8871
"client": "client",
89-
"ignoreExtraEvents": true,
9072
"events": [
9173
{
9274
"commandStartedEvent": {

driver-sync/src/test/functional/com/mongodb/client/unified/LogMatcher.java

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import java.util.List;
3636

3737
import static org.junit.Assert.assertEquals;
38-
import static org.junit.Assert.assertTrue;
3938

4039
final class LogMatcher {
4140
private final ValueMatcher valueMatcher;
@@ -47,16 +46,11 @@ final class LogMatcher {
4746
this.context = context;
4847
}
4948

50-
void assertLogMessageEquality(final String client, final boolean ignoreExtraMessages, final BsonArray expectedMessages,
51-
final List<LogMessage> actualMessages, final Iterable<Tweak> tweaks) {
49+
void assertLogMessageEquality(final String client, final BsonArray expectedMessages, final List<LogMessage> actualMessages,
50+
final Iterable<Tweak> tweaks) {
5251
context.push(ContextElement.ofLogMessages(client, expectedMessages, actualMessages));
5352

54-
if (ignoreExtraMessages) {
55-
assertTrue(context.getMessage("Number of messages must be greater than or equal to the expected number of messages"),
56-
actualMessages.size() >= expectedMessages.size());
57-
} else {
58-
assertEquals(context.getMessage("Number of log messages must be the same"), expectedMessages.size(), actualMessages.size());
59-
}
53+
assertEquals(context.getMessage("Number of log messages must be the same"), expectedMessages.size(), actualMessages.size());
6054

6155
for (int i = 0; i < expectedMessages.size(); i++) {
6256
BsonDocument expectedMessage = expectedMessages.get(i).asDocument().clone();

driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -282,12 +282,11 @@ private void compareLogMessages(final UnifiedTestContext rootContext, final Bson
282282
final Iterable<LogMatcher.Tweak> tweaks) {
283283
for (BsonValue cur : definition.getArray("expectLogMessages")) {
284284
BsonDocument curLogMessagesForClient = cur.asDocument();
285-
boolean ignoreExtraMessages = curLogMessagesForClient.getBoolean("ignoreExtraMessages", BsonBoolean.FALSE).getValue();
286285
String clientId = curLogMessagesForClient.getString("client").getValue();
287286
TestLoggingInterceptor loggingInterceptor =
288287
entities.getClientLoggingInterceptor(clientId);
289-
rootContext.getLogMatcher().assertLogMessageEquality(clientId, ignoreExtraMessages,
290-
curLogMessagesForClient.getArray("messages"), loggingInterceptor.getMessages(), tweaks);
288+
rootContext.getLogMatcher().assertLogMessageEquality(clientId, curLogMessagesForClient.getArray("messages"),
289+
loggingInterceptor.getMessages(), tweaks);
291290
}
292291
}
293292

0 commit comments

Comments
 (0)