Skip to content

Commit fb3ef61

Browse files
committed
Fixed tests + corrected incorrect test
1 parent 16c11fe commit fb3ef61

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

XmlSchemaClassGenerator.Tests/DateOnlyTimeOnlyTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public void WhenUseDateOnlyIsFalse_AndDateTimeWithTimeZoneIsTrue_DateTimeOffsetI
160160
var code = string.Join(Environment.NewLine, generatedType);
161161

162162
Assert.Contains("public System.DateTimeOffset SomeTime", code);
163-
Assert.Contains("DataType=\"time\"", code);
163+
Assert.DoesNotContain("DataType=\"time\"", code);
164164
}
165165
[Fact]
166166
public void WhenUseDateOnlyIsFalse_AndDateTimeWithTimeZoneIsTrue_DateTimeOffsetIsGeneratedForDate()
@@ -188,6 +188,6 @@ public void WhenUseDateOnlyIsFalse_AndDateTimeWithTimeZoneIsTrue_DateTimeOffsetI
188188
var code = string.Join(Environment.NewLine, generatedType);
189189

190190
Assert.Contains("public System.DateTimeOffset SomeDate", code);
191-
Assert.Contains("DataType=\"date\"", code);
191+
Assert.DoesNotContain("DataType=\"date\"", code);
192192
}
193193
}

XmlSchemaClassGenerator.Tests/DateTimeTypeTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public void WhenDateTimeOffsetIsNotUsed_DataTypePropertyIsPresent()
104104
}
105105

106106
[Fact]
107-
public void WhenDateTimeOffsetIsNotUsed_DataTypePropertyIsPresent2()
107+
public void WhenDateTimeOffsetIsUsed_DataTypePropertyIsNotPresent()
108108
{
109109
var xsd = @$"<?xml version=""1.0"" encoding=""UTF-8""?>
110110
<xs:schema elementFormDefault=""qualified"" xmlns:xs=""http://www.w3.org/2001/XMLSchema"">
@@ -125,7 +125,7 @@ public void WhenDateTimeOffsetIsNotUsed_DataTypePropertyIsPresent2()
125125
DateTimeWithTimeZone = true
126126
});
127127

128-
var expectedXmlSerializationAttribute = "[System.Xml.Serialization.XmlElementAttribute(\"someDate\", DataType=\"date\")]";
128+
var expectedXmlSerializationAttribute = "[System.Xml.Serialization.XmlElementAttribute(\"someDate\")]";
129129
var generatedProperty = generatedType.First();
130130

131131
Assert.Contains(expectedXmlSerializationAttribute, generatedProperty);

XmlSchemaClassGenerator/CodeUtilities.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ public static string ToBackingField(this string propertyName, string privateFiel
7878
public static bool? IsDataTypeAttributeAllowed(this XmlSchemaDatatype type, GeneratorConfiguration configuration) => type.TypeCode switch
7979
{
8080
XmlTypeCode.AnyAtomicType => false,// union
81-
XmlTypeCode.DateTime or XmlTypeCode.Time => !configuration.DateTimeWithTimeZone,
82-
XmlTypeCode.Date or XmlTypeCode.Base64Binary or XmlTypeCode.HexBinary => true,
81+
XmlTypeCode.DateTime or XmlTypeCode.Date or XmlTypeCode.Time => !configuration.DateTimeWithTimeZone,
82+
XmlTypeCode.Base64Binary or XmlTypeCode.HexBinary => true,
8383
_ => false,
8484
};
8585

0 commit comments

Comments
 (0)