From c4bc7ae7e6596e2fc889396339f71c64f1767724 Mon Sep 17 00:00:00 2001 From: Elizabeth Okerio Date: Mon, 15 Jun 2020 07:37:18 -0700 Subject: [PATCH] fix build error --- .../JsonLight/CollectionValueReaderJsonLightTests.cs | 4 ++-- .../JsonLight/PropertyReaderJsonLightTests.cs | 11 ----------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/test/FunctionalTests/Tests/DataOData/Tests/OData.Reader.Tests/JsonLight/CollectionValueReaderJsonLightTests.cs b/test/FunctionalTests/Tests/DataOData/Tests/OData.Reader.Tests/JsonLight/CollectionValueReaderJsonLightTests.cs index 05c5b26aa7..ab5c0173f4 100644 --- a/test/FunctionalTests/Tests/DataOData/Tests/OData.Reader.Tests/JsonLight/CollectionValueReaderJsonLightTests.cs +++ b/test/FunctionalTests/Tests/DataOData/Tests/OData.Reader.Tests/JsonLight/CollectionValueReaderJsonLightTests.cs @@ -67,13 +67,13 @@ public void CollectionValueTest() PayloadElement = PayloadBuilder.Property("PrimitiveCollection", PayloadBuilder.PrimitiveMultiValue("Collection(Edm.Int32)")) .JsonRepresentation( - "{" + + "{" + "\"" + JsonLightConstants.ODataPropertyAnnotationSeparator + JsonLightConstants.ODataContextAnnotationName + "\":\"http://odata.org/test/$metadata#Collection(Edm.Int32)\"," + "\"value\":null" + "}") .ExpectedProperty(owningType, "PrimitiveCollection"), SkipTestConfiguration = tc => tc.IsRequest, - ExpectedException = ODataExpectedExceptions.ODataException("ReaderValidationUtils_NullNamedValueForNonNullableType", "value", "Collection(Edm.Int32)") + ExpectedException = ODataExpectedExceptions.ODataException("ReaderValidationUtils_NullNamedValueForNullableType", "value", "Collection(Edm.Int32)") }, new PayloadReaderTestDescriptor(this.Settings) { diff --git a/test/FunctionalTests/Tests/DataOData/Tests/OData.Reader.Tests/JsonLight/PropertyReaderJsonLightTests.cs b/test/FunctionalTests/Tests/DataOData/Tests/OData.Reader.Tests/JsonLight/PropertyReaderJsonLightTests.cs index 227be12899..aeae012ccc 100644 --- a/test/FunctionalTests/Tests/DataOData/Tests/OData.Reader.Tests/JsonLight/PropertyReaderJsonLightTests.cs +++ b/test/FunctionalTests/Tests/DataOData/Tests/OData.Reader.Tests/JsonLight/PropertyReaderJsonLightTests.cs @@ -246,17 +246,6 @@ public void TopLevelPropertyTest() ExpectedException = ODataExpectedExceptions.ODataException("ValidationUtils_IncorrectTypeKind", "Unknown", "Primitive", "Complex") }, new - { - Description = "Invalid type information for top-level null - we don't allow null collections - should fail.", - Json = "{ " + - "\"" + JsonLightConstants.ODataPropertyAnnotationSeparator + JsonLightConstants.ODataContextAnnotationName + "\":\"http://odata.org/test/$metadata#Collection(Edm.Int32)\", " + - "\"" + JsonLightConstants.ODataPropertyAnnotationSeparator + JsonLightConstants.ODataTypeAnnotationName + "\": \"Collection(Edm.Int32)\"," + - "\"" + JsonLightConstants.ODataValuePropertyName + "\": null" + - "}", - ReaderMetadata = collectionReaderMetadata, - ExpectedException = ODataExpectedExceptions.ODataException("ReaderValidationUtils_NullNamedValueForNonNullableType", "value", "Collection(Edm.Int32)") - }, - new { Description = "Type information for top-level spatial - should work.", Json = "{ " +