CSHARP-2170: Resync tests to update handling of inconsistent write concern

Author: ksadoff

src/MongoDB.Driver.Core/Core/Configuration/ConnectionString.cs

@@ -782,6 +782,11 @@ private void Parse()
             ExtractDatabaseName(match);
             ExtractOptions(match);
             ExtractHosts(match);
+
+            if (_journal.HasValue && _journal.Value && _w != null && _w.Equals(0))
+            {
+                throw new MongoConfigurationException("This is an invalid w and journal pair.");
+            }
         }
 
         private void ParseOption(string name, string value)

src/MongoDB.Driver.Core/WriteConcern.cs

@@ -195,6 +195,11 @@ public WriteConcern(
             _wTimeout = Ensure.IsNullOrGreaterThanZero(wTimeout.WithDefault(null), "wTimeout");
             _fsync = fsync.WithDefault(null);
             _journal = journal.WithDefault(null);
+
+            if (_w != null && w.Value.Equals(0) && _journal.HasValue && journal.Value.Equals(true))
+            {
+                throw new MongoConfigurationException("This write concern is not valid.");
+            }
         }
 
         // properties

tests/MongoDB.Driver.Core.Tests/Specifications/read-write-concern/ConnectionStringTestRunner.cs

@@ -76,8 +76,8 @@ private void AssertValid(ConnectionString connectionString, BsonDocument definit
             BsonValue writeConcernValue;
             if (definition.TryGetValue("writeConcern", out writeConcernValue))
             {
-                var writeConcern = WriteConcern.FromBsonDocument(MassageWriteConcernDocument((BsonDocument)writeConcernValue));
-
+                var writeConcern =
+                    WriteConcern.FromBsonDocument(MassageWriteConcernDocument((BsonDocument) writeConcernValue));
                 connectionString.W.Should().Be(writeConcern.W);
                 connectionString.WTimeout.Should().Be(writeConcern.WTimeout);
                 connectionString.Journal.Should().Be(writeConcern.Journal);

tests/MongoDB.Driver.Core.Tests/Specifications/read-write-concern/tests/README.rst

@@ -6,61 +6,51 @@ The YAML and JSON files in this directory tree are platform-independent tests
 that drivers can use to prove their conformance to the Read and Write Concern 
 specification.
 
-Converting to JSON
-------------------
-
-The tests are written in YAML because it is easier for humans to write and read,
-and because YAML includes a standard comment format. A JSONified version of each
-YAML file is included in this repository. Whenever you change the YAML,
-re-convert to JSON. One method to convert to JSON is with
-`jsonwidget-python <http://jsonwidget.org/wiki/Jsonwidget-python>`_::
-
-    pip install PyYAML urwid jsonwidget
-    make
-
-Or instead of "make"::
-
-    for i in `find . -iname '*.yml'`; do
-        echo "${i%.*}"
-        jwc yaml2json $i > ${i%.*}.json
-    done
-
-Alternatively, you can use `yamljs <https://www.npmjs.com/package/yamljs>`_::
-
-    npm install -g yamljs
-    yaml2json -s -p -r .
-
 Version
 -------
 
 Files in the "specifications" repository have no version scheme. They are not
-tied to a MongoDB server version, and it is our intention that each
-specification moves from "draft" to "final" with no further versions; it is
-superseded by a future spec, not revised.
-
-However, implementers must have stable sets of tests to target. As test files
-evolve they will be occasionally tagged like "uri-tests-tests-2015-07-16", until
-the spec is final.
+tied to a MongoDB server version.
 
 Format
 ------
 
+Connection String
+~~~~~~~~~~~~~~~~~
+
+These tests are designed to exercise the connection string parsing related
+to read concern and write concern.
+
 Each YAML file contains an object with a single ``tests`` key. This key is an
 array of test case objects, each of which have the following keys:
 
 - ``description``: A string describing the test.
 - ``uri``: A string containing the URI to be parsed.
+- ``valid:``: a boolean indicating if parsing the uri should result in an error.
 - ``writeConcern:`` A document indicating the expected write concern.
-- ``isAcknowledged:`` A boolean indicating whether the write concern is 
-  acknowledged.
 - ``readConcern:`` A document indicating the expected read concern.
-- ``error:``: a boolean indicating if parsing the uri should result in an error, or the string
-  'optional' indicating that reporting of an error is optional
 
-If a test case includes a null value for one of these keys,
-no assertion is necessary. This both simplifies parsing of the
-test files (keys should always exist) and allows flexibility for drivers that
-might substitute default values *during* parsing.
+If a test case includes a null value for one of these keys, or if the key is missing,
+no assertion is necessary. This both simplifies parsing of the test files and allows flexibility
+for drivers that might substitute default values *during* parsing.
+
+Document
+~~~~~~~~
+
+These tests are designed to ensure compliance with the spec in relation to what should be 
+sent to the server.
+
+Each YAML file contains an object with a single ``tests`` key. This key is an
+array of test case objects, each of which have the following keys:
+
+- ``description``: A string describing the test.
+- ``valid:``: a boolean indicating if the write concern created from the document is valid.
+- ``writeConcern:`` A document indicating the write concern to use.
+- ``writeConcernDocument:`` A document indicating the write concern to be sent to the server.
+- ``readConcern:`` A document indicating the read concern to use.
+- ``readConcernDocument:`` A document indicating the read concern to be sent to the server.
+- ``isServerDefault:`` Indicates whether the read or write concern is considered the server's default.
+- ``isAcknowledged:`` Indicates if the write concern should be considered acknowledged.
 
 Use as unit tests
 =================

tests/MongoDB.Driver.Core.Tests/Specifications/read-write-concern/tests/connection-string/write-concern.json

@@ -107,8 +107,8 @@
     {
       "description": "Acknowledged with w as 0 and journal true",
       "uri": "mongodb://localhost/?w=0&journal=true",
-      "valid": true,
-      "warning": true,
+      "valid": false,
+      "warning": false,
       "writeConcern": {
         "w": 0,
         "journal": true

tests/MongoDB.Driver.Core.Tests/Specifications/read-write-concern/tests/connection-string/write-concern.yml

@@ -72,6 +72,6 @@ tests:
     -
         description: "Acknowledged with w as 0 and journal true"
         uri: "mongodb://localhost/?w=0&journal=true"
-        valid: true
-        warning: true
+        valid: false
+        warning: false
         writeConcern: { w: 0, journal: true }

tests/MongoDB.Driver.Core.Tests/Specifications/read-write-concern/tests/document/write-concern.json

@@ -142,7 +142,7 @@
     },
     {
       "description": "W is 0 with journal true",
-      "valid": true,
+      "valid": false,
       "writeConcern": {
         "w": 0,
         "journal": true

tests/MongoDB.Driver.Core.Tests/Specifications/read-write-concern/tests/document/write-concern.yml

@@ -85,7 +85,7 @@ tests:
         isAcknowledged: false
     -
         description: "W is 0 with journal true"
-        valid: true
+        valid: false
         writeConcern: { w: 0, journal: true }
         writeConcernDocument: { w: 0, j: true }
         isServerDefault: false

tests/MongoDB.Driver.Core.Tests/WriteConcernTests.cs

@@ -193,12 +193,15 @@ public void constructor_with_w_and_fsync_should_initialize_instance(
             result.WTimeout.Should().NotHaveValue();
         }
 
+        // exclude case where w = 0 and journal = true per new spec
         [Theory]
-        [ParameterAttributeData]
+        [InlineData(0, null)]
+        [InlineData(1, null)]
+        [InlineData(0, false)]
+        [InlineData(1, true)]
+        [InlineData(1, false)]
         public void constructor_with_w_and_journal_should_initialize_instance(
-            [Values(0, 1)]
             int w,
-            [Values(false, true, null)]
             bool? journal)
         {
             var result = new WriteConcern(w, journal: journal);
@@ -333,13 +336,13 @@ public void Equals_should_return_true_when_all_fields_are_equal()
             hashCode1.Should().Be(hashCode2);
         }
 
+        // exclude w = 0 and journal = true per new spec
         [Theory]
         [InlineData(0, null, null, null, false)]
         [InlineData(1, null, null, null, true)]
         [InlineData(0, false, null, null, false)]
         [InlineData(0, true, null, null, true)]
         [InlineData(0, null, false, null, false)]
-        [InlineData(0, null, true, null, true)]
         [InlineData(0, null, null, 1, false)]
         public void IsAcknowledged_should_return_expected_result_with_w(
             int? w,