diff --git a/samples/Sample.GeoFilter/Sample.GeoFilter.csproj b/samples/Sample.GeoFilter/Sample.GeoFilter.csproj index ed7f10d4..1c4370f3 100755 --- a/samples/Sample.GeoFilter/Sample.GeoFilter.csproj +++ b/samples/Sample.GeoFilter/Sample.GeoFilter.csproj @@ -9,7 +9,7 @@ - + diff --git a/samples/Sample.GeometryStream.Shape/Program.cs b/samples/Sample.GeometryStream.Shape/Program.cs index 1bc67be8..5236876e 100755 --- a/samples/Sample.GeometryStream.Shape/Program.cs +++ b/samples/Sample.GeometryStream.Shape/Program.cs @@ -23,6 +23,7 @@ using NetTopologySuite.Features; using NetTopologySuite.Geometries; using NetTopologySuite.IO; +using NetTopologySuite.IO.Esri; using OsmSharp; using OsmSharp.Geo; using OsmSharp.Streams; @@ -79,12 +80,7 @@ where feature.Geometry is LineString } // convert to shape. - var header = ShapefileDataWriter.GetHeader(featureCollection.First(), featureCollection.Count); - var shapeWriter = new ShapefileDataWriter("luxembourg.shp", new GeometryFactory()) - { - Header = header - }; - shapeWriter.Write(featureCollection); + Shapefile.WriteAllFeatures(featureCollection.Take(1), "luxembourg.shp"); } } } \ No newline at end of file diff --git a/samples/Sample.GeometryStream.Shape/Sample.GeometryStream.Shape.csproj b/samples/Sample.GeometryStream.Shape/Sample.GeometryStream.Shape.csproj index e44a06d2..7de380e7 100755 --- a/samples/Sample.GeometryStream.Shape/Sample.GeometryStream.Shape.csproj +++ b/samples/Sample.GeometryStream.Shape/Sample.GeometryStream.Shape.csproj @@ -9,6 +9,6 @@ - + \ No newline at end of file diff --git a/samples/Sample.GeometryStream/Sample.GeometryStream.csproj b/samples/Sample.GeometryStream/Sample.GeometryStream.csproj index c969c4b8..98194c54 100755 --- a/samples/Sample.GeometryStream/Sample.GeometryStream.csproj +++ b/samples/Sample.GeometryStream/Sample.GeometryStream.csproj @@ -9,6 +9,6 @@ - + \ No newline at end of file diff --git a/src/OsmSharp.Geo/OsmSharp.Geo.csproj b/src/OsmSharp.Geo/OsmSharp.Geo.csproj index e4658639..437bf1f3 100755 --- a/src/OsmSharp.Geo/OsmSharp.Geo.csproj +++ b/src/OsmSharp.Geo/OsmSharp.Geo.csproj @@ -1,19 +1,20 @@  - - - - netstandard2.0 - OsmSharp.Geo - OsmSharp.Geo - OsmSharp.Geo - OsmSharp.Geo enables using OSM-data in NTS. - openstreetmap, osm, NTS - - - - - - - - + + + + netstandard2.0 + latest + OsmSharp.Geo + OsmSharp.Geo + OsmSharp.Geo + OsmSharp.Geo enables using OSM-data in NTS. + openstreetmap, osm, NTS + + + + + + + + \ No newline at end of file diff --git a/src/OsmSharp/API/Osm.cs b/src/OsmSharp/API/Osm.cs index 523dea27..445ba1f9 100755 --- a/src/OsmSharp/API/Osm.cs +++ b/src/OsmSharp/API/Osm.cs @@ -32,6 +32,8 @@ namespace OsmSharp.API [JsonConverter(typeof(OsmJsonConverter))] public partial class Osm { + public const int MAX_DECIMAL_PRECISION = 7; + /// /// Gets or sets the generator. /// @@ -40,7 +42,7 @@ public partial class Osm /// /// Gets or sets the version #. /// - public double? Version { get; set; } + public System.Version Version { get; set; } /// /// Gets or sets the capabilities. diff --git a/src/OsmSharp/Changesets/DiffResult.cs b/src/OsmSharp/Changesets/DiffResult.cs index dcf57c0c..2f6f8563 100755 --- a/src/OsmSharp/Changesets/DiffResult.cs +++ b/src/OsmSharp/Changesets/DiffResult.cs @@ -37,7 +37,7 @@ public partial class DiffResult /// /// Gets or sets the version #. /// - public double? Version { get; set; } + public System.Version Version { get; set; } /// /// Gets or sets the results array. diff --git a/src/OsmSharp/Changesets/OsmChange.cs b/src/OsmSharp/Changesets/OsmChange.cs index b6766889..57f6d8f7 100755 --- a/src/OsmSharp/Changesets/OsmChange.cs +++ b/src/OsmSharp/Changesets/OsmChange.cs @@ -50,7 +50,7 @@ public partial class OsmChange /// /// Gets or sets the version. /// - public double? Version { get; set; } + public System.Version Version { get; set; } /// /// Gets or sets the create change array. diff --git a/src/OsmSharp/Changesets/OsmChangeExtensions.cs b/src/OsmSharp/Changesets/OsmChangeExtensions.cs index 3d240edc..d0321915 100755 --- a/src/OsmSharp/Changesets/OsmChangeExtensions.cs +++ b/src/OsmSharp/Changesets/OsmChangeExtensions.cs @@ -125,7 +125,7 @@ public static OsmChange Squash(this IEnumerable changes) Modify = mutations.Values.Where(x => x.create == false && x.delete == false).Select(x => x.osmGeo) .ToArray(), Generator = "OsmSharp", - Version = 6 + Version = System.Version.Parse("0.6") }; } @@ -240,7 +240,7 @@ public static OsmChange Diff(this IEnumerable source, IEnumerable { private readonly OsmGeoJsonConverter _osmGeoJsonConverter = new OsmGeoJsonConverter(); - + public override Osm Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { if (reader.TokenType != JsonTokenType.StartObject) @@ -21,7 +21,7 @@ public override Osm Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSeri List nodes = null; List ways = null; List relations = null; - + while (reader.Read()) { if (reader.TokenType == JsonTokenType.EndObject) @@ -41,11 +41,11 @@ public override Osm Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSeri switch (propertyName) { case "version": - osm.Version = reader.GetDouble(); + osm.Version = System.Version.Parse(Math.Round(reader.GetDouble(), 1).ToInvariantString()); break; case "generator": osm.Generator = reader.GetString(); - break; + break; case "elements": reader.Read(); while (reader.TokenType != JsonTokenType.EndArray) @@ -82,16 +82,19 @@ public override Osm Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSeri public override void Write(Utf8JsonWriter writer, Osm value, JsonSerializerOptions options) { writer.WriteStartObject(); - - if (value.Version.HasValue) writer.WriteNumber("version", value.Version.Value); + + if (value.Version != null) { + writer.WritePropertyName("version"); + writer.WriteRawValue(value.Version.ToString()); + }; if (value.Generator != null) writer.WriteString("generator", value.Generator); if (value.Nodes != null || value.Ways != null || value.Relations != null) { writer.WritePropertyName("elements"); - + writer.WriteStartArray(); - + if (value.Nodes != null) { foreach (var n in value.Nodes) @@ -99,7 +102,7 @@ public override void Write(Utf8JsonWriter writer, Osm value, JsonSerializerOptio _osmGeoJsonConverter.Write(writer, n, options); } } - + if (value.Ways != null) { foreach (var w in value.Ways) @@ -107,7 +110,7 @@ public override void Write(Utf8JsonWriter writer, Osm value, JsonSerializerOptio _osmGeoJsonConverter.Write(writer, w, options); } } - + if (value.Relations != null) { foreach (var r in value.Relations) @@ -115,10 +118,10 @@ public override void Write(Utf8JsonWriter writer, Osm value, JsonSerializerOptio _osmGeoJsonConverter.Write(writer, r, options); } } - + writer.WriteEndArray(); } - + writer.WriteEndObject(); } } diff --git a/src/OsmSharp/IO/Xml/API/Osm.Xml.cs b/src/OsmSharp/IO/Xml/API/Osm.Xml.cs index 9122123d..c5d48351 100755 --- a/src/OsmSharp/IO/Xml/API/Osm.Xml.cs +++ b/src/OsmSharp/IO/Xml/API/Osm.Xml.cs @@ -43,7 +43,9 @@ XmlSchema IXmlSerializable.GetSchema() void IXmlSerializable.ReadXml(XmlReader reader) { - this.Version = reader.GetAttributeDouble("version"); + var version = reader.GetAttribute("version"); + if (!string.IsNullOrWhiteSpace(version)) + this.Version = System.Version.Parse(version); this.Generator = reader.GetAttribute("generator"); List nodes = null; @@ -205,7 +207,7 @@ void IXmlSerializable.ReadXml(XmlReader reader) void IXmlSerializable.WriteXml(XmlWriter writer) { - writer.WriteAttribute("version", this.Version); + writer.WriteAttribute("version", this.Version?.ToInvariantString()); writer.WriteAttribute("generator", this.Generator); writer.WriteElement("user", this.User); diff --git a/src/OsmSharp/IO/Xml/Changesets/Changeset.Xml.cs b/src/OsmSharp/IO/Xml/Changesets/Changeset.Xml.cs index b924f118..e050069f 100755 --- a/src/OsmSharp/IO/Xml/Changesets/Changeset.Xml.cs +++ b/src/OsmSharp/IO/Xml/Changesets/Changeset.Xml.cs @@ -25,6 +25,7 @@ using System.Xml; using System.Xml.Schema; using System.Xml.Serialization; +using OsmSharp.API; using OsmSharp.IO.Xml; using OsmSharp.Tags; @@ -100,10 +101,22 @@ void IXmlSerializable.WriteXml(XmlWriter writer) writer.WriteAttribute("created_at", this.CreatedAt); writer.WriteAttribute("closed_at", this.ClosedAt); writer.WriteAttribute("open", this.Open); - writer.WriteAttribute("min_lon", this.MinLongitude); - writer.WriteAttribute("min_lat", this.MinLatitude); - writer.WriteAttribute("max_lon", this.MaxLongitude); - writer.WriteAttribute("max_lat", this.MaxLatitude); + if (this.MinLongitude.HasValue) + { + writer.WriteAttribute("min_lon", Math.Round(this.MinLongitude.Value, Osm.MAX_DECIMAL_PRECISION).ToInvariantString()); + } + if (this.MinLatitude.HasValue) + { + writer.WriteAttribute("min_lat", Math.Round(this.MinLatitude.Value, Osm.MAX_DECIMAL_PRECISION).ToInvariantString()); + } + if (this.MaxLongitude.HasValue) + { + writer.WriteAttribute("max_lon", Math.Round(this.MaxLongitude.Value, Osm.MAX_DECIMAL_PRECISION).ToInvariantString()); + } + if (this.MaxLatitude.HasValue) + { + writer.WriteAttribute("max_lat", Math.Round(this.MaxLatitude.Value, Osm.MAX_DECIMAL_PRECISION).ToInvariantString()); + } writer.WriteAttribute("comments_count", this.CommentsCount); writer.WriteAttribute("changes_count", this.ChangesCount); diff --git a/src/OsmSharp/IO/Xml/Changesets/DiffResult.Xml.cs b/src/OsmSharp/IO/Xml/Changesets/DiffResult.Xml.cs index 20f80790..368b9731 100755 --- a/src/OsmSharp/IO/Xml/Changesets/DiffResult.Xml.cs +++ b/src/OsmSharp/IO/Xml/Changesets/DiffResult.Xml.cs @@ -45,7 +45,9 @@ void IXmlSerializable.ReadXml(XmlReader reader) { reader.MoveToContent(); - this.Version = reader.GetAttributeDouble("version"); + var version = reader.GetAttribute("version"); + if (!string.IsNullOrWhiteSpace(version)) + this.Version = System.Version.Parse(version); this.Generator = reader.GetAttribute("generator"); List results = null; @@ -107,9 +109,9 @@ void IXmlSerializable.WriteXml(XmlWriter writer) { writer.WriteAttributeString("generator", this.Generator); } - if (this.Version.HasValue) + if (this.Version != null) { - writer.WriteAttributeString("version", this.Version.Value.ToInvariantString()); + writer.WriteAttributeString("version", this.Version.ToInvariantString()); } if (this.Results != null) @@ -200,7 +202,7 @@ void IXmlSerializable.WriteXml(XmlWriter writer) /// public static OsmGeoResult CreateModification(OsmGeo modify, long newVersion) { - switch(modify.Type) + switch (modify.Type) { case OsmGeoType.Node: return new NodeResult() diff --git a/src/OsmSharp/IO/Xml/Changesets/OsmChange.Xml.cs b/src/OsmSharp/IO/Xml/Changesets/OsmChange.Xml.cs index bd43c548..dda31aef 100755 --- a/src/OsmSharp/IO/Xml/Changesets/OsmChange.Xml.cs +++ b/src/OsmSharp/IO/Xml/Changesets/OsmChange.Xml.cs @@ -44,8 +44,10 @@ void IXmlSerializable.ReadXml(XmlReader reader) { reader.MoveToContent(); + var version = reader.GetAttribute("version"); + if (!string.IsNullOrWhiteSpace(version)) + this.Version = System.Version.Parse(version); this.Generator = reader.GetAttribute("generator"); - this.Version = reader.GetAttributeDouble("version"); this.Copyright = reader.GetAttribute("copyright"); this.Attribution = reader.GetAttribute("attribution"); this.License = reader.GetAttribute("license"); @@ -58,11 +60,11 @@ void IXmlSerializable.ReadXml(XmlReader reader) new Tuple( "create", () => { - if (reader.IsEmptyElement) - { - reader.Read(); - return; - } + if (reader.IsEmptyElement) + { + reader.Read(); + return; + } reader.Read(); while ((reader.Name == "node" || reader.Name == "way" || @@ -81,11 +83,11 @@ void IXmlSerializable.ReadXml(XmlReader reader) new Tuple( "modify", () => { - if (reader.IsEmptyElement) - { - reader.Read(); - return; - } + if (reader.IsEmptyElement) + { + reader.Read(); + return; + } reader.Read(); while ((reader.Name == "node" || reader.Name == "way" || @@ -104,11 +106,11 @@ void IXmlSerializable.ReadXml(XmlReader reader) new Tuple( "delete", () => { - if (reader.IsEmptyElement) - { - reader.Read(); - return; - } + if (reader.IsEmptyElement) + { + reader.Read(); + return; + } reader.Read(); while ((reader.Name == "node" || reader.Name == "way" || @@ -152,7 +154,7 @@ private static OsmGeo ReadOsmGeo(XmlReader reader) void IXmlSerializable.WriteXml(XmlWriter writer) { writer.WriteAttribute("generator", this.Generator); - writer.WriteAttribute("version", this.Version); + writer.WriteAttribute("version", this.Version.ToInvariantString()); writer.WriteAttribute("copyright", this.Copyright); writer.WriteAttribute("attribution", this.Attribution); writer.WriteAttribute("license", this.License); diff --git a/src/OsmSharp/IO/Xml/Node.Xml.cs b/src/OsmSharp/IO/Xml/Node.Xml.cs index f3d69df5..974ec97e 100755 --- a/src/OsmSharp/IO/Xml/Node.Xml.cs +++ b/src/OsmSharp/IO/Xml/Node.Xml.cs @@ -20,9 +20,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. +using System; using System.Xml; using System.Xml.Schema; using System.Xml.Serialization; +using OsmSharp.API; using OsmSharp.IO.Xml; using OsmSharp.Tags; @@ -85,8 +87,14 @@ void IXmlSerializable.ReadXml(XmlReader reader) void IXmlSerializable.WriteXml(XmlWriter writer) { writer.WriteAttribute("id", this.Id); - writer.WriteAttribute("lat", this.Latitude); - writer.WriteAttribute("lon", this.Longitude); + if (this.Latitude.HasValue) + { + writer.WriteAttribute("lat", Math.Round(this.Latitude.Value, Osm.MAX_DECIMAL_PRECISION).ToInvariantString()); + } + if (this.Longitude.HasValue) + { + writer.WriteAttribute("lon", Math.Round(this.Longitude.Value, Osm.MAX_DECIMAL_PRECISION).ToInvariantString()); + } writer.WriteAttribute("user", this.UserName); writer.WriteAttribute("uid", this.UserId); writer.WriteAttribute("visible", this.Visible); diff --git a/src/OsmSharp/OsmSharp.csproj b/src/OsmSharp/OsmSharp.csproj index 7af5ffe5..94b67c59 100755 --- a/src/OsmSharp/OsmSharp.csproj +++ b/src/OsmSharp/OsmSharp.csproj @@ -1,16 +1,17 @@  - + - - netstandard2.0 - OsmSharp - OsmSharp - OsmSharp - An OpenStreetMap (OSM) library for .NET. - openstreetmap, osm - - - - - + + netstandard2.0 + latest + OsmSharp + OsmSharp + OsmSharp + An OpenStreetMap (OSM) library for .NET. + openstreetmap, osm + + + + + \ No newline at end of file diff --git a/test/OsmSharp.Test.Functional/OsmSharp.Test.Functional.csproj b/test/OsmSharp.Test.Functional/OsmSharp.Test.Functional.csproj index cdccce87..6ac9affe 100755 --- a/test/OsmSharp.Test.Functional/OsmSharp.Test.Functional.csproj +++ b/test/OsmSharp.Test.Functional/OsmSharp.Test.Functional.csproj @@ -1,10 +1,11 @@  - - net6.0 - OsmSharp.Test.Functional - Exe - - - - + + net462;net6.0;net8 + latest + OsmSharp.Test.Functional + Exe + + + + \ No newline at end of file diff --git a/test/OsmSharp.Test/Changesets/OsmChangeExtensionsTests.cs b/test/OsmSharp.Test/Changesets/OsmChangeExtensionsTests.cs index a33341e6..1f6455ab 100755 --- a/test/OsmSharp.Test/Changesets/OsmChangeExtensionsTests.cs +++ b/test/OsmSharp.Test/Changesets/OsmChangeExtensionsTests.cs @@ -64,24 +64,24 @@ public void TestSquashOneSet() } }, Generator = "OsmSharp", - Version = 6 + Version = System.Version.Parse("0.6") }; // doing the squashing, nothing should happen. var squashed = new[] { changeset }.Squash(); - Assert.IsNotNull(squashed.Create); - Assert.AreEqual(1, squashed.Create.Length); - Assert.AreEqual(OsmGeoType.Node, squashed.Create[0].Type); - Assert.IsNotNull(squashed.Delete); - Assert.AreEqual(1, squashed.Delete.Length); - Assert.AreEqual(OsmGeoType.Way, squashed.Delete[0].Type); - Assert.IsNotNull(squashed.Modify); - Assert.AreEqual(1, squashed.Modify.Length); - Assert.AreEqual(OsmGeoType.Relation, squashed.Modify[0].Type); + Assert.That(squashed.Create, Is.Not.Null); + Assert.That(squashed.Create.Length, Is.EqualTo(1)); + Assert.That(squashed.Create[0].Type, Is.EqualTo(OsmGeoType.Node)); + Assert.That(squashed.Delete, Is.Not.Null); + Assert.That(squashed.Delete.Length, Is.EqualTo(1)); + Assert.That(squashed.Delete[0].Type, Is.EqualTo(OsmGeoType.Way)); + Assert.That(squashed.Modify, Is.Not.Null); + Assert.That(squashed.Modify.Length, Is.EqualTo(1)); + Assert.That(squashed.Modify[0].Type, Is.EqualTo(OsmGeoType.Relation)); - Assert.AreEqual("OsmSharp", squashed.Generator); - Assert.AreEqual(6, squashed.Version); + Assert.That(squashed.Generator, Is.EqualTo("OsmSharp")); + Assert.That(squashed.Version, Is.EqualTo(System.Version.Parse("0.6"))); } /// @@ -101,7 +101,7 @@ public void TestSquashModifyCreation() } }, Generator = "OsmSharp", - Version = 6 + Version = System.Version.Parse("0.6") }; var changeset2 = new OsmChange() { @@ -114,24 +114,24 @@ public void TestSquashModifyCreation() } }, Generator = "OsmSharp", - Version = 6 + Version = System.Version.Parse("0.6") }; // doing the squashing, should modify the creation. var squashed = new[] { changeset1, changeset2 }.Squash(); - Assert.IsNotNull(squashed.Create); - Assert.AreEqual(1, squashed.Create.Length); - Assert.AreEqual(OsmGeoType.Node, squashed.Create[0].Type); - Assert.AreEqual(1, squashed.Create[0].Id); - Assert.AreEqual(3, squashed.Create[0].Version); - Assert.IsNotNull(squashed.Delete); - Assert.AreEqual(0, squashed.Delete.Length); - Assert.IsNotNull(squashed.Modify); - Assert.AreEqual(0, squashed.Modify.Length); + Assert.That(squashed.Create, Is.Not.Null); + Assert.That(squashed.Create.Length, Is.EqualTo(1)); + Assert.That(squashed.Create[0].Type, Is.EqualTo(OsmGeoType.Node)); + Assert.That(squashed.Create[0].Id, Is.EqualTo(1)); + Assert.That(squashed.Create[0].Version, Is.EqualTo(3)); + Assert.That(squashed.Delete, Is.Not.Null); + Assert.That(squashed.Delete.Length, Is.EqualTo(0)); + Assert.That(squashed.Modify, Is.Not.Null); + Assert.That(squashed.Modify.Length, Is.EqualTo(0)); - Assert.AreEqual("OsmSharp", squashed.Generator); - Assert.AreEqual(6, squashed.Version); + Assert.That(squashed.Generator, Is.EqualTo("OsmSharp")); + Assert.That(squashed.Version, Is.EqualTo(System.Version.Parse("0.6"))); } /// @@ -151,7 +151,7 @@ public void TestSquashDeleteCreation() } }, Generator = "OsmSharp", - Version = 6 + Version = System.Version.Parse("0.6") }; var changeset2 = new OsmChange() { @@ -164,21 +164,21 @@ public void TestSquashDeleteCreation() } }, Generator = "OsmSharp", - Version = 6 + Version = System.Version.Parse("0.6") }; // doing the squashing, should undo the creation. var squashed = new[] { changeset1, changeset2 }.Squash(); - Assert.IsNotNull(squashed.Create); - Assert.AreEqual(0, squashed.Create.Length); - Assert.IsNotNull(squashed.Delete); - Assert.AreEqual(0, squashed.Delete.Length); - Assert.IsNotNull(squashed.Modify); - Assert.AreEqual(0, squashed.Modify.Length); + Assert.That(squashed.Create, Is.Not.Null); + Assert.That(squashed.Create.Length, Is.EqualTo(0)); + Assert.That(squashed.Delete, Is.Not.Null); + Assert.That(squashed.Delete.Length, Is.EqualTo(0)); + Assert.That(squashed.Modify, Is.Not.Null); + Assert.That(squashed.Modify.Length, Is.EqualTo(0)); - Assert.AreEqual("OsmSharp", squashed.Generator); - Assert.AreEqual(6, squashed.Version); + Assert.That(squashed.Generator, Is.EqualTo("OsmSharp")); + Assert.That(squashed.Version, Is.EqualTo(System.Version.Parse("0.6"))); } /// @@ -198,7 +198,7 @@ public void TestSquashDeleteModifiedCreation() } }, Generator = "OsmSharp", - Version = 6 + Version = System.Version.Parse("0.6") }; var changeset2 = new OsmChange() { @@ -211,7 +211,7 @@ public void TestSquashDeleteModifiedCreation() } }, Generator = "OsmSharp", - Version = 6 + Version = System.Version.Parse("0.6") }; var changeset3 = new OsmChange() { @@ -224,21 +224,21 @@ public void TestSquashDeleteModifiedCreation() } }, Generator = "OsmSharp", - Version = 6 + Version = System.Version.Parse("0.6") }; // doing the squashing, should undo the creation that was modified. var squashed = new[] { changeset1, changeset2, changeset3 }.Squash(); - Assert.IsNotNull(squashed.Create); - Assert.AreEqual(0, squashed.Create.Length); - Assert.IsNotNull(squashed.Delete); - Assert.AreEqual(0, squashed.Delete.Length); - Assert.IsNotNull(squashed.Modify); - Assert.AreEqual(0, squashed.Modify.Length); + Assert.That(squashed.Create, Is.Not.Null); + Assert.That(squashed.Create.Length, Is.EqualTo(0)); + Assert.That(squashed.Delete, Is.Not.Null); + Assert.That(squashed.Delete.Length, Is.EqualTo(0)); + Assert.That(squashed.Modify, Is.Not.Null); + Assert.That(squashed.Modify.Length, Is.EqualTo(0)); - Assert.AreEqual("OsmSharp", squashed.Generator); - Assert.AreEqual(6, squashed.Version); + Assert.That(squashed.Generator, Is.EqualTo("OsmSharp")); + Assert.That(squashed.Version, Is.EqualTo(System.Version.Parse("0.6"))); } /// @@ -263,24 +263,24 @@ public void TestSquashModifyModification() } }, Generator = "OsmSharp", - Version = 6 + Version = System.Version.Parse("0.6") }; // doing the squashing, should modify the creation. var squashed = new[] { changeset1 }.Squash(); - Assert.IsNotNull(squashed.Modify); - Assert.AreEqual(1, squashed.Modify.Length); - Assert.AreEqual(OsmGeoType.Node, squashed.Modify[0].Type); - Assert.AreEqual(1, squashed.Modify[0].Id); - Assert.AreEqual(3, squashed.Modify[0].Version); - Assert.IsNotNull(squashed.Delete); - Assert.AreEqual(0, squashed.Delete.Length); - Assert.IsNotNull(squashed.Create); - Assert.AreEqual(0, squashed.Create.Length); + Assert.That(squashed.Modify, Is.Not.Null); + Assert.That(squashed.Modify.Length, Is.EqualTo(1)); + Assert.That(squashed.Modify[0].Type, Is.EqualTo(OsmGeoType.Node)); + Assert.That(squashed.Modify[0].Id, Is.EqualTo(1)); + Assert.That(squashed.Modify[0].Version, Is.EqualTo(3)); + Assert.That(squashed.Delete, Is.Not.Null); + Assert.That(squashed.Delete.Length, Is.EqualTo(0)); + Assert.That(squashed.Create, Is.Not.Null); + Assert.That(squashed.Create.Length, Is.EqualTo(0)); - Assert.AreEqual("OsmSharp", squashed.Generator); - Assert.AreEqual(6, squashed.Version); + Assert.That(squashed.Generator, Is.EqualTo("OsmSharp")); + Assert.That(squashed.Version, Is.EqualTo(System.Version.Parse("0.6"))); } } } \ No newline at end of file diff --git a/test/OsmSharp.Test/Complete/CompleteRelationTests.cs b/test/OsmSharp.Test/Complete/CompleteRelationTests.cs index 988de608..8056ebff 100755 --- a/test/OsmSharp.Test/Complete/CompleteRelationTests.cs +++ b/test/OsmSharp.Test/Complete/CompleteRelationTests.cs @@ -82,24 +82,24 @@ public void TestToSimple() }; var osmGeo = completeRelation.ToSimple(); - Assert.IsNotNull(osmGeo); - Assert.IsInstanceOf(osmGeo); + Assert.That(osmGeo, Is.Not.Null); + Assert.That(osmGeo, Is.InstanceOf()); var relation = osmGeo as Relation; - Assert.AreEqual(completeRelation.Id, relation.Id); - Assert.AreEqual(completeRelation.ChangeSetId, relation.ChangeSetId); - Assert.AreEqual(completeRelation.TimeStamp, relation.TimeStamp); - Assert.AreEqual(completeRelation.UserName, relation.UserName); - Assert.AreEqual(completeRelation.UserId, relation.UserId); - Assert.AreEqual(completeRelation.Version, relation.Version); - Assert.AreEqual(completeRelation.Visible, relation.Visible); - Assert.IsNotNull(relation.Members); - Assert.AreEqual(completeRelation.Members.Length, relation.Members.Length); + Assert.That(relation.Id, Is.EqualTo(completeRelation.Id)); + Assert.That(relation.ChangeSetId, Is.EqualTo(completeRelation.ChangeSetId)); + Assert.That(relation.TimeStamp, Is.EqualTo(completeRelation.TimeStamp)); + Assert.That(relation.UserName, Is.EqualTo(completeRelation.UserName)); + Assert.That(relation.UserId, Is.EqualTo(completeRelation.UserId)); + Assert.That(relation.Version, Is.EqualTo(completeRelation.Version)); + Assert.That(relation.Visible, Is.EqualTo(completeRelation.Visible)); + Assert.That(relation.Members, Is.Not.Null); + Assert.That(relation.Members.Length, Is.EqualTo(completeRelation.Members.Length)); for (var i = 0; i < completeRelation.Members.Length; i++) { - Assert.AreEqual(completeRelation.Members[i].Member.Id, relation.Members[i].Id); - Assert.AreEqual(completeRelation.Members[i].Member.Type, relation.Members[i].Type); - Assert.AreEqual(completeRelation.Members[i].Role, relation.Members[i].Role); + Assert.That(relation.Members[i].Id, Is.EqualTo(completeRelation.Members[i].Member.Id)); + Assert.That(relation.Members[i].Type, Is.EqualTo(completeRelation.Members[i].Member.Type)); + Assert.That(relation.Members[i].Role, Is.EqualTo(completeRelation.Members[i].Role)); } } @@ -182,60 +182,60 @@ public void TestToSimpleWithChildren() }; var osmGeos = expectedSuperRelation.ToSimpleWithChildren(); - Assert.IsNotNull(osmGeos); + Assert.That(osmGeos, Is.Not.Null); foreach (var osmGeo in osmGeos) { - Assert.IsNotNull(osmGeo.Tags); - Assert.AreEqual(1, osmGeo.Tags.Count); - Assert.True(osmGeo.Tags.ContainsKey("type")); - Assert.AreEqual(osmGeo.Type.ToString(), osmGeo.Tags["type"]); + Assert.That(osmGeo.Tags, Is.Not.Null); + Assert.That(osmGeo.Tags.Count, Is.EqualTo(1)); + Assert.That(osmGeo.Tags.ContainsKey("type"), Is.True); + Assert.That(osmGeo.Tags["type"], Is.EqualTo(osmGeo.Type.ToString())); } var nodes = osmGeos.OfType().ToArray(); - Assert.AreEqual(1, nodes.Length); + Assert.That(nodes.Length, Is.EqualTo(1)); var resultNode = nodes[0]; - Assert.AreEqual(expectedNode.Id, resultNode.Id); - Assert.AreEqual(expectedNode.Version, resultNode.Version); + Assert.That(resultNode.Id, Is.EqualTo(expectedNode.Id)); + Assert.That(resultNode.Version, Is.EqualTo(expectedNode.Version)); var ways = osmGeos.OfType().ToArray(); - Assert.AreEqual(1, ways.Length); + Assert.That(ways.Length, Is.EqualTo(1)); var resultWay = ways[0]; - Assert.AreEqual(expectedWay.Id, resultWay.Id); - Assert.AreEqual(expectedWay.Version, resultWay.Version); - Assert.IsNotNull(resultWay.Nodes); - CollectionAssert.AreEqual(expectedWay.Nodes.Select(n => n.Id), resultWay.Nodes); + Assert.That(resultWay.Id, Is.EqualTo(expectedWay.Id)); + Assert.That(resultWay.Version, Is.EqualTo(expectedWay.Version)); + Assert.That(resultWay.Nodes, Is.Not.Null); + NUnit.Framework.Legacy.CollectionAssert.AreEqual(expectedWay.Nodes.Select(n => n.Id), resultWay.Nodes); var relations = osmGeos.OfType().Where(r => !r.Members.Any(m => m.Type == OsmGeoType.Relation)).ToArray(); - Assert.AreEqual(1, relations.Length); + Assert.That(relations.Length, Is.EqualTo(1)); var resultRelation = relations[0]; - Assert.AreEqual(expectedRelation.Id, resultRelation.Id); - Assert.AreEqual(expectedRelation.Version, resultRelation.Version); - Assert.AreEqual(expectedRelation.UserId, resultRelation.UserId); - Assert.AreEqual(expectedRelation.Members.Length, resultRelation.Members.Length); + Assert.That(resultRelation.Id, Is.EqualTo(expectedRelation.Id)); + Assert.That(resultRelation.Version, Is.EqualTo(expectedRelation.Version)); + Assert.That(resultRelation.UserId, Is.EqualTo(expectedRelation.UserId)); + Assert.That(resultRelation.Members.Length, Is.EqualTo(expectedRelation.Members.Length)); for (int i = 0; i < expectedRelation.Members.Length; i++) { - Assert.AreEqual(expectedRelation.Members[i].Role, resultRelation.Members[i].Role); - Assert.AreEqual(expectedRelation.Members[i].Member.Id, resultRelation.Members[i].Id); - Assert.AreEqual(expectedRelation.Members[i].Member.Type, resultRelation.Members[i].Type); + Assert.That(resultRelation.Members[i].Role, Is.EqualTo(expectedRelation.Members[i].Role)); + Assert.That(resultRelation.Members[i].Id, Is.EqualTo(expectedRelation.Members[i].Member.Id)); + Assert.That(resultRelation.Members[i].Type, Is.EqualTo(expectedRelation.Members[i].Member.Type)); } var superRelations = osmGeos.OfType().Where(r => r.Members.Any(m => m.Type == OsmGeoType.Relation)).ToArray(); - Assert.AreEqual(1, superRelations.Length); + Assert.That(superRelations.Length, Is.EqualTo(1)); var resultSuperRelation = superRelations[0]; - Assert.AreEqual(expectedSuperRelation.Id, resultSuperRelation.Id); - Assert.AreEqual(expectedSuperRelation.Version, resultSuperRelation.Version); - Assert.AreEqual(expectedSuperRelation.UserId, resultSuperRelation.UserId); - Assert.AreEqual(expectedSuperRelation.Members.Length, resultSuperRelation.Members.Length); + Assert.That(resultSuperRelation.Id, Is.EqualTo(expectedSuperRelation.Id)); + Assert.That(resultSuperRelation.Version, Is.EqualTo(expectedSuperRelation.Version)); + Assert.That(resultSuperRelation.UserId, Is.EqualTo(expectedSuperRelation.UserId)); + Assert.That(resultSuperRelation.Members.Length, Is.EqualTo(expectedSuperRelation.Members.Length)); for (int i = 0; i < expectedSuperRelation.Members.Length; i++) { - Assert.AreEqual(expectedSuperRelation.Members[i].Member.Id, resultSuperRelation.Members[i].Id); - Assert.AreEqual(expectedSuperRelation.Members[i].Member.Type, resultSuperRelation.Members[i].Type); - Assert.AreEqual(expectedSuperRelation.Members[i].Role, resultSuperRelation.Members[i].Role); + Assert.That(resultSuperRelation.Members[i].Id, Is.EqualTo(expectedSuperRelation.Members[i].Member.Id)); + Assert.That(resultSuperRelation.Members[i].Type, Is.EqualTo(expectedSuperRelation.Members[i].Member.Type)); + Assert.That(resultSuperRelation.Members[i].Role, Is.EqualTo(expectedSuperRelation.Members[i].Role)); } var others = osmGeos.Except(nodes).Except(ways).Except(relations).Except(superRelations).ToArray(); - CollectionAssert.IsEmpty(others); + NUnit.Framework.Legacy.CollectionAssert.IsEmpty(others); } } } \ No newline at end of file diff --git a/test/OsmSharp.Test/Complete/CompleteWayTests.cs b/test/OsmSharp.Test/Complete/CompleteWayTests.cs index f484c91f..b2956c40 100755 --- a/test/OsmSharp.Test/Complete/CompleteWayTests.cs +++ b/test/OsmSharp.Test/Complete/CompleteWayTests.cs @@ -70,22 +70,22 @@ public void TestToSimple() }; var osmGeo = completeWay.ToSimple(); - Assert.IsNotNull(osmGeo); - Assert.IsInstanceOf(osmGeo); + Assert.That(osmGeo, Is.Not.Null); + Assert.That(osmGeo, Is.InstanceOf()); var way = osmGeo as Way; - Assert.AreEqual(completeWay.Id, way.Id); - Assert.AreEqual(completeWay.ChangeSetId, way.ChangeSetId); - Assert.AreEqual(completeWay.TimeStamp, way.TimeStamp); - Assert.AreEqual(completeWay.UserName, way.UserName); - Assert.AreEqual(completeWay.UserId, way.UserId); - Assert.AreEqual(completeWay.Version, way.Version); - Assert.AreEqual(completeWay.Visible, way.Visible); - Assert.IsNotNull(way.Nodes); - Assert.AreEqual(completeWay.Nodes.Length, way.Nodes.Length); + Assert.That(way.Id, Is.EqualTo(completeWay.Id)); + Assert.That(way.ChangeSetId, Is.EqualTo(completeWay.ChangeSetId)); + Assert.That(way.TimeStamp, Is.EqualTo(completeWay.TimeStamp)); + Assert.That(way.UserName, Is.EqualTo(completeWay.UserName)); + Assert.That(way.UserId, Is.EqualTo(completeWay.UserId)); + Assert.That(way.Version, Is.EqualTo(completeWay.Version)); + Assert.That(way.Visible, Is.EqualTo(completeWay.Visible)); + Assert.That(way.Nodes, Is.Not.Null); + Assert.That(way.Nodes.Length, Is.EqualTo(completeWay.Nodes.Length)); for (var i = 0; i < completeWay.Nodes.Length; i++) { - Assert.AreEqual(completeWay.Nodes[i].Id, way.Nodes[i]); + Assert.That(way.Nodes[i], Is.EqualTo(completeWay.Nodes[i].Id)); } } @@ -149,44 +149,44 @@ public void TestToSimpleWithChildren() }; var osmGeos = completeWay.ToSimpleWithChildren(); - Assert.IsNotNull(osmGeos); + Assert.That(osmGeos, Is.Not.Null); var ways = osmGeos.OfType().ToArray(); - Assert.AreEqual(1, ways.Length); + Assert.That(ways.Length, Is.EqualTo(1)); var way = ways[0]; - Assert.AreEqual(completeWay.Id, way.Id); - Assert.AreEqual(completeWay.ChangeSetId, way.ChangeSetId); - Assert.AreEqual(completeWay.TimeStamp, way.TimeStamp); - Assert.AreEqual(completeWay.UserName, way.UserName); - Assert.AreEqual(completeWay.UserId, way.UserId); - Assert.AreEqual(completeWay.Version, way.Version); - Assert.AreEqual(completeWay.Visible, way.Visible); - Assert.IsNotNull(way.Nodes); - Assert.AreEqual(completeWay.Nodes.Length, way.Nodes.Length); + Assert.That(way.Id, Is.EqualTo(completeWay.Id)); + Assert.That(way.ChangeSetId, Is.EqualTo(completeWay.ChangeSetId)); + Assert.That(way.TimeStamp, Is.EqualTo(completeWay.TimeStamp)); + Assert.That(way.UserName, Is.EqualTo(completeWay.UserName)); + Assert.That(way.UserId, Is.EqualTo(completeWay.UserId)); + Assert.That(way.Version, Is.EqualTo(completeWay.Version)); + Assert.That(way.Visible, Is.EqualTo(completeWay.Visible)); + Assert.That(way.Nodes, Is.Not.Null); + Assert.That(way.Nodes.Length, Is.EqualTo(completeWay.Nodes.Length)); for (var i = 0; i < completeWay.Nodes.Length; i++) { - Assert.AreEqual(completeWay.Nodes[i].Id, way.Nodes[i]); + Assert.That(way.Nodes[i], Is.EqualTo(completeWay.Nodes[i].Id)); } var nodes = osmGeos.OfType().ToArray(); - Assert.AreEqual(3, nodes.Length); + Assert.That(nodes.Length, Is.EqualTo(3)); for (int i = 0; i < 3; i++) { var node = nodes[i]; var expected = i + 1; - Assert.AreEqual(expected, node.Id); - Assert.AreEqual(expected, node.Version); - Assert.AreEqual(expected, node.Latitude); - Assert.AreEqual(expected, node.Longitude); - Assert.AreEqual(expected, node.UserId); - Assert.IsNotNull(node.Tags); - Assert.AreEqual(1, node.Tags.Count); - Assert.IsTrue(node.Tags.ContainsKey("id")); - Assert.AreEqual(node.Tags["id"], expected.ToString()); + Assert.That(node.Id, Is.EqualTo(expected)); + Assert.That(node.Version, Is.EqualTo(expected)); + Assert.That(node.Latitude, Is.EqualTo(expected)); + Assert.That(node.Longitude, Is.EqualTo(expected)); + Assert.That(node.UserId, Is.EqualTo(expected)); + Assert.That(node.Tags, Is.Not.Null); + Assert.That(node.Tags.Count, Is.EqualTo(1)); + Assert.That(node.Tags.ContainsKey("id"), Is.True); + Assert.That(expected.ToString(), Is.EqualTo(node.Tags["id"])); } var others = osmGeos.Except(ways).Except(nodes).ToArray(); - CollectionAssert.IsEmpty(others); + NUnit.Framework.Legacy.CollectionAssert.IsEmpty(others); } } } \ No newline at end of file diff --git a/test/OsmSharp.Test/Db/HistoryDbTests.cs b/test/OsmSharp.Test/Db/HistoryDbTests.cs index 98a2ef93..7d9aab84 100755 --- a/test/OsmSharp.Test/Db/HistoryDbTests.cs +++ b/test/OsmSharp.Test/Db/HistoryDbTests.cs @@ -79,34 +79,34 @@ public void TestApplyChangesetNewNodesInNewWay() var results = historyDb.ApplyChangeset(1, osmChange); - Assert.IsNotNull(results); - Assert.IsNotNull(results.Result); - Assert.IsNotNull(results.Result.Results); - Assert.AreEqual(3, results.Result.Results.Length); + Assert.That(results, Is.Not.Null); + Assert.That(results.Result, Is.Not.Null); + Assert.That(results.Result.Results, Is.Not.Null); + Assert.That(results.Result.Results.Length, Is.EqualTo(3)); var result = results.Result.Results[0]; - Assert.IsInstanceOf(result); - Assert.AreEqual(3, result.NewId); - Assert.AreEqual(-1, result.OldId); - Assert.AreEqual(1, result.NewVersion); + Assert.That(result, Is.InstanceOf()); + Assert.That(result.NewId, Is.EqualTo(3)); + Assert.That(result.OldId, Is.EqualTo(-1)); + Assert.That(result.NewVersion, Is.EqualTo(1)); result = results.Result.Results[1]; - Assert.IsInstanceOf(result); - Assert.AreEqual(4, result.NewId); - Assert.AreEqual(-2, result.OldId); - Assert.AreEqual(1, result.NewVersion); + Assert.That(result, Is.InstanceOf()); + Assert.That(result.NewId, Is.EqualTo(4)); + Assert.That(result.OldId, Is.EqualTo(-2)); + Assert.That(result.NewVersion, Is.EqualTo(1)); result = results.Result.Results[2]; - Assert.IsInstanceOf(result); - Assert.AreEqual(1, result.NewId); - Assert.AreEqual(-1, result.OldId); - Assert.AreEqual(1, result.NewVersion); + Assert.That(result, Is.InstanceOf()); + Assert.That(result.NewId, Is.EqualTo(1)); + Assert.That(result.OldId, Is.EqualTo(-1)); + Assert.That(result.NewVersion, Is.EqualTo(1)); var way = historyDb.Get(OsmGeoType.Way, 1) as Way; - Assert.IsNotNull(way); - Assert.IsNotNull(way.Nodes); - Assert.AreEqual(4, way.Nodes.Length); - Assert.AreEqual(1, way.Nodes[0]); - Assert.AreEqual(3, way.Nodes[1]); - Assert.AreEqual(4, way.Nodes[2]); - Assert.AreEqual(2, way.Nodes[3]); + Assert.That(way, Is.Not.Null); + Assert.That(way.Nodes, Is.Not.Null); + Assert.That(way.Nodes.Length, Is.EqualTo(4)); + Assert.That(way.Nodes[0], Is.EqualTo(1)); + Assert.That(way.Nodes[1], Is.EqualTo(3)); + Assert.That(way.Nodes[2], Is.EqualTo(4)); + Assert.That(way.Nodes[3], Is.EqualTo(2)); } /// @@ -167,34 +167,34 @@ public void TestApplyChangesetNewNodesInModifiedWay() var results = historyDb.ApplyChangeset(1, osmChange); - Assert.IsNotNull(results); - Assert.IsNotNull(results.Result); - Assert.IsNotNull(results.Result.Results); - Assert.AreEqual(3, results.Result.Results.Length); + Assert.That(results, Is.Not.Null); + Assert.That(results.Result, Is.Not.Null); + Assert.That(results.Result.Results, Is.Not.Null); + Assert.That(results.Result.Results.Length, Is.EqualTo(3)); var result = results.Result.Results[0]; - Assert.IsInstanceOf(result); - Assert.AreEqual(3, result.NewId); - Assert.AreEqual(-1, result.OldId); - Assert.AreEqual(1, result.NewVersion); + Assert.That(result, Is.InstanceOf()); + Assert.That(result.NewId, Is.EqualTo(3)); + Assert.That(result.OldId, Is.EqualTo(-1)); + Assert.That(result.NewVersion, Is.EqualTo(1)); result = results.Result.Results[1]; - Assert.IsInstanceOf(result); - Assert.AreEqual(4, result.NewId); - Assert.AreEqual(-2, result.OldId); - Assert.AreEqual(1, result.NewVersion); + Assert.That(result, Is.InstanceOf()); + Assert.That(result.NewId, Is.EqualTo(4)); + Assert.That(result.OldId, Is.EqualTo(-2)); + Assert.That(result.NewVersion, Is.EqualTo(1)); result = results.Result.Results[2]; - Assert.IsInstanceOf(result); - Assert.AreEqual(1, result.NewId); - Assert.AreEqual(1, result.OldId); - Assert.AreEqual(2, result.NewVersion); + Assert.That(result, Is.InstanceOf()); + Assert.That(result.NewId, Is.EqualTo(1)); + Assert.That(result.OldId, Is.EqualTo(1)); + Assert.That(result.NewVersion, Is.EqualTo(2)); var way = historyDb.Get(OsmGeoType.Way, 1) as Way; - Assert.IsNotNull(way); - Assert.IsNotNull(way.Nodes); - Assert.AreEqual(4, way.Nodes.Length); - Assert.AreEqual(1, way.Nodes[0]); - Assert.AreEqual(3, way.Nodes[1]); - Assert.AreEqual(4, way.Nodes[2]); - Assert.AreEqual(2, way.Nodes[3]); + Assert.That(way, Is.Not.Null); + Assert.That(way.Nodes, Is.Not.Null); + Assert.That(way.Nodes.Length, Is.EqualTo(4)); + Assert.That(way.Nodes[0], Is.EqualTo(1)); + Assert.That(way.Nodes[1], Is.EqualTo(3)); + Assert.That(way.Nodes[2], Is.EqualTo(4)); + Assert.That(way.Nodes[3], Is.EqualTo(2)); } } } \ No newline at end of file diff --git a/test/OsmSharp.Test/Db/OsmGeoKeyTests.cs b/test/OsmSharp.Test/Db/OsmGeoKeyTests.cs index 7be90f28..6efb0d89 100644 --- a/test/OsmSharp.Test/Db/OsmGeoKeyTests.cs +++ b/test/OsmSharp.Test/Db/OsmGeoKeyTests.cs @@ -9,122 +9,122 @@ public class OsmGeoKeyTests [Test] public void OsmGeoKey_CompareTo_TypeNode_ShouldCompareId() { - Assert.True(new OsmGeoKey(OsmGeoType.Node, 1).CompareTo(new OsmGeoKey(OsmGeoType.Node, 2)) < 0); - Assert.True(new OsmGeoKey(OsmGeoType.Node, 2).CompareTo(new OsmGeoKey(OsmGeoType.Node, 1)) > 0); - Assert.True(new OsmGeoKey(OsmGeoType.Node, 1).CompareTo(new OsmGeoKey(OsmGeoType.Node, 1)) == 0); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 1).CompareTo(new OsmGeoKey(OsmGeoType.Node, 2)) < 0, Is.True); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 2).CompareTo(new OsmGeoKey(OsmGeoType.Node, 1)) > 0, Is.True); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 1).CompareTo(new OsmGeoKey(OsmGeoType.Node, 1)) == 0, Is.True); } [Test] public void OsmGeoKey_CompareTo_TypeWay_ShouldCompareId() { - Assert.True(new OsmGeoKey(OsmGeoType.Way, 1).CompareTo(new OsmGeoKey(OsmGeoType.Way, 2)) < 0); - Assert.True(new OsmGeoKey(OsmGeoType.Way, 2).CompareTo(new OsmGeoKey(OsmGeoType.Way, 1)) > 0); - Assert.True(new OsmGeoKey(OsmGeoType.Way, 1).CompareTo(new OsmGeoKey(OsmGeoType.Way, 1)) == 0); + Assert.That(new OsmGeoKey(OsmGeoType.Way, 1).CompareTo(new OsmGeoKey(OsmGeoType.Way, 2)) < 0, Is.True); + Assert.That(new OsmGeoKey(OsmGeoType.Way, 2).CompareTo(new OsmGeoKey(OsmGeoType.Way, 1)) > 0, Is.True); + Assert.That(new OsmGeoKey(OsmGeoType.Way, 1).CompareTo(new OsmGeoKey(OsmGeoType.Way, 1)) == 0, Is.True); } [Test] public void OsmGeoKey_CompareTo_TypeRelation_ShouldCompareId() { - Assert.True(new OsmGeoKey(OsmGeoType.Relation, 1).CompareTo(new OsmGeoKey(OsmGeoType.Relation, 2)) < 0); - Assert.True(new OsmGeoKey(OsmGeoType.Relation, 2).CompareTo(new OsmGeoKey(OsmGeoType.Relation, 1)) > 0); - Assert.True(new OsmGeoKey(OsmGeoType.Relation, 1).CompareTo(new OsmGeoKey(OsmGeoType.Relation, 1)) == 0); + Assert.That(new OsmGeoKey(OsmGeoType.Relation, 1).CompareTo(new OsmGeoKey(OsmGeoType.Relation, 2)) < 0, Is.True); + Assert.That(new OsmGeoKey(OsmGeoType.Relation, 2).CompareTo(new OsmGeoKey(OsmGeoType.Relation, 1)) > 0, Is.True); + Assert.That(new OsmGeoKey(OsmGeoType.Relation, 1).CompareTo(new OsmGeoKey(OsmGeoType.Relation, 1)) == 0, Is.True); } [Test] public void OsmGeoKey_CompareTo_TypeNode_ShouldSmallerThanWay() { - Assert.True(new OsmGeoKey(OsmGeoType.Node, 1).CompareTo(new OsmGeoKey(OsmGeoType.Way, 2)) < 0); - Assert.True(new OsmGeoKey(OsmGeoType.Node, 2).CompareTo(new OsmGeoKey(OsmGeoType.Way, 1)) < 0); - Assert.True(new OsmGeoKey(OsmGeoType.Node, 1).CompareTo(new OsmGeoKey(OsmGeoType.Way, 1)) < 0); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 1).CompareTo(new OsmGeoKey(OsmGeoType.Way, 2)) < 0, Is.True); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 2).CompareTo(new OsmGeoKey(OsmGeoType.Way, 1)) < 0, Is.True); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 1).CompareTo(new OsmGeoKey(OsmGeoType.Way, 1)) < 0, Is.True); } [Test] public void OsmGeoKey_CompareTo_TypeNode_ShouldSmallerThanRelation() { - Assert.True(new OsmGeoKey(OsmGeoType.Node, 1).CompareTo(new OsmGeoKey(OsmGeoType.Relation, 2)) < 0); - Assert.True(new OsmGeoKey(OsmGeoType.Node, 2).CompareTo(new OsmGeoKey(OsmGeoType.Relation, 1)) < 0); - Assert.True(new OsmGeoKey(OsmGeoType.Node, 1).CompareTo(new OsmGeoKey(OsmGeoType.Relation, 1)) < 0); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 1).CompareTo(new OsmGeoKey(OsmGeoType.Relation, 2)) < 0, Is.True); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 2).CompareTo(new OsmGeoKey(OsmGeoType.Relation, 1)) < 0, Is.True); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 1).CompareTo(new OsmGeoKey(OsmGeoType.Relation, 1)) < 0, Is.True); } [Test] public void OsmGeoKey_CompareTo_TypeWay_ShouldSmallerThanRelation() { - Assert.True(new OsmGeoKey(OsmGeoType.Way, 1).CompareTo(new OsmGeoKey(OsmGeoType.Relation, 2)) < 0); - Assert.True(new OsmGeoKey(OsmGeoType.Way, 2).CompareTo(new OsmGeoKey(OsmGeoType.Relation, 1)) < 0); - Assert.True(new OsmGeoKey(OsmGeoType.Way, 1).CompareTo(new OsmGeoKey(OsmGeoType.Relation, 1)) < 0); + Assert.That(new OsmGeoKey(OsmGeoType.Way, 1).CompareTo(new OsmGeoKey(OsmGeoType.Relation, 2)) < 0, Is.True); + Assert.That(new OsmGeoKey(OsmGeoType.Way, 2).CompareTo(new OsmGeoKey(OsmGeoType.Relation, 1)) < 0, Is.True); + Assert.That(new OsmGeoKey(OsmGeoType.Way, 1).CompareTo(new OsmGeoKey(OsmGeoType.Relation, 1)) < 0, Is.True); } [Test] public void OsmGeoKey_CompareOperators_TypeNode_ShouldSmallerThanWay() { - Assert.True(new OsmGeoKey(OsmGeoType.Node, 1) < new OsmGeoKey(OsmGeoType.Way, 2)); - Assert.True(new OsmGeoKey(OsmGeoType.Node, 2) < new OsmGeoKey(OsmGeoType.Way, 1)); - Assert.True(new OsmGeoKey(OsmGeoType.Node, 1) < new OsmGeoKey(OsmGeoType.Way, 1)); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 1) < new OsmGeoKey(OsmGeoType.Way, 2), Is.True); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 2) < new OsmGeoKey(OsmGeoType.Way, 1), Is.True); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 1) < new OsmGeoKey(OsmGeoType.Way, 1), Is.True); - Assert.True(new OsmGeoKey(OsmGeoType.Node, 1) <= new OsmGeoKey(OsmGeoType.Way, 2)); - Assert.True(new OsmGeoKey(OsmGeoType.Node, 2) <= new OsmGeoKey(OsmGeoType.Way, 1)); - Assert.True(new OsmGeoKey(OsmGeoType.Node, 1) <= new OsmGeoKey(OsmGeoType.Way, 1)); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 1) <= new OsmGeoKey(OsmGeoType.Way, 2), Is.True); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 2) <= new OsmGeoKey(OsmGeoType.Way, 1), Is.True); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 1) <= new OsmGeoKey(OsmGeoType.Way, 1), Is.True); - Assert.False(new OsmGeoKey(OsmGeoType.Node, 1) > new OsmGeoKey(OsmGeoType.Way, 2)); - Assert.False(new OsmGeoKey(OsmGeoType.Node, 2) > new OsmGeoKey(OsmGeoType.Way, 1)); - Assert.False(new OsmGeoKey(OsmGeoType.Node, 1) > new OsmGeoKey(OsmGeoType.Way, 1)); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 1) > new OsmGeoKey(OsmGeoType.Way, 2), Is.False); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 2) > new OsmGeoKey(OsmGeoType.Way, 1), Is.False); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 1) > new OsmGeoKey(OsmGeoType.Way, 1), Is.False); - Assert.False(new OsmGeoKey(OsmGeoType.Node, 1) >= new OsmGeoKey(OsmGeoType.Way, 2)); - Assert.False(new OsmGeoKey(OsmGeoType.Node, 2) >= new OsmGeoKey(OsmGeoType.Way, 1)); - Assert.False(new OsmGeoKey(OsmGeoType.Node, 1) >= new OsmGeoKey(OsmGeoType.Way, 1)); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 1) >= new OsmGeoKey(OsmGeoType.Way, 2), Is.False); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 2) >= new OsmGeoKey(OsmGeoType.Way, 1), Is.False); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 1) >= new OsmGeoKey(OsmGeoType.Way, 1), Is.False); } [Test] public void OsmGeoKey_CompareOperators_TypeNode_ShouldSmallerThanRelation() { - Assert.True(new OsmGeoKey(OsmGeoType.Node, 1) < new OsmGeoKey(OsmGeoType.Relation, 2)); - Assert.True(new OsmGeoKey(OsmGeoType.Node, 2) < new OsmGeoKey(OsmGeoType.Relation, 1)); - Assert.True(new OsmGeoKey(OsmGeoType.Node, 1) < new OsmGeoKey(OsmGeoType.Relation, 1)); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 1) < new OsmGeoKey(OsmGeoType.Relation, 2), Is.True); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 2) < new OsmGeoKey(OsmGeoType.Relation, 1), Is.True); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 1) < new OsmGeoKey(OsmGeoType.Relation, 1), Is.True); - Assert.True(new OsmGeoKey(OsmGeoType.Node, 1) <= new OsmGeoKey(OsmGeoType.Relation, 2)); - Assert.True(new OsmGeoKey(OsmGeoType.Node, 2) <= new OsmGeoKey(OsmGeoType.Relation, 1)); - Assert.True(new OsmGeoKey(OsmGeoType.Node, 1) <= new OsmGeoKey(OsmGeoType.Relation, 1)); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 1) <= new OsmGeoKey(OsmGeoType.Relation, 2), Is.True); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 2) <= new OsmGeoKey(OsmGeoType.Relation, 1), Is.True); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 1) <= new OsmGeoKey(OsmGeoType.Relation, 1), Is.True); - Assert.False(new OsmGeoKey(OsmGeoType.Node, 1) > new OsmGeoKey(OsmGeoType.Relation, 2)); - Assert.False(new OsmGeoKey(OsmGeoType.Node, 2) > new OsmGeoKey(OsmGeoType.Relation, 1)); - Assert.False(new OsmGeoKey(OsmGeoType.Node, 1) > new OsmGeoKey(OsmGeoType.Relation, 1)); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 1) > new OsmGeoKey(OsmGeoType.Relation, 2), Is.False); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 2) > new OsmGeoKey(OsmGeoType.Relation, 1), Is.False); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 1) > new OsmGeoKey(OsmGeoType.Relation, 1), Is.False); - Assert.False(new OsmGeoKey(OsmGeoType.Node, 1) > new OsmGeoKey(OsmGeoType.Relation, 2)); - Assert.False(new OsmGeoKey(OsmGeoType.Node, 2) > new OsmGeoKey(OsmGeoType.Relation, 1)); - Assert.False(new OsmGeoKey(OsmGeoType.Node, 1) > new OsmGeoKey(OsmGeoType.Relation, 1)); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 1) > new OsmGeoKey(OsmGeoType.Relation, 2), Is.False); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 2) > new OsmGeoKey(OsmGeoType.Relation, 1), Is.False); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 1) > new OsmGeoKey(OsmGeoType.Relation, 1), Is.False); } [Test] public void OsmGeoKey_CompareOperators_TypeWay_ShouldSmallerThanRelation() { - Assert.True(new OsmGeoKey(OsmGeoType.Way, 1) < new OsmGeoKey(OsmGeoType.Relation, 2)); - Assert.True(new OsmGeoKey(OsmGeoType.Way, 2) < new OsmGeoKey(OsmGeoType.Relation, 1)); - Assert.True(new OsmGeoKey(OsmGeoType.Way, 1) < new OsmGeoKey(OsmGeoType.Relation, 1)); + Assert.That(new OsmGeoKey(OsmGeoType.Way, 1) < new OsmGeoKey(OsmGeoType.Relation, 2), Is.True); + Assert.That(new OsmGeoKey(OsmGeoType.Way, 2) < new OsmGeoKey(OsmGeoType.Relation, 1), Is.True); + Assert.That(new OsmGeoKey(OsmGeoType.Way, 1) < new OsmGeoKey(OsmGeoType.Relation, 1), Is.True); - Assert.True(new OsmGeoKey(OsmGeoType.Way, 1) <= new OsmGeoKey(OsmGeoType.Relation, 2)); - Assert.True(new OsmGeoKey(OsmGeoType.Way, 2) <= new OsmGeoKey(OsmGeoType.Relation, 1)); - Assert.True(new OsmGeoKey(OsmGeoType.Way, 1) <= new OsmGeoKey(OsmGeoType.Relation, 1)); + Assert.That(new OsmGeoKey(OsmGeoType.Way, 1) <= new OsmGeoKey(OsmGeoType.Relation, 2), Is.True); + Assert.That(new OsmGeoKey(OsmGeoType.Way, 2) <= new OsmGeoKey(OsmGeoType.Relation, 1), Is.True); + Assert.That(new OsmGeoKey(OsmGeoType.Way, 1) <= new OsmGeoKey(OsmGeoType.Relation, 1), Is.True); - Assert.False(new OsmGeoKey(OsmGeoType.Way, 1) > new OsmGeoKey(OsmGeoType.Relation, 2)); - Assert.False(new OsmGeoKey(OsmGeoType.Way, 2) > new OsmGeoKey(OsmGeoType.Relation, 1)); - Assert.False(new OsmGeoKey(OsmGeoType.Way, 1) > new OsmGeoKey(OsmGeoType.Relation, 1)); + Assert.That(new OsmGeoKey(OsmGeoType.Way, 1) > new OsmGeoKey(OsmGeoType.Relation, 2), Is.False); + Assert.That(new OsmGeoKey(OsmGeoType.Way, 2) > new OsmGeoKey(OsmGeoType.Relation, 1), Is.False); + Assert.That(new OsmGeoKey(OsmGeoType.Way, 1) > new OsmGeoKey(OsmGeoType.Relation, 1), Is.False); - Assert.False(new OsmGeoKey(OsmGeoType.Way, 1) >= new OsmGeoKey(OsmGeoType.Relation, 2)); - Assert.False(new OsmGeoKey(OsmGeoType.Way, 2) >= new OsmGeoKey(OsmGeoType.Relation, 1)); - Assert.False(new OsmGeoKey(OsmGeoType.Way, 1) >= new OsmGeoKey(OsmGeoType.Relation, 1)); + Assert.That(new OsmGeoKey(OsmGeoType.Way, 1) >= new OsmGeoKey(OsmGeoType.Relation, 2), Is.False); + Assert.That(new OsmGeoKey(OsmGeoType.Way, 2) >= new OsmGeoKey(OsmGeoType.Relation, 1), Is.False); + Assert.That(new OsmGeoKey(OsmGeoType.Way, 1) >= new OsmGeoKey(OsmGeoType.Relation, 1), Is.False); } [Test] public void OsmGeoKey_CompareOperators_WhenEqual_ShouldSmallerThanOrEqual() { // ReSharper disable EqualExpressionComparison - Assert.True(new OsmGeoKey(OsmGeoType.Node, 1) <= new OsmGeoKey(OsmGeoType.Node, 1)); - Assert.True(new OsmGeoKey(OsmGeoType.Way, 1) <= new OsmGeoKey(OsmGeoType.Way, 1)); - Assert.True(new OsmGeoKey(OsmGeoType.Relation, 1) <= new OsmGeoKey(OsmGeoType.Relation, 1)); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 1) <= new OsmGeoKey(OsmGeoType.Node, 1), Is.True); + Assert.That(new OsmGeoKey(OsmGeoType.Way, 1) <= new OsmGeoKey(OsmGeoType.Way, 1), Is.True); + Assert.That(new OsmGeoKey(OsmGeoType.Relation, 1) <= new OsmGeoKey(OsmGeoType.Relation, 1), Is.True); - Assert.True(new OsmGeoKey(OsmGeoType.Node, 1) >= new OsmGeoKey(OsmGeoType.Node, 1)); - Assert.True(new OsmGeoKey(OsmGeoType.Way, 1) >= new OsmGeoKey(OsmGeoType.Way, 1)); - Assert.True(new OsmGeoKey(OsmGeoType.Relation, 1) <= new OsmGeoKey(OsmGeoType.Relation, 1)); + Assert.That(new OsmGeoKey(OsmGeoType.Node, 1) >= new OsmGeoKey(OsmGeoType.Node, 1), Is.True); + Assert.That(new OsmGeoKey(OsmGeoType.Way, 1) >= new OsmGeoKey(OsmGeoType.Way, 1), Is.True); + Assert.That(new OsmGeoKey(OsmGeoType.Relation, 1) <= new OsmGeoKey(OsmGeoType.Relation, 1), Is.True); } } } \ No newline at end of file diff --git a/test/OsmSharp.Test/Extensions.cs b/test/OsmSharp.Test/Extensions.cs index 8f39af9f..d0b788c8 100755 --- a/test/OsmSharp.Test/Extensions.cs +++ b/test/OsmSharp.Test/Extensions.cs @@ -20,6 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. +using System; using System.IO; namespace OsmSharp.Test @@ -39,4 +40,27 @@ public static string ReadBeginToEnd(this MemoryStream stream) return streamReader.ReadToEnd(); } } + + + public static class DateTimeHelpers + { + public static DateTime UnixEpoch() + { +#if NET462 + return new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc); +#else + return DateTime.UnixEpoch; +#endif + } + + public static DateTime FromMillisecondsSinceUnixEpoch(long milliseconds) + { + return UnixEpoch().AddMilliseconds(milliseconds).ToLocalTime(); + } + + public static long ToMillisecondsSinceUnixEpoch(DateTime dateTime) + { + return (long)(dateTime - UnixEpoch()).TotalMilliseconds; + } + } } \ No newline at end of file diff --git a/test/OsmSharp.Test/Geo/ComparisonTests.cs b/test/OsmSharp.Test/Geo/ComparisonTests.cs index 609fba21..dbb76fb4 100644 --- a/test/OsmSharp.Test/Geo/ComparisonTests.cs +++ b/test/OsmSharp.Test/Geo/ComparisonTests.cs @@ -18,8 +18,8 @@ public void OsmGeo_Nodes_CompareId() Version = 0, }; - Assert.AreEqual(-1, n1.CompareTo(n2)); - Assert.AreEqual(1, n2.CompareTo(n1)); + Assert.That(n1.CompareTo(n2), Is.EqualTo(-1)); + Assert.That(n2.CompareTo(n1), Is.EqualTo(1)); } @@ -36,8 +36,8 @@ public void OsmGeo_Ways_CompareId() Version = 0, }; - Assert.AreEqual(-1, n1.CompareTo(n2)); - Assert.AreEqual(1, n2.CompareTo(n1)); + Assert.That(n1.CompareTo(n2), Is.EqualTo(-1)); + Assert.That(n2.CompareTo(n1), Is.EqualTo(1)); } @@ -54,8 +54,8 @@ public void OsmGeo_NodeAndWay_CompareId() Version = 0, }; - Assert.AreEqual(1, n1.CompareTo(n2)); - Assert.AreEqual(-1, n2.CompareTo(n1)); + Assert.That(n1.CompareTo(n2), Is.EqualTo(1)); + Assert.That(n2.CompareTo(n1), Is.EqualTo(-1)); } @@ -66,8 +66,8 @@ public void OsmGeoKey_Nodes_CompareId() var n2 = new OsmGeoKey(OsmGeoType.Node, 43); - Assert.AreEqual(-1, n1.CompareTo(n2)); - Assert.AreEqual(1, n2.CompareTo(n1)); + Assert.That(n1.CompareTo(n2), Is.EqualTo(-1)); + Assert.That(n2.CompareTo(n1), Is.EqualTo(1)); } @@ -78,8 +78,8 @@ public void OsmGeoKey_Ways_CompareId() var n2 = new OsmGeoKey(OsmGeoType.Way, 43); - Assert.AreEqual(-1, n1.CompareTo(n2)); - Assert.AreEqual(1, n2.CompareTo(n1)); + Assert.That(n1.CompareTo(n2), Is.EqualTo(-1)); + Assert.That(n2.CompareTo(n1), Is.EqualTo(1)); } @@ -90,8 +90,8 @@ public void OsmGeoKey_NodeAndWay_CompareId() var n2 = new OsmGeoKey(OsmGeoType.Way, 0); - Assert.AreEqual(-1, n1.CompareTo(n2)); - Assert.AreEqual(1, n2.CompareTo(n1)); + Assert.That(n1.CompareTo(n2), Is.EqualTo(-1)); + Assert.That(n2.CompareTo(n1), Is.EqualTo(1)); } @@ -102,8 +102,8 @@ public void OsmGeoVersionKey_Nodes_CompareVersion() var n2 = new OsmGeoVersionKey(OsmGeoType.Node, 42, 1); - Assert.AreEqual(-1, n1.CompareTo(n2)); - Assert.AreEqual(1, n2.CompareTo(n1)); + Assert.That(n1.CompareTo(n2), Is.EqualTo(-1)); + Assert.That(n2.CompareTo(n1), Is.EqualTo(1)); } @@ -114,8 +114,8 @@ public void OsmGeoVersionKey_Nodes_CompareId() var n2 = new OsmGeoVersionKey(OsmGeoType.Node, 43, 0); - Assert.AreEqual(-1, n1.CompareTo(n2)); - Assert.AreEqual(1, n2.CompareTo(n1)); + Assert.That(n1.CompareTo(n2), Is.EqualTo(-1)); + Assert.That(n2.CompareTo(n1), Is.EqualTo(1)); } @@ -126,8 +126,8 @@ public void OsmGeoVersionKey_Ways_CompareId() var n2 = new OsmGeoVersionKey(OsmGeoType.Way, 43, 0); - Assert.AreEqual(-1, n1.CompareTo(n2)); - Assert.AreEqual(1, n2.CompareTo(n1)); + Assert.That(n1.CompareTo(n2), Is.EqualTo(-1)); + Assert.That(n2.CompareTo(n1), Is.EqualTo(1)); } @@ -138,8 +138,8 @@ public void OsmGeoVersionKey_NodeAndWay_CompareId() var n2 = new OsmGeoVersionKey(OsmGeoType.Way, 0, 0); - Assert.AreEqual(-1, n1.CompareTo(n2)); - Assert.AreEqual(1, n2.CompareTo(n1)); + Assert.That(n1.CompareTo(n2), Is.EqualTo(-1)); + Assert.That(n2.CompareTo(n1), Is.EqualTo(1)); } } diff --git a/test/OsmSharp.Test/Geo/DefaultFeatureInterpreterTests.cs b/test/OsmSharp.Test/Geo/DefaultFeatureInterpreterTests.cs index 2a6a7176..16a64b40 100755 --- a/test/OsmSharp.Test/Geo/DefaultFeatureInterpreterTests.cs +++ b/test/OsmSharp.Test/Geo/DefaultFeatureInterpreterTests.cs @@ -78,11 +78,11 @@ public void TestWayAreaIsYesArea() var interpreter = new DefaultFeatureInterpreter(); var features = interpreter.Interpret(way, source); - Assert.IsNotNull(features); - Assert.AreEqual(1, features.Count); + Assert.That(features, Is.Not.Null); + Assert.That(features.Count, Is.EqualTo(1)); var feature = features[0]; - Assert.IsInstanceOf(feature.Geometry); - Assert.IsTrue(feature.Attributes.Contains("area", "yes")); + Assert.That(feature.Geometry, Is.InstanceOf()); + Assert.That(feature.Attributes.Contains("area", "yes"), Is.True); } /// @@ -126,11 +126,11 @@ public void TestWayNaturalIsWaterArea() var interpreter = new DefaultFeatureInterpreter(); var features = interpreter.Interpret(way, source); - Assert.IsNotNull(features); - Assert.AreEqual(1, features.Count); + Assert.That(features, Is.Not.Null); + Assert.That(features.Count, Is.EqualTo(1)); var feature = features[0]; - Assert.IsInstanceOf(feature.Geometry); - Assert.IsTrue(feature.Attributes.Contains("natural", "water")); + Assert.That(feature.Geometry, Is.InstanceOf()); + Assert.That(feature.Attributes.Contains("natural", "water"), Is.True); } /// @@ -188,11 +188,11 @@ public void TestRelationMultipolygonAreaOneOuter() var interpreter = new DefaultFeatureInterpreter(); var features = interpreter.Interpret(source.GetRelation(1), source); - Assert.IsNotNull(features); - Assert.AreEqual(1, features.Count); + Assert.That(features, Is.Not.Null); + Assert.That(features.Count, Is.EqualTo(1)); var feature = features[0]; - Assert.IsInstanceOf(feature.Geometry); - Assert.IsTrue(feature.Attributes.Contains("type", "multipolygon")); + Assert.That(feature.Geometry, Is.InstanceOf()); + Assert.That(feature.Attributes.Contains("type", "multipolygon"), Is.True); } /// @@ -293,14 +293,14 @@ public void TestRelationMultipolygonAreaOneOuterOneInner() var interpreter = new DefaultFeatureInterpreter(); var features = interpreter.Interpret(source.GetRelation(1), source); - Assert.IsNotNull(features); - Assert.AreEqual(1, features.Count); + Assert.That(features, Is.Not.Null); + Assert.That(features.Count, Is.EqualTo(1)); var feature = features[0]; - Assert.IsInstanceOf(feature.Geometry); + Assert.That(feature.Geometry, Is.InstanceOf()); var polygon = feature.Geometry as Polygon; - Assert.IsNotNull(polygon.Holes); - Assert.AreEqual(1, polygon.Holes.Count()); - Assert.IsTrue(feature.Attributes.Contains("type", "multipolygon")); + Assert.That(polygon.Holes, Is.Not.Null); + Assert.That(polygon.Holes.Count(), Is.EqualTo(1)); + Assert.That(feature.Attributes.Contains("type", "multipolygon"), Is.True); } /// @@ -439,14 +439,14 @@ public void TestRelationMultipolygonAreaOneOuterTwoInners() var interpreter = new DefaultFeatureInterpreter(); var features = interpreter.Interpret(source.GetRelation(1), source); - Assert.IsNotNull(features); - Assert.AreEqual(1, features.Count); + Assert.That(features, Is.Not.Null); + Assert.That(features.Count, Is.EqualTo(1)); var feature = features[0]; - Assert.IsInstanceOf(feature.Geometry); + Assert.That(feature.Geometry, Is.InstanceOf()); Polygon polygon = feature.Geometry as Polygon; - Assert.IsNotNull(polygon.Holes); - Assert.AreEqual(2, polygon.Holes.Count()); - Assert.IsTrue(feature.Attributes.Contains("type", "multipolygon")); + Assert.That(polygon.Holes, Is.Not.Null); + Assert.That(polygon.Holes.Count(), Is.EqualTo(2)); + Assert.That(feature.Attributes.Contains("type", "multipolygon"), Is.True); } /// @@ -561,14 +561,14 @@ public void TestRelationMultipolygonAreaOneOuterTwoPartialInners() var interpreter = new DefaultFeatureInterpreter(); var features = interpreter.Interpret(source.GetRelation(1), source); - Assert.IsNotNull(features); - Assert.AreEqual(1, features.Count); + Assert.That(features, Is.Not.Null); + Assert.That(features.Count, Is.EqualTo(1)); var feature = features[0]; - Assert.IsInstanceOf(feature.Geometry); + Assert.That(feature.Geometry, Is.InstanceOf()); Polygon polygon = feature.Geometry as Polygon; - Assert.IsNotNull(polygon.Holes); - Assert.AreEqual(1, polygon.Holes.Count()); - Assert.IsTrue(feature.Attributes.Contains("type", "multipolygon")); + Assert.That(polygon.Holes, Is.Not.Null); + Assert.That(polygon.Holes.Count(), Is.EqualTo(1)); + Assert.That(feature.Attributes.Contains("type", "multipolygon"), Is.True); } } } \ No newline at end of file diff --git a/test/OsmSharp.Test/Geo/Streams/Features/Interpreted/InterpretedFeatureStreamSourceTests.cs b/test/OsmSharp.Test/Geo/Streams/Features/Interpreted/InterpretedFeatureStreamSourceTests.cs index da675010..2ecd2f01 100755 --- a/test/OsmSharp.Test/Geo/Streams/Features/Interpreted/InterpretedFeatureStreamSourceTests.cs +++ b/test/OsmSharp.Test/Geo/Streams/Features/Interpreted/InterpretedFeatureStreamSourceTests.cs @@ -71,10 +71,10 @@ public void TestArea() }; var features = source.ToFeatureSource(); - Assert.IsNotNull(features); + Assert.That(features, Is.Not.Null); var featuresList = features.ToList(); - Assert.IsNotNull(featuresList); - Assert.AreEqual(1, featuresList.Count); + Assert.That(featuresList, Is.Not.Null); + Assert.That(featuresList.Count, Is.EqualTo(1)); } } } \ No newline at end of file diff --git a/test/OsmSharp.Test/IO/Json/API/OsmTests.cs b/test/OsmSharp.Test/IO/Json/API/OsmTests.cs index 80cfb639..4bb4e089 100644 --- a/test/OsmSharp.Test/IO/Json/API/OsmTests.cs +++ b/test/OsmSharp.Test/IO/Json/API/OsmTests.cs @@ -14,7 +14,7 @@ public void Osm_ToJson_Complete_ShouldWriteCompleteJson() { var osm = new Osm() { - Version = 0.6, + Version = System.Version.Parse("0.6"), Generator = "OsmSharp", Nodes = new []{new Node { @@ -63,8 +63,7 @@ public void Osm_ToJson_Complete_ShouldWriteCompleteJson() }; var serialized = JsonSerializer.Serialize(osm); - Assert.AreEqual("{\"version\":0.6,\"generator\":\"OsmSharp\",\"elements\":[{\"type\":\"node\",\"lat\":58.4215544,\"lon\":15.6182983,\"id\":100000,\"tags\":{\"highway\":\"residential\"},\"timestamp\":\"2017-04-17T18:31:21Z\",\"version\":3,\"changeset\":47881103,\"user\":\"riiga\",\"uid\":83501},{\"type\":\"way\",\"nodes\":[1,2,3],\"id\":1,\"tags\":{\"amenity\":\"something\",\"key\":\"some_value\"},\"timestamp\":\"2008-09-12T21:37:45\",\"version\":1,\"user\":\"ben\",\"uid\":1},{\"type\":\"relation\",\"members\":[{\"type\":\"node\",\"ref\":1,\"role\":\"role1\"},{\"type\":\"way\",\"ref\":10,\"role\":\"role2\"},{\"type\":\"relation\",\"ref\":100,\"role\":\"role3\"}],\"id\":1,\"tags\":{\"amenity\":\"something\",\"key\":\"some_value\"},\"timestamp\":\"2008-09-12T21:37:45\",\"version\":1,\"user\":\"ben\",\"uid\":1}]}", - serialized); + Assert.That(serialized, Is.EqualTo("{\"version\":0.6,\"generator\":\"OsmSharp\",\"elements\":[{\"type\":\"node\",\"lat\":58.4215544,\"lon\":15.6182983,\"id\":100000,\"tags\":{\"highway\":\"residential\"},\"timestamp\":\"2017-04-17T18:31:21Z\",\"version\":3,\"changeset\":47881103,\"user\":\"riiga\",\"uid\":83501},{\"type\":\"way\",\"nodes\":[1,2,3],\"id\":1,\"tags\":{\"amenity\":\"something\",\"key\":\"some_value\"},\"timestamp\":\"2008-09-12T21:37:45\",\"version\":1,\"user\":\"ben\",\"uid\":1},{\"type\":\"relation\",\"members\":[{\"type\":\"node\",\"ref\":1,\"role\":\"role1\"},{\"type\":\"way\",\"ref\":10,\"role\":\"role2\"},{\"type\":\"relation\",\"ref\":100,\"role\":\"role3\"}],\"id\":1,\"tags\":{\"amenity\":\"something\",\"key\":\"some_value\"},\"timestamp\":\"2008-09-12T21:37:45\",\"version\":1,\"user\":\"ben\",\"uid\":1}]}")); } [Test] @@ -73,13 +72,13 @@ public void Osm_FromJson_Complete_ShouldReadCompleteJson() var osm = JsonSerializer.Deserialize( "{\"version\":0.6,\"generator\":\"OsmSharp\",\"elements\":[{\"type\":\"node\",\"lat\":58.4215544,\"lon\":15.6182983,\"id\":100000,\"tags\":{\"highway\":\"residential\"},\"timestamp\":\"2017-04-17T18:31:21Z\",\"version\":3,\"changeset\":47881103,\"user\":\"riiga\",\"uid\":83501},{\"type\":\"way\",\"nodes\":[1,2,3],\"id\":1,\"tags\":{\"amenity\":\"something\",\"key\":\"some_value\"},\"timestamp\":\"2008-09-12T21:37:45\",\"version\":1,\"user\":\"ben\",\"uid\":1},{\"type\":\"relation\",\"members\":[{\"type\":\"node\",\"ref\":1,\"role\":\"role1\"},{\"type\":\"way\",\"ref\":10,\"role\":\"role2\"},{\"type\":\"relation\",\"ref\":100,\"role\":\"role3\"}],\"id\":1,\"tags\":{\"amenity\":\"something\",\"key\":\"some_value\"},\"timestamp\":\"2008-09-12T21:37:45\",\"version\":1,\"user\":\"ben\",\"uid\":1}]}"); - Assert.NotNull(osm); - Assert.AreEqual(0.6, osm.Version); - Assert.AreEqual("OsmSharp", osm.Generator); + Assert.That(osm, Is.Not.Null); + Assert.That(osm.Version, Is.EqualTo(System.Version.Parse("0.6"))); + Assert.That(osm.Generator, Is.EqualTo("OsmSharp")); - Assert.AreEqual(1, osm.Nodes.Length); - Assert.AreEqual(1, osm.Ways.Length); - Assert.AreEqual(1, osm.Relations.Length); + Assert.That(osm.Nodes.Length, Is.EqualTo(1)); + Assert.That(osm.Ways.Length, Is.EqualTo(1)); + Assert.That(osm.Relations.Length, Is.EqualTo(1)); } } } \ No newline at end of file diff --git a/test/OsmSharp.Test/IO/Json/NodeTests.cs b/test/OsmSharp.Test/IO/Json/NodeTests.cs index 19fb3576..91eddef1 100644 --- a/test/OsmSharp.Test/IO/Json/NodeTests.cs +++ b/test/OsmSharp.Test/IO/Json/NodeTests.cs @@ -26,8 +26,7 @@ public void Node_ToJson_CompleteNode_ShouldReturnCompleteJson() }; var serialized = JsonSerializer.Serialize(n); - Assert.AreEqual("{\"type\":\"node\",\"lat\":58.4215544,\"lon\":15.6182983,\"id\":100000,\"tags\":{\"highway\":\"residential\"},\"timestamp\":\"2017-04-17T18:31:21Z\",\"version\":3,\"changeset\":47881103,\"user\":\"riiga\",\"uid\":83501}", - serialized); + Assert.That(serialized, Is.EqualTo("{\"type\":\"node\",\"lat\":58.4215544,\"lon\":15.6182983,\"id\":100000,\"tags\":{\"highway\":\"residential\"},\"timestamp\":\"2017-04-17T18:31:21Z\",\"version\":3,\"changeset\":47881103,\"user\":\"riiga\",\"uid\":83501}")); } [Test] @@ -35,7 +34,7 @@ public void Node_FromJson_Empty_ShouldReturnEmptyNode() { var n = JsonSerializer.Deserialize("{\"type\":\"node\"}"); - Assert.AreEqual(null, n.Id); + Assert.That(n.Id, Is.EqualTo(null)); } [Test] @@ -43,25 +42,25 @@ public void Node_FromJson_IdOnly_ShouldSetId() { var n = JsonSerializer.Deserialize("{\"type\":\"node\",\"id\": 15441}"); - Assert.AreEqual(15441, n.Id); + Assert.That(n.Id, Is.EqualTo(15441)); } [Test] public void Node_FromJson_CompleteNode_ShouldSetAll() { var n = JsonSerializer.Deserialize("{\"type\":\"node\",\"id\":100000,\"lat\":58.4215544,\"lon\":15.6182983,\"tags\":{\"highway\": \"residential\"},\"timestamp\":\"2017-04-17T18:31:21Z\",\"version\":3,\"changeset\":47881103,\"user\":\"riiga\",\"uid\":83501}"); - Assert.AreEqual(100000, n.Id); - Assert.AreEqual(58.4215544, n.Latitude); - Assert.AreEqual(15.6182983, n.Longitude); - Assert.AreEqual(new DateTime(2017,04,17,18,31,21, DateTimeKind.Utc), n.TimeStamp); - Assert.AreEqual(3, n.Version); - Assert.AreEqual(47881103, n.ChangeSetId); - Assert.AreEqual("riiga", n.UserName); - Assert.AreEqual(83501, n.UserId); - Assert.NotNull(n.Tags); - Assert.AreEqual(1, n.Tags.Count); - Assert.AreEqual("highway", n.Tags.First().Key); - Assert.AreEqual("residential", n.Tags.First().Value); + Assert.That(n.Id, Is.EqualTo(100000)); + Assert.That(n.Latitude, Is.EqualTo(58.4215544)); + Assert.That(n.Longitude, Is.EqualTo(15.6182983)); + Assert.That(n.TimeStamp, Is.EqualTo(new DateTime(2017,04,17,18,31,21, DateTimeKind.Utc))); + Assert.That(n.Version, Is.EqualTo(3)); + Assert.That(n.ChangeSetId, Is.EqualTo(47881103)); + Assert.That(n.UserName, Is.EqualTo("riiga")); + Assert.That(n.UserId, Is.EqualTo(83501)); + Assert.That(n.Tags, Is.Not.Null); + Assert.That(n.Tags.Count, Is.EqualTo(1)); + Assert.That(n.Tags.First().Key, Is.EqualTo("highway")); + Assert.That(n.Tags.First().Value, Is.EqualTo("residential")); } } } \ No newline at end of file diff --git a/test/OsmSharp.Test/IO/Json/Overpass/OverpassTests.cs b/test/OsmSharp.Test/IO/Json/Overpass/OverpassTests.cs index 7384357a..db340461 100644 --- a/test/OsmSharp.Test/IO/Json/Overpass/OverpassTests.cs +++ b/test/OsmSharp.Test/IO/Json/Overpass/OverpassTests.cs @@ -12,10 +12,10 @@ public void Osm_FromJson_Complete_ShouldReadCompleteJson() var osm = JsonSerializer.Deserialize( "{\n \"version\": 0.6,\n \"generator\": \"Overpass API 0.7.62.1 084b4234\",\n \"osm3s\": {\n \"timestamp_osm_base\": \"2024-06-03T14:30:53Z\",\n \"copyright\": \"The data included in this document is from www.openstreetmap.org. The data is made available under ODbL.\"\n },\n \"elements\": [\n {\n \"type\": \"node\",\n \"id\": 357179926,\n \"lat\": 51.2290388,\n \"lon\": 4.4249355,\n \"tags\": {\n \"amenity\": \"bicycle_rental\",\n \"bicycle_rental\": \"docking_station\",\n \"brand:wikidata\": \"Q2413118\",\n \"brand:wikipedia\": \"nl:Velo Antwerpen\",\n \"capacity\": \"18\",\n \"contact:phone\": \"+32 3 206 50 30\",\n \"name\": \"Park Spoor Noord 2\",\n \"network\": \"Velo\",\n \"network:wikidata\": \"Q2413118\",\n \"network:wikipedia\": \"nl:Velo Antwerpen\",\n \"operator\": \"Velo\",\n \"operator:website\": \"https://www.velo-antwerpen.be/\",\n \"operator:wikidata\": \"Q2413118\",\n \"operator:wikipedia\": \"nl:Velo Antwerpen\",\n \"payment:app\": \"yes\",\n \"payment:cash\": \"no\",\n \"payment:credit_cards\": \"no\",\n \"payment:membership_card\": \"yes\",\n \"ref\": \"123\",\n \"website\": \"https://www.velo-antwerpen.be/\",\n \"wikipedia\": \"nl:Velo Antwerpen\"\n }\n }\n ]\n}"); - Assert.NotNull(osm); - Assert.AreEqual(0.6, osm.Version); - Assert.AreEqual("Overpass API 0.7.62.1 084b4234", osm.Generator); + Assert.That(osm, Is.Not.Null); + Assert.That(osm.Version, Is.EqualTo(System.Version.Parse("0.6"))); + Assert.That(osm.Generator, Is.EqualTo("Overpass API 0.7.62.1 084b4234")); - Assert.AreEqual(1, osm.Nodes.Length); + Assert.That(osm.Nodes.Length, Is.EqualTo(1)); } } \ No newline at end of file diff --git a/test/OsmSharp.Test/IO/Json/RelationTests.cs b/test/OsmSharp.Test/IO/Json/RelationTests.cs index 0462d363..d519d85f 100644 --- a/test/OsmSharp.Test/IO/Json/RelationTests.cs +++ b/test/OsmSharp.Test/IO/Json/RelationTests.cs @@ -14,7 +14,7 @@ public void Relation_FromJson_Empty_ShouldReturnEmptyRelation() { var r = JsonSerializer.Deserialize("{\"type\":\"relation\"}"); - Assert.AreEqual(null, r.Id); + Assert.That(r.Id, Is.EqualTo(null)); } [Test] @@ -33,35 +33,35 @@ public void Relation_FromJson_Complete_ShouldReturnComplete() " \"route\":\"hiking\"," + " \"type\":\"route\"}}"); - Assert.AreEqual(2361924, r.Id); - Assert.AreEqual(new DateTime(2021,05,03,15,06,29, DateTimeKind.Utc), r.TimeStamp); - Assert.AreEqual(67, r.Version); - Assert.AreEqual(104065346, r.ChangeSetId); - Assert.AreEqual("pointseven", r.UserName); - Assert.AreEqual(4355310, r.UserId); - Assert.NotNull(r.Tags); - Assert.AreEqual(5, r.Tags.Count); - Assert.AreEqual("distance", r.Tags.ToArray()[0].Key); - Assert.AreEqual("126", r.Tags.ToArray()[0].Value); - Assert.AreEqual("network", r.Tags.ToArray()[1].Key); - Assert.AreEqual("nwn", r.Tags.ToArray()[1].Value); - Assert.AreEqual("ref", r.Tags.ToArray()[2].Key); - Assert.AreEqual("GR 565", r.Tags.ToArray()[2].Value); - Assert.AreEqual("route", r.Tags.ToArray()[3].Key); - Assert.AreEqual("hiking", r.Tags.ToArray()[3].Value); - Assert.AreEqual("type", r.Tags.ToArray()[4].Key); - Assert.AreEqual("route", r.Tags.ToArray()[4].Value); - Assert.NotNull(r.Members); - Assert.AreEqual(3, r.Members.Length); - Assert.AreEqual(OsmGeoType.Node, r.Members[0].Type); - Assert.AreEqual("node-role", r.Members[0].Role); - Assert.AreEqual(4442684, r.Members[0].Id); - Assert.AreEqual(OsmGeoType.Way, r.Members[1].Type); - Assert.AreEqual("way-role", r.Members[1].Role); - Assert.AreEqual(211334447, r.Members[1].Id); - Assert.AreEqual(OsmGeoType.Relation, r.Members[2].Type); - Assert.AreEqual("relation-role", r.Members[2].Role); - Assert.AreEqual(211334453, r.Members[2].Id); + Assert.That(r.Id, Is.EqualTo(2361924)); + Assert.That(r.TimeStamp, Is.EqualTo(new DateTime(2021,05,03,15,06,29, DateTimeKind.Utc))); + Assert.That(r.Version, Is.EqualTo(67)); + Assert.That(r.ChangeSetId, Is.EqualTo(104065346)); + Assert.That(r.UserName, Is.EqualTo("pointseven")); + Assert.That(r.UserId, Is.EqualTo(4355310)); + Assert.That(r.Tags, Is.Not.Null); + Assert.That(r.Tags.Count, Is.EqualTo(5)); + Assert.That(r.Tags.ToArray()[0].Key, Is.EqualTo("distance")); + Assert.That(r.Tags.ToArray()[0].Value, Is.EqualTo("126")); + Assert.That(r.Tags.ToArray()[1].Key, Is.EqualTo("network")); + Assert.That(r.Tags.ToArray()[1].Value, Is.EqualTo("nwn")); + Assert.That(r.Tags.ToArray()[2].Key, Is.EqualTo("ref")); + Assert.That(r.Tags.ToArray()[2].Value, Is.EqualTo("GR 565")); + Assert.That(r.Tags.ToArray()[3].Key, Is.EqualTo("route")); + Assert.That(r.Tags.ToArray()[3].Value, Is.EqualTo("hiking")); + Assert.That(r.Tags.ToArray()[4].Key, Is.EqualTo("type")); + Assert.That(r.Tags.ToArray()[4].Value, Is.EqualTo("route")); + Assert.That(r.Members, Is.Not.Null); + Assert.That(r.Members.Length, Is.EqualTo(3)); + Assert.That(r.Members[0].Type, Is.EqualTo(OsmGeoType.Node)); + Assert.That(r.Members[0].Role, Is.EqualTo("node-role")); + Assert.That(r.Members[0].Id, Is.EqualTo(4442684)); + Assert.That(r.Members[1].Type, Is.EqualTo(OsmGeoType.Way)); + Assert.That(r.Members[1].Role, Is.EqualTo("way-role")); + Assert.That(r.Members[1].Id, Is.EqualTo(211334447)); + Assert.That(r.Members[2].Type, Is.EqualTo(OsmGeoType.Relation)); + Assert.That(r.Members[2].Role, Is.EqualTo("relation-role")); + Assert.That(r.Members[2].Id, Is.EqualTo(211334453)); } [Test] @@ -86,8 +86,7 @@ public void Relation_ToJson_Complete_ShouldReturnCompleteJson() }; var serialized = JsonSerializer.Serialize(relation); - Assert.AreEqual("{\"type\":\"relation\",\"members\":[{\"type\":\"node\",\"ref\":1,\"role\":\"role1\"},{\"type\":\"way\",\"ref\":10,\"role\":\"role2\"},{\"type\":\"relation\",\"ref\":100,\"role\":\"role3\"}],\"id\":1,\"tags\":{\"amenity\":\"something\",\"key\":\"some_value\"},\"timestamp\":\"2008-09-12T21:37:45\",\"version\":1,\"user\":\"ben\",\"uid\":1}", - serialized); + Assert.That(serialized, Is.EqualTo("{\"type\":\"relation\",\"members\":[{\"type\":\"node\",\"ref\":1,\"role\":\"role1\"},{\"type\":\"way\",\"ref\":10,\"role\":\"role2\"},{\"type\":\"relation\",\"ref\":100,\"role\":\"role3\"}],\"id\":1,\"tags\":{\"amenity\":\"something\",\"key\":\"some_value\"},\"timestamp\":\"2008-09-12T21:37:45\",\"version\":1,\"user\":\"ben\",\"uid\":1}")); } } } \ No newline at end of file diff --git a/test/OsmSharp.Test/IO/Json/TagsCollectionTests.cs b/test/OsmSharp.Test/IO/Json/TagsCollectionTests.cs index 47d7645d..2e664d37 100644 --- a/test/OsmSharp.Test/IO/Json/TagsCollectionTests.cs +++ b/test/OsmSharp.Test/IO/Json/TagsCollectionTests.cs @@ -13,7 +13,7 @@ public void TagsCollection_ToJson_Empty_ShouldReturnEmptyJson() { var tagsCollection = new TagsCollection(); - Assert.AreEqual("{}", JsonSerializer.Serialize(tagsCollection)); + Assert.That(JsonSerializer.Serialize(tagsCollection), Is.EqualTo("{}")); } [Test] @@ -22,7 +22,7 @@ public void TagsCollection_ToJson_OneTag_ShouldReturnJsonWithOneTag() var tagsCollection = new TagsCollection(); tagsCollection.AddOrReplace("highway", "residential"); - Assert.AreEqual("{\"highway\":\"residential\"}", JsonSerializer.Serialize(tagsCollection)); + Assert.That(JsonSerializer.Serialize(tagsCollection), Is.EqualTo("{\"highway\":\"residential\"}")); } [Test] @@ -30,7 +30,7 @@ public void TagsCollection_FromJson_Empty_ShouldReturnEmpty() { var tagsCollection = JsonSerializer.Deserialize("{}"); - Assert.AreEqual(0, tagsCollection.Count); + Assert.That(tagsCollection.Count, Is.EqualTo(0)); } [Test] @@ -38,9 +38,9 @@ public void TagsCollection_FromJson_OneTag_ShouldReturnOneTag() { var tagsCollection = JsonSerializer.Deserialize("{\"highway\": \"residential\"}"); - Assert.AreEqual(1, tagsCollection.Count); - Assert.AreEqual("highway", tagsCollection.First().Key); - Assert.AreEqual("residential", tagsCollection.First().Value); + Assert.That(tagsCollection.Count, Is.EqualTo(1)); + Assert.That(tagsCollection.First().Key, Is.EqualTo("highway")); + Assert.That(tagsCollection.First().Value, Is.EqualTo("residential")); } } } \ No newline at end of file diff --git a/test/OsmSharp.Test/IO/Json/WayTests.cs b/test/OsmSharp.Test/IO/Json/WayTests.cs index 6d02fe41..5067104f 100644 --- a/test/OsmSharp.Test/IO/Json/WayTests.cs +++ b/test/OsmSharp.Test/IO/Json/WayTests.cs @@ -14,7 +14,7 @@ public void Way_FromJson_Empty_ShouldReturnEmptyWay() { var w = JsonSerializer.Deserialize("{\"type\":\"way\"}"); - Assert.AreEqual(null, w.Id); + Assert.That(w.Id, Is.EqualTo(null)); } [Test] @@ -25,19 +25,19 @@ public void Way_FromJson_CompleteWay_ShouldReturnCompleteWay() "\"nodes\":[507916537,507920041]," + "\"tags\":{\"highway\":\"residential\",\"name\":\"Husargatan\"}}"); - Assert.AreEqual(41494454, w.Id); - Assert.AreEqual(new DateTime(2013,06,22,15,17,51, DateTimeKind.Utc), w.TimeStamp); - Assert.AreEqual(3, w.Version); - Assert.AreEqual(16657760, w.ChangeSetId); - Assert.AreEqual("joakimfors", w.UserName); - Assert.AreEqual(306096, w.UserId); - Assert.NotNull(w.Tags); - Assert.AreEqual(2, w.Tags.Count); - Assert.AreEqual("highway", w.Tags.ToArray()[0].Key); - Assert.AreEqual("residential", w.Tags.ToArray()[0].Value); - Assert.AreEqual("name", w.Tags.ToArray()[1].Key); - Assert.AreEqual("Husargatan", w.Tags.ToArray()[1].Value); - Assert.AreEqual(new[] {507916537,507920041}, w.Nodes); + Assert.That(w.Id, Is.EqualTo(41494454)); + Assert.That(w.TimeStamp, Is.EqualTo(new DateTime(2013,06,22,15,17,51, DateTimeKind.Utc))); + Assert.That(w.Version, Is.EqualTo(3)); + Assert.That(w.ChangeSetId, Is.EqualTo(16657760)); + Assert.That(w.UserName, Is.EqualTo("joakimfors")); + Assert.That(w.UserId, Is.EqualTo(306096)); + Assert.That(w.Tags, Is.Not.Null); + Assert.That(w.Tags.Count, Is.EqualTo(2)); + Assert.That(w.Tags.ToArray()[0].Key, Is.EqualTo("highway")); + Assert.That(w.Tags.ToArray()[0].Value, Is.EqualTo("residential")); + Assert.That(w.Tags.ToArray()[1].Key, Is.EqualTo("name")); + Assert.That(w.Tags.ToArray()[1].Value, Is.EqualTo("Husargatan")); + Assert.That(w.Nodes, Is.EqualTo(new[] {507916537,507920041})); } [Test] @@ -60,7 +60,7 @@ public void Way_ToJson_CompleteWay_ShouldReturnCompleteJson() }; var serialized = JsonSerializer.Serialize(w); - Assert.AreEqual("{\"type\":\"way\",\"nodes\":[1,2,3],\"id\":1,\"tags\":{\"amenity\":\"something\",\"key\":\"some_value\"},\"timestamp\":\"2008-09-12T21:37:45\",\"version\":1,\"user\":\"ben\",\"uid\":1}", serialized); + Assert.That(serialized, Is.EqualTo("{\"type\":\"way\",\"nodes\":[1,2,3],\"id\":1,\"tags\":{\"amenity\":\"something\",\"key\":\"some_value\"},\"timestamp\":\"2008-09-12T21:37:45\",\"version\":1,\"user\":\"ben\",\"uid\":1}")); } } } \ No newline at end of file diff --git a/test/OsmSharp.Test/IO/PBF/EncoderTests.cs b/test/OsmSharp.Test/IO/PBF/EncoderTests.cs index 4a0b13fe..ada1a43a 100755 --- a/test/OsmSharp.Test/IO/PBF/EncoderTests.cs +++ b/test/OsmSharp.Test/IO/PBF/EncoderTests.cs @@ -35,13 +35,13 @@ public class EncoderTests [Test] public void TestEncodeLatLon() { - Assert.AreEqual(0, Encoder.EncodeLatLon(0, 0, 100)); - Assert.AreEqual(900000000, Encoder.EncodeLatLon(90, 0, 100)); - Assert.AreEqual(-900000000, Encoder.EncodeLatLon(-90, 0, 100)); + Assert.That(Encoder.EncodeLatLon(0, 0, 100), Is.EqualTo(0)); + Assert.That(Encoder.EncodeLatLon(90, 0, 100), Is.EqualTo(900000000)); + Assert.That(Encoder.EncodeLatLon(-90, 0, 100), Is.EqualTo(-900000000)); - Assert.AreEqual(0, Encoder.EncodeLatLon(0, 0, 100)); - Assert.AreEqual(1800000000, Encoder.EncodeLatLon(180, 0, 100)); - Assert.AreEqual(-1800000000, Encoder.EncodeLatLon(-180, 0, 100)); + Assert.That(Encoder.EncodeLatLon(0, 0, 100), Is.EqualTo(0)); + Assert.That(Encoder.EncodeLatLon(180, 0, 100), Is.EqualTo(1800000000)); + Assert.That(Encoder.EncodeLatLon(-180, 0, 100), Is.EqualTo(-1800000000)); } /// @@ -50,13 +50,13 @@ public void TestEncodeLatLon() [Test] public void TestDecodeLatLon() { - Assert.AreEqual(0, Encoder.DecodeLatLon(0, 0, 100)); - Assert.AreEqual(90, Encoder.DecodeLatLon(900000000, 0, 100)); - Assert.AreEqual(-90, Encoder.DecodeLatLon(-900000000, 0, 100)); + Assert.That(Encoder.DecodeLatLon(0, 0, 100), Is.EqualTo(0)); + Assert.That(Encoder.DecodeLatLon(900000000, 0, 100), Is.EqualTo(90)); + Assert.That(Encoder.DecodeLatLon(-900000000, 0, 100), Is.EqualTo(-90)); - Assert.AreEqual(0, Encoder.DecodeLatLon(0, 0, 100)); - Assert.AreEqual(180, Encoder.DecodeLatLon(1800000000, 0, 100)); - Assert.AreEqual(-180, Encoder.DecodeLatLon(-1800000000, 0, 100)); + Assert.That(Encoder.DecodeLatLon(0, 0, 100), Is.EqualTo(0)); + Assert.That(Encoder.DecodeLatLon(1800000000, 0, 100), Is.EqualTo(180)); + Assert.That(Encoder.DecodeLatLon(-1800000000, 0, 100), Is.EqualTo(-180)); } /// @@ -67,13 +67,13 @@ public void TestEncodeStrings() { var block = new PrimitiveBlock(); var reverseStringTable = new Dictionary(); - Assert.AreEqual(1, Encoder.EncodeString(block, reverseStringTable, "Ben")); - Assert.AreEqual(2, Encoder.EncodeString(block, reverseStringTable, "highway")); - Assert.AreEqual(3, Encoder.EncodeString(block, reverseStringTable, "residential")); - Assert.AreEqual(1, Encoder.EncodeString(block, reverseStringTable, "Ben")); - Assert.AreEqual(2, Encoder.EncodeString(block, reverseStringTable, "highway")); - Assert.AreEqual(4, Encoder.EncodeString(block, reverseStringTable, "Some other string")); - Assert.AreEqual(5, Encoder.EncodeString(block, reverseStringTable, "Ban")); + Assert.That(Encoder.EncodeString(block, reverseStringTable, "Ben"), Is.EqualTo(1)); + Assert.That(Encoder.EncodeString(block, reverseStringTable, "highway"), Is.EqualTo(2)); + Assert.That(Encoder.EncodeString(block, reverseStringTable, "residential"), Is.EqualTo(3)); + Assert.That(Encoder.EncodeString(block, reverseStringTable, "Ben"), Is.EqualTo(1)); + Assert.That(Encoder.EncodeString(block, reverseStringTable, "highway"), Is.EqualTo(2)); + Assert.That(Encoder.EncodeString(block, reverseStringTable, "Some other string"), Is.EqualTo(4)); + Assert.That(Encoder.EncodeString(block, reverseStringTable, "Ban"), Is.EqualTo(5)); } /// @@ -111,16 +111,16 @@ public void TestDecodeNode() pbfNode.vals.Add(2); var node = Encoder.DecodeNode(block, pbfNode); - Assert.IsNotNull(node); - Assert.AreEqual(1, node.Id); - Assert.AreEqual(10, node.ChangeSetId); - Assert.AreEqual(10.9, node.Latitude); - Assert.AreEqual(11.0, node.Longitude); - Assert.AreEqual(PBFExtensions.FromUnixTime(10000), node.TimeStamp); - Assert.AreEqual(OsmSharp.OsmGeoType.Node, node.Type); - Assert.AreEqual(100, node.UserId); - Assert.AreEqual("Ben", node.UserName); - Assert.AreEqual(2, node.Version); + Assert.That(node, Is.Not.Null); + Assert.That(node.Id, Is.EqualTo(1)); + Assert.That(node.ChangeSetId, Is.EqualTo(10)); + Assert.That(node.Latitude, Is.EqualTo(10.9)); + Assert.That(node.Longitude, Is.EqualTo(11.0)); + Assert.That(node.TimeStamp, Is.EqualTo(PBFExtensions.FromUnixTime(10000))); + Assert.That(node.Type, Is.EqualTo(OsmSharp.OsmGeoType.Node)); + Assert.That(node.UserId, Is.EqualTo(100)); + Assert.That(node.UserName, Is.EqualTo("Ben")); + Assert.That(node.Version, Is.EqualTo(2)); } /// @@ -149,19 +149,19 @@ public void TestEncodeNode() node.Visible = true; var pbfNode = Encoder.EncodeNode(block, new Dictionary(), node); - Assert.IsNotNull(pbfNode); - Assert.AreEqual(1, pbfNode.id); - Assert.AreEqual(Encoder.EncodeLatLon(10, block.lat_offset, block.granularity), pbfNode.lat); - Assert.AreEqual(Encoder.EncodeLatLon(11, block.lon_offset, block.granularity), pbfNode.lon); - Assert.AreEqual(1, pbfNode.info.changeset); - Assert.AreEqual(Encoder.EncodeTimestamp(node.TimeStamp.Value, block.date_granularity), pbfNode.info.timestamp); - Assert.AreEqual(1, pbfNode.info.uid); - Assert.AreEqual("Ben", System.Text.Encoding.UTF8.GetString(block.stringtable.s[(int)pbfNode.info.user_sid])); - Assert.AreEqual(1, pbfNode.info.version); - Assert.AreEqual(1, pbfNode.keys.Count); - Assert.AreEqual("name", System.Text.Encoding.UTF8.GetString(block.stringtable.s[(int)pbfNode.keys[0]])); - Assert.AreEqual(1, pbfNode.vals.Count); - Assert.AreEqual("Ben", System.Text.Encoding.UTF8.GetString(block.stringtable.s[(int)pbfNode.vals[0]])); + Assert.That(pbfNode, Is.Not.Null); + Assert.That(pbfNode.id, Is.EqualTo(1)); + Assert.That(pbfNode.lat, Is.EqualTo(Encoder.EncodeLatLon(10, block.lat_offset, block.granularity))); + Assert.That(pbfNode.lon, Is.EqualTo(Encoder.EncodeLatLon(11, block.lon_offset, block.granularity))); + Assert.That(pbfNode.info.changeset, Is.EqualTo(1)); + Assert.That(pbfNode.info.timestamp, Is.EqualTo(Encoder.EncodeTimestamp(node.TimeStamp.Value, block.date_granularity))); + Assert.That(pbfNode.info.uid, Is.EqualTo(1)); + Assert.That(System.Text.Encoding.UTF8.GetString(block.stringtable.s[(int)pbfNode.info.user_sid]), Is.EqualTo("Ben")); + Assert.That(pbfNode.info.version, Is.EqualTo(1)); + Assert.That(pbfNode.keys.Count, Is.EqualTo(1)); + Assert.That(System.Text.Encoding.UTF8.GetString(block.stringtable.s[(int)pbfNode.keys[0]]), Is.EqualTo("name")); + Assert.That(pbfNode.vals.Count, Is.EqualTo(1)); + Assert.That(System.Text.Encoding.UTF8.GetString(block.stringtable.s[(int)pbfNode.vals[0]]), Is.EqualTo("Ben")); } /// @@ -199,17 +199,17 @@ public void TestDecodeWay() pbfWay.refs.Add(1); var way = Encoder.DecodeWay(block, pbfWay); - Assert.IsNotNull(way); - Assert.AreEqual(1, way.Id); - Assert.AreEqual(10, way.ChangeSetId); - Assert.AreEqual(PBFExtensions.FromUnixTime(10000), way.TimeStamp); - Assert.AreEqual(OsmSharp.OsmGeoType.Way, way.Type); - Assert.AreEqual(100, way.UserId); - Assert.AreEqual("Ben", way.UserName); - Assert.AreEqual(2, way.Version); - Assert.AreEqual(2, way.Nodes.Length); - Assert.AreEqual(0, way.Nodes[0]); - Assert.AreEqual(1, way.Nodes[1]); + Assert.That(way, Is.Not.Null); + Assert.That(way.Id, Is.EqualTo(1)); + Assert.That(way.ChangeSetId, Is.EqualTo(10)); + Assert.That(way.TimeStamp, Is.EqualTo(PBFExtensions.FromUnixTime(10000))); + Assert.That(way.Type, Is.EqualTo(OsmSharp.OsmGeoType.Way)); + Assert.That(way.UserId, Is.EqualTo(100)); + Assert.That(way.UserName, Is.EqualTo("Ben")); + Assert.That(way.Version, Is.EqualTo(2)); + Assert.That(way.Nodes.Length, Is.EqualTo(2)); + Assert.That(way.Nodes[0], Is.EqualTo(0)); + Assert.That(way.Nodes[1], Is.EqualTo(1)); } /// @@ -242,20 +242,20 @@ public void TestEncodeWay() way.Nodes = new long[] { 1, 2 }; var pbfWay = Encoder.EncodeWay(block, new Dictionary(), way); - Assert.IsNotNull(pbfWay); - Assert.AreEqual(1, pbfWay.id); - Assert.AreEqual(2, pbfWay.refs.Count); - Assert.AreEqual(1, pbfWay.refs[0]); - Assert.AreEqual(1, pbfWay.refs[1]); - Assert.AreEqual(1, pbfWay.info.changeset); - Assert.AreEqual(Encoder.EncodeTimestamp(way.TimeStamp.Value, block.date_granularity), pbfWay.info.timestamp); - Assert.AreEqual(1, pbfWay.info.uid); - Assert.AreEqual("Ben", System.Text.Encoding.UTF8.GetString(block.stringtable.s[(int)pbfWay.info.user_sid])); - Assert.AreEqual(1, pbfWay.info.version); - Assert.AreEqual(1, pbfWay.keys.Count); - Assert.AreEqual("name", System.Text.Encoding.UTF8.GetString(block.stringtable.s[(int)pbfWay.keys[0]])); - Assert.AreEqual(1, pbfWay.vals.Count); - Assert.AreEqual("Ben", System.Text.Encoding.UTF8.GetString(block.stringtable.s[(int)pbfWay.vals[0]])); + Assert.That(pbfWay, Is.Not.Null); + Assert.That(pbfWay.id, Is.EqualTo(1)); + Assert.That(pbfWay.refs.Count, Is.EqualTo(2)); + Assert.That(pbfWay.refs[0], Is.EqualTo(1)); + Assert.That(pbfWay.refs[1], Is.EqualTo(1)); + Assert.That(pbfWay.info.changeset, Is.EqualTo(1)); + Assert.That(pbfWay.info.timestamp, Is.EqualTo(Encoder.EncodeTimestamp(way.TimeStamp.Value, block.date_granularity))); + Assert.That(pbfWay.info.uid, Is.EqualTo(1)); + Assert.That(System.Text.Encoding.UTF8.GetString(block.stringtable.s[(int)pbfWay.info.user_sid]), Is.EqualTo("Ben")); + Assert.That(pbfWay.info.version, Is.EqualTo(1)); + Assert.That(pbfWay.keys.Count, Is.EqualTo(1)); + Assert.That(System.Text.Encoding.UTF8.GetString(block.stringtable.s[(int)pbfWay.keys[0]]), Is.EqualTo("name")); + Assert.That(pbfWay.vals.Count, Is.EqualTo(1)); + Assert.That(System.Text.Encoding.UTF8.GetString(block.stringtable.s[(int)pbfWay.vals[0]]), Is.EqualTo("Ben")); } /// @@ -298,21 +298,21 @@ public void TestDecodeRelation() pbfRelation.types.Add(OsmSharp.IO.PBF.Relation.MemberType.WAY); var relation = Encoder.DecodeRelation(block, pbfRelation); - Assert.IsNotNull(relation); - Assert.AreEqual(1, relation.Id); - Assert.AreEqual(10, relation.ChangeSetId); - Assert.AreEqual(PBFExtensions.FromUnixTime(10000), relation.TimeStamp); - Assert.AreEqual(OsmSharp.OsmGeoType.Relation, relation.Type); - Assert.AreEqual(100, relation.UserId); - Assert.AreEqual("Ben", relation.UserName); - Assert.AreEqual(2, relation.Version); - Assert.AreEqual(2, relation.Members.Length); - Assert.AreEqual(10, relation.Members[0].Id); - Assert.AreEqual(OsmSharp.OsmGeoType.Node, relation.Members[0].Type); - Assert.AreEqual("fake role", relation.Members[0].Role); - Assert.AreEqual(11, relation.Members[1].Id); - Assert.AreEqual(OsmSharp.OsmGeoType.Way, relation.Members[1].Type); - Assert.AreEqual("fake role", relation.Members[1].Role); + Assert.That(relation, Is.Not.Null); + Assert.That(relation.Id, Is.EqualTo(1)); + Assert.That(relation.ChangeSetId, Is.EqualTo(10)); + Assert.That(relation.TimeStamp, Is.EqualTo(PBFExtensions.FromUnixTime(10000))); + Assert.That(relation.Type, Is.EqualTo(OsmSharp.OsmGeoType.Relation)); + Assert.That(relation.UserId, Is.EqualTo(100)); + Assert.That(relation.UserName, Is.EqualTo("Ben")); + Assert.That(relation.Version, Is.EqualTo(2)); + Assert.That(relation.Members.Length, Is.EqualTo(2)); + Assert.That(relation.Members[0].Id, Is.EqualTo(10)); + Assert.That(relation.Members[0].Type, Is.EqualTo(OsmSharp.OsmGeoType.Node)); + Assert.That(relation.Members[0].Role, Is.EqualTo("fake role")); + Assert.That(relation.Members[1].Id, Is.EqualTo(11)); + Assert.That(relation.Members[1].Type, Is.EqualTo(OsmSharp.OsmGeoType.Way)); + Assert.That(relation.Members[1].Role, Is.EqualTo("fake role")); } /// @@ -359,26 +359,26 @@ public void TestEncodeRelation() }; var pbfRelation = Encoder.EncodeRelation(block, new Dictionary(), relation); - Assert.IsNotNull(pbfRelation); - Assert.AreEqual(1, pbfRelation.id); - Assert.AreEqual(2, pbfRelation.memids.Count); - Assert.AreEqual(1, pbfRelation.memids[0]); - Assert.AreEqual(1, pbfRelation.memids[1]); - Assert.AreEqual(2, pbfRelation.roles_sid.Count); - Assert.AreEqual("fake role1", System.Text.Encoding.UTF8.GetString(block.stringtable.s[(int)pbfRelation.roles_sid[0]])); - Assert.AreEqual("fake role2", System.Text.Encoding.UTF8.GetString(block.stringtable.s[(int)pbfRelation.roles_sid[1]])); - Assert.AreEqual(2, pbfRelation.types.Count); - Assert.AreEqual(OsmSharp.IO.PBF.Relation.MemberType.NODE, pbfRelation.types[0]); - Assert.AreEqual(OsmSharp.IO.PBF.Relation.MemberType.RELATION, pbfRelation.types[1]); - Assert.AreEqual(1, pbfRelation.info.changeset); - Assert.AreEqual(Encoder.EncodeTimestamp(relation.TimeStamp.Value, block.date_granularity), pbfRelation.info.timestamp); - Assert.AreEqual(1, pbfRelation.info.uid); - Assert.AreEqual("Ben", System.Text.Encoding.UTF8.GetString(block.stringtable.s[(int)pbfRelation.info.user_sid])); - Assert.AreEqual(1, pbfRelation.info.version); - Assert.AreEqual(1, pbfRelation.keys.Count); - Assert.AreEqual("name", System.Text.Encoding.UTF8.GetString(block.stringtable.s[(int)pbfRelation.keys[0]])); - Assert.AreEqual(1, pbfRelation.vals.Count); - Assert.AreEqual("Ben", System.Text.Encoding.UTF8.GetString(block.stringtable.s[(int)pbfRelation.vals[0]])); + Assert.That(pbfRelation, Is.Not.Null); + Assert.That(pbfRelation.id, Is.EqualTo(1)); + Assert.That(pbfRelation.memids.Count, Is.EqualTo(2)); + Assert.That(pbfRelation.memids[0], Is.EqualTo(1)); + Assert.That(pbfRelation.memids[1], Is.EqualTo(1)); + Assert.That(pbfRelation.roles_sid.Count, Is.EqualTo(2)); + Assert.That(System.Text.Encoding.UTF8.GetString(block.stringtable.s[(int)pbfRelation.roles_sid[0]]), Is.EqualTo("fake role1")); + Assert.That(System.Text.Encoding.UTF8.GetString(block.stringtable.s[(int)pbfRelation.roles_sid[1]]), Is.EqualTo("fake role2")); + Assert.That(pbfRelation.types.Count, Is.EqualTo(2)); + Assert.That(pbfRelation.types[0], Is.EqualTo(OsmSharp.IO.PBF.Relation.MemberType.NODE)); + Assert.That(pbfRelation.types[1], Is.EqualTo(OsmSharp.IO.PBF.Relation.MemberType.RELATION)); + Assert.That(pbfRelation.info.changeset, Is.EqualTo(1)); + Assert.That(pbfRelation.info.timestamp, Is.EqualTo(Encoder.EncodeTimestamp(relation.TimeStamp.Value, block.date_granularity))); + Assert.That(pbfRelation.info.uid, Is.EqualTo(1)); + Assert.That(System.Text.Encoding.UTF8.GetString(block.stringtable.s[(int)pbfRelation.info.user_sid]), Is.EqualTo("Ben")); + Assert.That(pbfRelation.info.version, Is.EqualTo(1)); + Assert.That(pbfRelation.keys.Count, Is.EqualTo(1)); + Assert.That(System.Text.Encoding.UTF8.GetString(block.stringtable.s[(int)pbfRelation.keys[0]]), Is.EqualTo("name")); + Assert.That(pbfRelation.vals.Count, Is.EqualTo(1)); + Assert.That(System.Text.Encoding.UTF8.GetString(block.stringtable.s[(int)pbfRelation.vals[0]]), Is.EqualTo("Ben")); } /// @@ -421,9 +421,9 @@ public void TestDecodeBlockWithNode() var primitivesConsumer = new PrimitivesConsumerMock(); block.Decode(primitivesConsumer, false, false, false); - Assert.AreEqual(1, primitivesConsumer.Nodes.Count); - Assert.AreEqual(0, primitivesConsumer.Ways.Count); - Assert.AreEqual(0, primitivesConsumer.Relations.Count); + Assert.That(primitivesConsumer.Nodes.Count, Is.EqualTo(1)); + Assert.That(primitivesConsumer.Ways.Count, Is.EqualTo(0)); + Assert.That(primitivesConsumer.Relations.Count, Is.EqualTo(0)); } /// @@ -497,46 +497,46 @@ public void TestDecodeBlockWithDenseNodes() var primitivesConsumer = new PrimitivesConsumerMock(); block.Decode(primitivesConsumer, false, false, false); - Assert.AreEqual(3, primitivesConsumer.Nodes.Count); - Assert.AreEqual(0, primitivesConsumer.Ways.Count); - Assert.AreEqual(0, primitivesConsumer.Relations.Count); + Assert.That(primitivesConsumer.Nodes.Count, Is.EqualTo(3)); + Assert.That(primitivesConsumer.Ways.Count, Is.EqualTo(0)); + Assert.That(primitivesConsumer.Relations.Count, Is.EqualTo(0)); var node = primitivesConsumer.Nodes[0]; - Assert.IsNotNull(node); - Assert.AreEqual(1, node.id); - Assert.AreEqual(10, node.info.changeset); - Assert.AreEqual(10, node.info.timestamp); - Assert.AreEqual(1, node.info.uid); - Assert.AreEqual(3, node.info.user_sid); - Assert.AreEqual(1, node.info.version); - Assert.AreEqual(1, node.keys.Count); - Assert.AreEqual(1, node.keys[0]); - Assert.AreEqual(1, node.vals.Count); - Assert.AreEqual(2, node.vals[0]); + Assert.That(node, Is.Not.Null); + Assert.That(node.id, Is.EqualTo(1)); + Assert.That(node.info.changeset, Is.EqualTo(10)); + Assert.That(node.info.timestamp, Is.EqualTo(10)); + Assert.That(node.info.uid, Is.EqualTo(1)); + Assert.That(node.info.user_sid, Is.EqualTo(3)); + Assert.That(node.info.version, Is.EqualTo(1)); + Assert.That(node.keys.Count, Is.EqualTo(1)); + Assert.That(node.keys[0], Is.EqualTo(1)); + Assert.That(node.vals.Count, Is.EqualTo(1)); + Assert.That(node.vals[0], Is.EqualTo(2)); node = primitivesConsumer.Nodes[1]; - Assert.IsNotNull(node); - Assert.AreEqual(2, node.id); - Assert.AreEqual(11, node.info.changeset); - Assert.AreEqual(11, node.info.timestamp); - Assert.AreEqual(1, node.info.uid); - Assert.AreEqual(3, node.info.user_sid); - Assert.AreEqual(1, node.info.version); - Assert.AreEqual(1, node.keys.Count); - Assert.AreEqual(1, node.keys[0]); - Assert.AreEqual(1, node.vals.Count); - Assert.AreEqual(4, node.vals[0]); + Assert.That(node, Is.Not.Null); + Assert.That(node.id, Is.EqualTo(2)); + Assert.That(node.info.changeset, Is.EqualTo(11)); + Assert.That(node.info.timestamp, Is.EqualTo(11)); + Assert.That(node.info.uid, Is.EqualTo(1)); + Assert.That(node.info.user_sid, Is.EqualTo(3)); + Assert.That(node.info.version, Is.EqualTo(1)); + Assert.That(node.keys.Count, Is.EqualTo(1)); + Assert.That(node.keys[0], Is.EqualTo(1)); + Assert.That(node.vals.Count, Is.EqualTo(1)); + Assert.That(node.vals[0], Is.EqualTo(4)); node = primitivesConsumer.Nodes[2]; - Assert.IsNotNull(node); - Assert.AreEqual(3, node.id); - Assert.AreEqual(12, node.info.changeset); - Assert.AreEqual(12, node.info.timestamp); - Assert.AreEqual(1, node.info.uid); - Assert.AreEqual(3, node.info.user_sid); - Assert.AreEqual(3, node.info.version); - Assert.AreEqual(0, node.keys.Count); - Assert.AreEqual(0, node.vals.Count); + Assert.That(node, Is.Not.Null); + Assert.That(node.id, Is.EqualTo(3)); + Assert.That(node.info.changeset, Is.EqualTo(12)); + Assert.That(node.info.timestamp, Is.EqualTo(12)); + Assert.That(node.info.uid, Is.EqualTo(1)); + Assert.That(node.info.user_sid, Is.EqualTo(3)); + Assert.That(node.info.version, Is.EqualTo(3)); + Assert.That(node.keys.Count, Is.EqualTo(0)); + Assert.That(node.vals.Count, Is.EqualTo(0)); } /// @@ -579,9 +579,9 @@ public void TestDecodeBlockWithWay() var primitivesConsumer = new PrimitivesConsumerMock(); block.Decode(primitivesConsumer, false, false, false); - Assert.AreEqual(0, primitivesConsumer.Nodes.Count); - Assert.AreEqual(1, primitivesConsumer.Ways.Count); - Assert.AreEqual(0, primitivesConsumer.Relations.Count); + Assert.That(primitivesConsumer.Nodes.Count, Is.EqualTo(0)); + Assert.That(primitivesConsumer.Ways.Count, Is.EqualTo(1)); + Assert.That(primitivesConsumer.Relations.Count, Is.EqualTo(0)); } /// @@ -628,9 +628,9 @@ public void TestDecodeBlockWithRelation() var primitivesConsumer = new PrimitivesConsumerMock(); block.Decode(primitivesConsumer, false, false, false); - Assert.AreEqual(0, primitivesConsumer.Nodes.Count); - Assert.AreEqual(0, primitivesConsumer.Ways.Count); - Assert.AreEqual(1, primitivesConsumer.Relations.Count); + Assert.That(primitivesConsumer.Nodes.Count, Is.EqualTo(0)); + Assert.That(primitivesConsumer.Ways.Count, Is.EqualTo(0)); + Assert.That(primitivesConsumer.Relations.Count, Is.EqualTo(1)); } } } \ No newline at end of file diff --git a/test/OsmSharp.Test/IO/Xml/API/CapabilitiesTests.cs b/test/OsmSharp.Test/IO/Xml/API/CapabilitiesTests.cs index 546ab593..f0ed34f1 100755 --- a/test/OsmSharp.Test/IO/Xml/API/CapabilitiesTests.cs +++ b/test/OsmSharp.Test/IO/Xml/API/CapabilitiesTests.cs @@ -75,7 +75,7 @@ public void TestSerialize() } }; - Assert.AreEqual("", capabilities.SerializeToXml()); + Assert.That(capabilities.SerializeToXml(), Is.EqualTo("")); } /// @@ -88,24 +88,24 @@ public void TestDeserialize() var capabilities = serializer.Deserialize( new StringReader("")) as Capabilities; - Assert.IsNotNull(capabilities); - Assert.IsNotNull(capabilities.Version); - Assert.AreEqual(0.6, capabilities.Version.Minimum); - Assert.AreEqual(0.6, capabilities.Version.Maximum); - Assert.IsNotNull(capabilities.Area); - Assert.AreEqual(0.25, capabilities.Area.Maximum); - Assert.IsNotNull(capabilities.Changesets); - Assert.AreEqual(50000, capabilities.Changesets.MaximumElements); - Assert.IsNotNull(capabilities.Status); - Assert.AreEqual(Status.ServiceStatus.online, capabilities.Status.Api); - Assert.AreEqual(Status.ServiceStatus.online, capabilities.Status.Database); - Assert.AreEqual(Status.ServiceStatus.online, capabilities.Status.Gpx); - Assert.IsNotNull(capabilities.Timeout); - Assert.AreEqual(300, capabilities.Timeout.Seconds); - Assert.IsNotNull(capabilities.Tracepoints); - Assert.AreEqual(5000, capabilities.Tracepoints.PerPage); - Assert.IsNotNull(capabilities.WayNodes); - Assert.AreEqual(2000, capabilities.WayNodes.Maximum); + Assert.That(capabilities, Is.Not.Null); + Assert.That(capabilities.Version, Is.Not.Null); + Assert.That(capabilities.Version.Minimum, Is.EqualTo(0.6)); + Assert.That(capabilities.Version.Maximum, Is.EqualTo(0.6)); + Assert.That(capabilities.Area, Is.Not.Null); + Assert.That(capabilities.Area.Maximum, Is.EqualTo(0.25)); + Assert.That(capabilities.Changesets, Is.Not.Null); + Assert.That(capabilities.Changesets.MaximumElements, Is.EqualTo(50000)); + Assert.That(capabilities.Status, Is.Not.Null); + Assert.That(capabilities.Status.Api, Is.EqualTo(Status.ServiceStatus.online)); + Assert.That(capabilities.Status.Database, Is.EqualTo(Status.ServiceStatus.online)); + Assert.That(capabilities.Status.Gpx, Is.EqualTo(Status.ServiceStatus.online)); + Assert.That(capabilities.Timeout, Is.Not.Null); + Assert.That(capabilities.Timeout.Seconds, Is.EqualTo(300)); + Assert.That(capabilities.Tracepoints, Is.Not.Null); + Assert.That(capabilities.Tracepoints.PerPage, Is.EqualTo(5000)); + Assert.That(capabilities.WayNodes, Is.Not.Null); + Assert.That(capabilities.WayNodes.Maximum, Is.EqualTo(2000)); } } } \ No newline at end of file diff --git a/test/OsmSharp.Test/IO/Xml/API/GpxFileTests.cs b/test/OsmSharp.Test/IO/Xml/API/GpxFileTests.cs index 5a934a28..8e1c475f 100755 --- a/test/OsmSharp.Test/IO/Xml/API/GpxFileTests.cs +++ b/test/OsmSharp.Test/IO/Xml/API/GpxFileTests.cs @@ -42,7 +42,7 @@ public void TestSerialize() { var osm = new Osm { - Version = 0.6, + Version = System.Version.Parse("0.6"), Generator = "OpenStreetMap server", GpxFiles = new [] {new GpxFile { @@ -61,9 +61,8 @@ public void TestSerialize() }; var osmString = osm.SerializeToXml(); - Assert.AreEqual( - "Descriptiontag1tag2", - osmString); + Assert.That( + osmString, Is.EqualTo("Descriptiontag1tag2")); } [Test] @@ -74,19 +73,19 @@ public void TestDeserialize() new StringReader( "Descriptiontag1tag2")) as Osm; - Assert.IsNotNull(osm.GpxFiles); + Assert.That(osm.GpxFiles, Is.Not.Null); var gpxFile = osm.GpxFiles.First(); - Assert.AreEqual(1, gpxFile.Id); - Assert.AreEqual("Name", gpxFile.Name); - Assert.AreEqual(1.1, gpxFile.Lat); - Assert.AreEqual(2.2, gpxFile.Lon); - Assert.AreEqual("User", gpxFile.User); - Assert.AreEqual(Visibility.Private, gpxFile.Visibility); - Assert.AreEqual(false, gpxFile.Pending); - Assert.AreEqual(1947, gpxFile.TimeStamp.Year); - Assert.AreEqual("Description", gpxFile.Description); - Assert.AreEqual(2, gpxFile.Tags.Length); - Assert.AreEqual("tag1", gpxFile.Tags.First()); + Assert.That(gpxFile.Id, Is.EqualTo(1)); + Assert.That(gpxFile.Name, Is.EqualTo("Name")); + Assert.That(gpxFile.Lat, Is.EqualTo(1.1)); + Assert.That(gpxFile.Lon, Is.EqualTo(2.2)); + Assert.That(gpxFile.User, Is.EqualTo("User")); + Assert.That(gpxFile.Visibility, Is.EqualTo(Visibility.Private)); + Assert.That(gpxFile.Pending, Is.EqualTo(false)); + Assert.That(gpxFile.TimeStamp.Year, Is.EqualTo(1947)); + Assert.That(gpxFile.Description, Is.EqualTo("Description")); + Assert.That(gpxFile.Tags.Length, Is.EqualTo(2)); + Assert.That(gpxFile.Tags.First(), Is.EqualTo("tag1")); } } } diff --git a/test/OsmSharp.Test/IO/Xml/API/OsmTests.cs b/test/OsmSharp.Test/IO/Xml/API/OsmTests.cs index ccd33313..ba55a9c2 100755 --- a/test/OsmSharp.Test/IO/Xml/API/OsmTests.cs +++ b/test/OsmSharp.Test/IO/Xml/API/OsmTests.cs @@ -82,8 +82,7 @@ public void TestSerialize() } }; - Assert.AreEqual("", - osm.SerializeToXml()); + Assert.That(osm.SerializeToXml(), Is.EqualTo("")); } /// @@ -97,26 +96,26 @@ public void TestDeserialize() var osm = serializer.Deserialize( new StringReader("")) as Osm; - Assert.IsNotNull(osm); + Assert.That(osm, Is.Not.Null); var capabilities = osm.Api; - Assert.IsNotNull(capabilities); - Assert.IsNotNull(capabilities.Version); - Assert.AreEqual(0.6, capabilities.Version.Minimum); - Assert.AreEqual(0.6, capabilities.Version.Maximum); - Assert.IsNotNull(capabilities.Area); - Assert.AreEqual(0.25, capabilities.Area.Maximum); - Assert.IsNotNull(capabilities.Changesets); - Assert.AreEqual(50000, capabilities.Changesets.MaximumElements); - Assert.IsNotNull(capabilities.Status); - Assert.AreEqual(Status.ServiceStatus.online, capabilities.Status.Api); - Assert.AreEqual(Status.ServiceStatus.online, capabilities.Status.Database); - Assert.AreEqual(Status.ServiceStatus.online, capabilities.Status.Gpx); - Assert.IsNotNull(capabilities.Timeout); - Assert.AreEqual(300, capabilities.Timeout.Seconds); - Assert.IsNotNull(capabilities.Tracepoints); - Assert.AreEqual(5000, capabilities.Tracepoints.PerPage); - Assert.IsNotNull(capabilities.WayNodes); - Assert.AreEqual(2000, capabilities.WayNodes.Maximum); + Assert.That(capabilities, Is.Not.Null); + Assert.That(capabilities.Version, Is.Not.Null); + Assert.That(capabilities.Version.Minimum, Is.EqualTo(0.6)); + Assert.That(capabilities.Version.Maximum, Is.EqualTo(0.6)); + Assert.That(capabilities.Area, Is.Not.Null); + Assert.That(capabilities.Area.Maximum, Is.EqualTo(0.25)); + Assert.That(capabilities.Changesets, Is.Not.Null); + Assert.That(capabilities.Changesets.MaximumElements, Is.EqualTo(50000)); + Assert.That(capabilities.Status, Is.Not.Null); + Assert.That(capabilities.Status.Api, Is.EqualTo(Status.ServiceStatus.online)); + Assert.That(capabilities.Status.Database, Is.EqualTo(Status.ServiceStatus.online)); + Assert.That(capabilities.Status.Gpx, Is.EqualTo(Status.ServiceStatus.online)); + Assert.That(capabilities.Timeout, Is.Not.Null); + Assert.That(capabilities.Timeout.Seconds, Is.EqualTo(300)); + Assert.That(capabilities.Tracepoints, Is.Not.Null); + Assert.That(capabilities.Tracepoints.PerPage, Is.EqualTo(5000)); + Assert.That(capabilities.WayNodes, Is.Not.Null); + Assert.That(capabilities.WayNodes.Maximum, Is.EqualTo(2000)); } /// @@ -138,30 +137,30 @@ public void TestDeserializeSkippingUnexpectedElements() var serializer = new XmlSerializer(typeof(Osm)); var osm = serializer.Deserialize(new StringReader(xml)) as Osm; - Assert.IsNotNull(osm); - Assert.AreEqual(.6, osm.Version); - Assert.AreEqual("Overpass API 0.7.55.7 8b86ff77", osm.Generator); - - Assert.IsNull(osm.Ways); - Assert.IsNull(osm.Relations); - Assert.IsNull(osm.User); - Assert.IsNull(osm.GpxFiles); - Assert.IsNull(osm.Bounds); - Assert.IsNull(osm.Api); - Assert.IsNull(osm.Notes); - - Assert.IsNotNull(osm.Nodes); - Assert.AreEqual(1, osm.Nodes.Length); + Assert.That(osm, Is.Not.Null); + Assert.That(osm.Version, Is.EqualTo(System.Version.Parse("0.6"))); + Assert.That(osm.Generator, Is.EqualTo("Overpass API 0.7.55.7 8b86ff77")); + + Assert.That(osm.Ways, Is.Null); + Assert.That(osm.Relations, Is.Null); + Assert.That(osm.User, Is.Null); + Assert.That(osm.GpxFiles, Is.Null); + Assert.That(osm.Bounds, Is.Null); + Assert.That(osm.Api, Is.Null); + Assert.That(osm.Notes, Is.Null); + + Assert.That(osm.Nodes, Is.Not.Null); + Assert.That(osm.Nodes.Length, Is.EqualTo(1)); var node = osm.Nodes[0]; - Assert.AreEqual(1, node.Id); - Assert.AreEqual(111, node.Latitude); - Assert.AreEqual(-70.111, node.Longitude); - Assert.NotNull(node.Tags); - Assert.AreEqual(2, node.Tags.Count); - Assert.True(node.Tags.ContainsKey("addr:housenumber")); - Assert.AreEqual("11", node.Tags["addr:housenumber"]); - Assert.True(node.Tags.ContainsKey("addr:street")); - Assert.AreEqual("Main Street", node.Tags["addr:street"]); + Assert.That(node.Id, Is.EqualTo(1)); + Assert.That(node.Latitude, Is.EqualTo(111)); + Assert.That(node.Longitude, Is.EqualTo(-70.111)); + Assert.That(node.Tags, Is.Not.Null); + Assert.That(node.Tags.Count, Is.EqualTo(2)); + Assert.That(node.Tags.ContainsKey("addr:housenumber"), Is.True); + Assert.That(node.Tags["addr:housenumber"], Is.EqualTo("11")); + Assert.That(node.Tags.ContainsKey("addr:street"), Is.True); + Assert.That(node.Tags["addr:street"], Is.EqualTo("Main Street")); } /// @@ -189,66 +188,66 @@ public void TestDeserializeWithBoundsElement() t => DateTime.Parse(t, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal); var serializer = new XmlSerializer(typeof(Osm)); var osm = serializer.Deserialize(new StringReader(xml)) as Osm; - Assert.IsNotNull(osm); - Assert.AreEqual(.6, osm.Version); - Assert.AreEqual("CGImap 0.7.5 (5035 errol.openstreetmap.org)", osm.Generator); - - Assert.IsNull(osm.Relations); - Assert.IsNull(osm.User); - Assert.IsNull(osm.GpxFiles); - Assert.IsNull(osm.Api); - - Assert.IsNotNull(osm.Bounds); - Assert.AreEqual(float.Parse("38.9070200", DefaultCultureInfo), osm.Bounds.MinLatitude); - Assert.AreEqual(float.Parse("-77.0371900", DefaultCultureInfo), osm.Bounds.MinLongitude); - Assert.AreEqual(float.Parse("38.9077300", DefaultCultureInfo), osm.Bounds.MaxLatitude); - Assert.AreEqual(float.Parse("-77.0360000", DefaultCultureInfo), osm.Bounds.MaxLongitude); - - Assert.IsNotNull(osm.Nodes); - Assert.AreEqual(2, osm.Nodes.Length); + Assert.That(osm, Is.Not.Null); + Assert.That(osm.Version, Is.EqualTo(System.Version.Parse("0.6"))); + Assert.That(osm.Generator, Is.EqualTo("CGImap 0.7.5 (5035 errol.openstreetmap.org)")); + + Assert.That(osm.Relations, Is.Null); + Assert.That(osm.User, Is.Null); + Assert.That(osm.GpxFiles, Is.Null); + Assert.That(osm.Api, Is.Null); + + Assert.That(osm.Bounds, Is.Not.Null); + Assert.That(osm.Bounds.MinLatitude, Is.EqualTo(float.Parse("38.9070200", DefaultCultureInfo))); + Assert.That(osm.Bounds.MinLongitude, Is.EqualTo(float.Parse("-77.0371900", DefaultCultureInfo))); + Assert.That(osm.Bounds.MaxLatitude, Is.EqualTo(float.Parse("38.9077300", DefaultCultureInfo))); + Assert.That(osm.Bounds.MaxLongitude, Is.EqualTo(float.Parse("-77.0360000", DefaultCultureInfo))); + + Assert.That(osm.Nodes, Is.Not.Null); + Assert.That(osm.Nodes.Length, Is.EqualTo(2)); var node = osm.Nodes[0]; - Assert.AreEqual(8549479, node.Id); - Assert.AreEqual(true, node.Visible); - Assert.AreEqual(6, node.Version); - Assert.AreEqual(17339, node.ChangeSetId); - Assert.AreEqual(parseToUniversalTime("2013-01-20T06:31:24Z"), node.TimeStamp); - Assert.AreEqual("samanbb", node.UserName); - Assert.AreEqual(933, node.UserId); - Assert.AreEqual(38.8921989, node.Latitude); - Assert.AreEqual(-77.0503034, node.Longitude); - Assert.IsNull(node.Tags); + Assert.That(node.Id, Is.EqualTo(8549479)); + Assert.That(node.Visible, Is.EqualTo(true)); + Assert.That(node.Version, Is.EqualTo(6)); + Assert.That(node.ChangeSetId, Is.EqualTo(17339)); + Assert.That(node.TimeStamp, Is.EqualTo(parseToUniversalTime("2013-01-20T06:31:24Z"))); + Assert.That(node.UserName, Is.EqualTo("samanbb")); + Assert.That(node.UserId, Is.EqualTo(933)); + Assert.That(node.Latitude, Is.EqualTo(38.8921989)); + Assert.That(node.Longitude, Is.EqualTo(-77.0503034)); + Assert.That(node.Tags, Is.Null); node = osm.Nodes[1]; - Assert.AreEqual(8549530, node.Id); - Assert.AreEqual(false, node.Visible); - Assert.AreEqual(2, node.Version); - Assert.AreEqual(17248, node.ChangeSetId); - Assert.AreEqual(parseToUniversalTime("2013-01-17T15:24:35Z"), node.TimeStamp); - Assert.AreEqual("ideditor", node.UserName); - Assert.AreEqual(912, node.UserId); - Assert.AreEqual(38.9065506, node.Latitude); - Assert.AreEqual(-77.0345080, node.Longitude); - Assert.IsNull(node.Tags); - - Assert.IsNotNull(osm.Ways); - Assert.AreEqual(1, osm.Ways.Length); + Assert.That(node.Id, Is.EqualTo(8549530)); + Assert.That(node.Visible, Is.EqualTo(false)); + Assert.That(node.Version, Is.EqualTo(2)); + Assert.That(node.ChangeSetId, Is.EqualTo(17248)); + Assert.That(node.TimeStamp, Is.EqualTo(parseToUniversalTime("2013-01-17T15:24:35Z"))); + Assert.That(node.UserName, Is.EqualTo("ideditor")); + Assert.That(node.UserId, Is.EqualTo(912)); + Assert.That(node.Latitude, Is.EqualTo(38.9065506)); + Assert.That(node.Longitude, Is.EqualTo(-77.0345080)); + Assert.That(node.Tags, Is.Null); + + Assert.That(osm.Ways, Is.Not.Null); + Assert.That(osm.Ways.Length, Is.EqualTo(1)); var way = osm.Ways[0]; - Assert.AreEqual(538868, way.Id); - Assert.AreEqual(true, way.Visible); - Assert.AreEqual(5, way.Version); - Assert.AreEqual(23710, way.ChangeSetId); - Assert.AreEqual(parseToUniversalTime("2013-05-28T17:45:26Z"), way.TimeStamp); - Assert.AreEqual("Kate", way.UserName); - Assert.AreEqual(1163, way.UserId); - Assert.NotNull(way.Nodes); - Assert.AreEqual(2, way.Nodes.Length); - Assert.AreEqual(4294969195, way.Nodes[0]); - Assert.AreEqual(4294969575, way.Nodes[1]); - Assert.NotNull(way.Tags); - Assert.AreEqual(2, way.Tags.Count); - Assert.True(way.Tags.ContainsKey("highway")); - Assert.AreEqual("residential", way.Tags["highway"]); - Assert.True(way.Tags.ContainsKey("maxspeed:practical")); - Assert.AreEqual("12.910093541777924", way.Tags["maxspeed:practical"]); + Assert.That(way.Id, Is.EqualTo(538868)); + Assert.That(way.Visible, Is.EqualTo(true)); + Assert.That(way.Version, Is.EqualTo(5)); + Assert.That(way.ChangeSetId, Is.EqualTo(23710)); + Assert.That(way.TimeStamp, Is.EqualTo(parseToUniversalTime("2013-05-28T17:45:26Z"))); + Assert.That(way.UserName, Is.EqualTo("Kate")); + Assert.That(way.UserId, Is.EqualTo(1163)); + Assert.That(way.Nodes, Is.Not.Null); + Assert.That(way.Nodes.Length, Is.EqualTo(2)); + Assert.That(way.Nodes[0], Is.EqualTo(4294969195)); + Assert.That(way.Nodes[1], Is.EqualTo(4294969575)); + Assert.That(way.Tags, Is.Not.Null); + Assert.That(way.Tags.Count, Is.EqualTo(2)); + Assert.That(way.Tags.ContainsKey("highway"), Is.True); + Assert.That(way.Tags["highway"], Is.EqualTo("residential")); + Assert.That(way.Tags.ContainsKey("maxspeed:practical"), Is.True); + Assert.That(way.Tags["maxspeed:practical"], Is.EqualTo("12.910093541777924")); } /// @@ -282,45 +281,45 @@ public void TestDeserializeWithCapabilitiesAndPolicies() var serializer = new XmlSerializer(typeof(Osm)); var osm = serializer.Deserialize(new StringReader(xml)) as Osm; - Assert.IsNotNull(osm); - Assert.AreEqual(.6, osm.Version); - Assert.AreEqual("OpenStreetMap server", osm.Generator); - - Assert.IsNull(osm.Relations); - Assert.IsNull(osm.User); - Assert.IsNull(osm.GpxFiles); - Assert.IsNull(osm.Nodes); - Assert.IsNull(osm.Ways); - Assert.IsNull(osm.Bounds); - - Assert.IsNotNull(osm.Api); - Assert.IsNotNull(osm.Api.Version); - Assert.AreEqual(.6, osm.Api.Version.Maximum); - Assert.AreEqual(.6, osm.Api.Version.Minimum); - Assert.IsNotNull(osm.Api.Area); - Assert.AreEqual(.25, osm.Api.Area.Maximum); - Assert.IsNotNull(osm.Api.NoteArea); - Assert.AreEqual(25, osm.Api.NoteArea.Maximum); - Assert.IsNotNull(osm.Api.Tracepoints); - Assert.AreEqual(5000, osm.Api.Tracepoints.PerPage); - Assert.IsNotNull(osm.Api.WayNodes); - Assert.AreEqual(2000, osm.Api.WayNodes.Maximum); - Assert.IsNotNull(osm.Api.Changesets); - Assert.AreEqual(10000, osm.Api.Changesets.MaximumElements); - Assert.IsNotNull(osm.Api.Timeout); - Assert.AreEqual(300, osm.Api.Timeout.Seconds); - Assert.IsNotNull(osm.Api.Status); - Assert.AreEqual(Status.ServiceStatus.online, osm.Api.Status.Database); - Assert.AreEqual(Status.ServiceStatus.online, osm.Api.Status.Api); - Assert.AreEqual(Status.ServiceStatus.online, osm.Api.Status.Gpx); - - Assert.IsNotNull(osm.Policy); - Assert.IsNotNull(osm.Policy.Imagery); - Assert.IsNotNull(osm.Policy.Imagery.Blacklists); - Assert.AreEqual(3, osm.Policy.Imagery.Blacklists.Length); - Assert.AreEqual(@".*\.google(apis)?\..*/(vt|kh)[\?/].*([xyz]=.*){3}.*", osm.Policy.Imagery.Blacklists[0].Regex); - Assert.AreEqual(@"http://xdworld\.vworld\.kr:8080/.*", osm.Policy.Imagery.Blacklists[1].Regex); - Assert.AreEqual(@".*\.here\.com[/:].*", osm.Policy.Imagery.Blacklists[2].Regex); + Assert.That(osm, Is.Not.Null); + Assert.That(osm.Version, Is.EqualTo(System.Version.Parse("0.6"))); + Assert.That(osm.Generator, Is.EqualTo("OpenStreetMap server")); + + Assert.That(osm.Relations, Is.Null); + Assert.That(osm.User, Is.Null); + Assert.That(osm.GpxFiles, Is.Null); + Assert.That(osm.Nodes, Is.Null); + Assert.That(osm.Ways, Is.Null); + Assert.That(osm.Bounds, Is.Null); + + Assert.That(osm.Api, Is.Not.Null); + Assert.That(osm.Api.Version, Is.Not.Null); + Assert.That(osm.Api.Version.Maximum, Is.EqualTo(.6)); + Assert.That(osm.Api.Version.Minimum, Is.EqualTo(.6)); + Assert.That(osm.Api.Area, Is.Not.Null); + Assert.That(osm.Api.Area.Maximum, Is.EqualTo(.25)); + Assert.That(osm.Api.NoteArea, Is.Not.Null); + Assert.That(osm.Api.NoteArea.Maximum, Is.EqualTo(25)); + Assert.That(osm.Api.Tracepoints, Is.Not.Null); + Assert.That(osm.Api.Tracepoints.PerPage, Is.EqualTo(5000)); + Assert.That(osm.Api.WayNodes, Is.Not.Null); + Assert.That(osm.Api.WayNodes.Maximum, Is.EqualTo(2000)); + Assert.That(osm.Api.Changesets, Is.Not.Null); + Assert.That(osm.Api.Changesets.MaximumElements, Is.EqualTo(10000)); + Assert.That(osm.Api.Timeout, Is.Not.Null); + Assert.That(osm.Api.Timeout.Seconds, Is.EqualTo(300)); + Assert.That(osm.Api.Status, Is.Not.Null); + Assert.That(osm.Api.Status.Database, Is.EqualTo(Status.ServiceStatus.online)); + Assert.That(osm.Api.Status.Api, Is.EqualTo(Status.ServiceStatus.online)); + Assert.That(osm.Api.Status.Gpx, Is.EqualTo(Status.ServiceStatus.online)); + + Assert.That(osm.Policy, Is.Not.Null); + Assert.That(osm.Policy.Imagery, Is.Not.Null); + Assert.That(osm.Policy.Imagery.Blacklists, Is.Not.Null); + Assert.That(osm.Policy.Imagery.Blacklists.Length, Is.EqualTo(3)); + Assert.That(osm.Policy.Imagery.Blacklists[0].Regex, Is.EqualTo(@".*\.google(apis)?\..*/(vt|kh)[\?/].*([xyz]=.*){3}.*")); + Assert.That(osm.Policy.Imagery.Blacklists[1].Regex, Is.EqualTo(@"http://xdworld\.vworld\.kr:8080/.*")); + Assert.That(osm.Policy.Imagery.Blacklists[2].Regex, Is.EqualTo(@".*\.here\.com[/:].*")); } /// @@ -341,11 +340,11 @@ public void TestDeserializeVersionAsValue() var serializer = new XmlSerializer(typeof(Osm)); var osm = serializer.Deserialize(new StringReader(xml)) as Osm; - Assert.IsNotNull(osm); - Assert.IsNotNull(osm.Api); - Assert.IsNotNull(osm.Api.Version); - Assert.AreEqual(.6, osm.Api.Version.Maximum); - Assert.AreEqual(.6, osm.Api.Version.Maximum); + Assert.That(osm, Is.Not.Null); + Assert.That(osm.Api, Is.Not.Null); + Assert.That(osm.Api.Version, Is.Not.Null); + Assert.That(osm.Api.Version.Maximum, Is.EqualTo(.6)); + Assert.That(osm.Api.Version.Maximum, Is.EqualTo(.6)); } /// @@ -368,13 +367,13 @@ public void TestDeserializePermissions() var serializer = new XmlSerializer(typeof(Osm)); var osm = serializer.Deserialize(new StringReader(xml)) as Osm; - Assert.IsNotNull(osm); - Assert.IsNotNull(osm.Permissions); - Assert.IsNotNull(osm.Permissions.UserPermission); - Assert.AreEqual(3, osm.Permissions.UserPermission.Length); - Assert.AreEqual(Permissions.Permission.allow_read_prefs, osm.Permissions.UserPermission[0]); - Assert.AreEqual(Permissions.Permission.allow_read_gpx, osm.Permissions.UserPermission[1]); - Assert.AreEqual(Permissions.Permission.allow_write_gpx, osm.Permissions.UserPermission[2]); + Assert.That(osm, Is.Not.Null); + Assert.That(osm.Permissions, Is.Not.Null); + Assert.That(osm.Permissions.UserPermission, Is.Not.Null); + Assert.That(osm.Permissions.UserPermission.Length, Is.EqualTo(3)); + Assert.That(osm.Permissions.UserPermission[0], Is.EqualTo(Permissions.Permission.allow_read_prefs)); + Assert.That(osm.Permissions.UserPermission[1], Is.EqualTo(Permissions.Permission.allow_read_gpx)); + Assert.That(osm.Permissions.UserPermission[2], Is.EqualTo(Permissions.Permission.allow_write_gpx)); } /// @@ -396,14 +395,14 @@ public void TestDeserializePreferences() var serializer = new XmlSerializer(typeof(Osm)); var osm = serializer.Deserialize(new StringReader(xml)) as Osm; - Assert.IsNotNull(osm); - Assert.IsNotNull(osm.Preferences); - Assert.IsNotNull(osm.Preferences.UserPreferences); - Assert.AreEqual(2, osm.Preferences.UserPreferences.Length); - Assert.AreEqual("gps.trace.visibility", osm.Preferences.UserPreferences[0].Key); - Assert.AreEqual("public", osm.Preferences.UserPreferences[0].Value); - Assert.AreEqual("color", osm.Preferences.UserPreferences[1].Key); - Assert.AreEqual("red", osm.Preferences.UserPreferences[1].Value); + Assert.That(osm, Is.Not.Null); + Assert.That(osm.Preferences, Is.Not.Null); + Assert.That(osm.Preferences.UserPreferences, Is.Not.Null); + Assert.That(osm.Preferences.UserPreferences.Length, Is.EqualTo(2)); + Assert.That(osm.Preferences.UserPreferences[0].Key, Is.EqualTo("gps.trace.visibility")); + Assert.That(osm.Preferences.UserPreferences[0].Value, Is.EqualTo("public")); + Assert.That(osm.Preferences.UserPreferences[1].Key, Is.EqualTo("color")); + Assert.That(osm.Preferences.UserPreferences[1].Value, Is.EqualTo("red")); } /// @@ -441,31 +440,31 @@ public void TestDeserializeNotes() var serializer = new XmlSerializer(typeof(Osm)); var osm = serializer.Deserialize(new StringReader(xml)) as Osm; - Assert.IsNotNull(osm); - Assert.IsNotNull(osm.Notes); - Assert.AreEqual(1, osm.Notes.Length); + Assert.That(osm, Is.Not.Null); + Assert.That(osm.Notes, Is.Not.Null); + Assert.That(osm.Notes.Length, Is.EqualTo(1)); var note = osm.Notes[0]; - Assert.AreEqual(51, note.Latitude); - Assert.AreEqual(0.1, note.Longitude); - Assert.AreEqual(16659, note.Id); - Assert.AreEqual("https://master.apis.dev.openstreetmap.org/api/0.6/notes/16659", note.Url); - Assert.AreEqual("https://master.apis.dev.openstreetmap.org/api/0.6/notes/16659/comment", note.CommentUrl); - Assert.AreEqual("https://master.apis.dev.openstreetmap.org/api/0.6/notes/16659/close", note.CloseUrl); - Assert.AreEqual(Note.ParseNoteDate("2019-06-15 08:26:04 UTC"), note.DateCreated); - Assert.AreEqual(Note.NoteStatus.Open, note.Status); - Assert.IsNotNull(note.Comments); - Assert.IsNotNull(note.Comments.Comments); - Assert.AreEqual(1, note.Comments.Comments.Length); + Assert.That(note.Latitude, Is.EqualTo(51)); + Assert.That(note.Longitude, Is.EqualTo(0.1)); + Assert.That(note.Id, Is.EqualTo(16659)); + Assert.That(note.Url, Is.EqualTo("https://master.apis.dev.openstreetmap.org/api/0.6/notes/16659")); + Assert.That(note.CommentUrl, Is.EqualTo("https://master.apis.dev.openstreetmap.org/api/0.6/notes/16659/comment")); + Assert.That(note.CloseUrl, Is.EqualTo("https://master.apis.dev.openstreetmap.org/api/0.6/notes/16659/close")); + Assert.That(note.DateCreated, Is.EqualTo(Note.ParseNoteDate("2019-06-15 08:26:04 UTC"))); + Assert.That(note.Status, Is.EqualTo(Note.NoteStatus.Open)); + Assert.That(note.Comments, Is.Not.Null); + Assert.That(note.Comments.Comments, Is.Not.Null); + Assert.That(note.Comments.Comments.Length, Is.EqualTo(1)); var comment = note.Comments.Comments[0]; - Assert.AreEqual(Note.ParseNoteDate("2019-06-15 08:26:04 UTC"), comment.Date); - Assert.AreEqual(1234, comment.UserId); - Assert.AreEqual("userName", comment.UserName); - Assert.AreEqual("https://master.apis.dev.openstreetmap.org/user/userName", comment.UserUrl); - Assert.AreEqual(Note.Comment.CommentAction.Opened, comment.Action); - Assert.AreEqual("ThisIsANote", comment.Text); - Assert.AreEqual("

ThisIsANote

", comment.HTML); + Assert.That(comment.Date, Is.EqualTo(Note.ParseNoteDate("2019-06-15 08:26:04 UTC"))); + Assert.That(comment.UserId, Is.EqualTo(1234)); + Assert.That(comment.UserName, Is.EqualTo("userName")); + Assert.That(comment.UserUrl, Is.EqualTo("https://master.apis.dev.openstreetmap.org/user/userName")); + Assert.That(comment.Action, Is.EqualTo(Note.Comment.CommentAction.Opened)); + Assert.That(comment.Text, Is.EqualTo("ThisIsANote")); + Assert.That(comment.HTML, Is.EqualTo("

ThisIsANote

")); } } } \ No newline at end of file diff --git a/test/OsmSharp.Test/IO/Xml/API/UserTests.cs b/test/OsmSharp.Test/IO/Xml/API/UserTests.cs index 39f385b7..abbbeedb 100755 --- a/test/OsmSharp.Test/IO/Xml/API/UserTests.cs +++ b/test/OsmSharp.Test/IO/Xml/API/UserTests.cs @@ -44,7 +44,7 @@ public void TestSerialize() { var osm = new Osm { - Version = 0.6, + Version = System.Version.Parse("0.6"), Generator = "OpenStreetMap server", User = new User() { @@ -80,8 +80,7 @@ public void TestSerialize() }; var osmString = osm.SerializeToXml(); - Assert.AreEqual("Descriptionen-US", - osmString); + Assert.That(osmString, Is.EqualTo("Descriptionen-US")); } /// @@ -94,27 +93,27 @@ public void TestDeserialize() var osm = serializer.Deserialize( new StringReader("Helloheen-USen")) as Osm; - Assert.IsNotNull(osm.User); - Assert.AreEqual(111, osm.User.Id); - Assert.AreEqual("Test", osm.User.DisplayName); - Assert.AreEqual(new DateTime(2000, 1, 1, 0, 0, 0), osm.User.AccountCreated); - Assert.AreEqual("Hello", osm.User.Description); - Assert.IsTrue(osm.User.ContributorTermsAgreed); - Assert.IsFalse(osm.User.ContributorTermsPublicDomain); - Assert.AreEqual("Image", osm.User.Image); - Assert.AreEqual(1, osm.User.ChangeSetCount); - Assert.AreEqual(2, osm.User.TraceCount); - Assert.AreEqual(1, osm.User.BlocksReceived.Length); - Assert.AreEqual(3, osm.User.BlocksReceived.First().Count); - Assert.AreEqual(4, osm.User.BlocksReceived.First().Active); - Assert.AreEqual(5.5f, osm.User.Home.Latitude); - Assert.AreEqual(6.6f, osm.User.Home.Longitude); - Assert.AreEqual(7.7f, osm.User.Home.Zoom); - Assert.AreEqual(3, osm.User.Languages.Length); - Assert.AreEqual("he", osm.User.Languages.First()); - Assert.AreEqual(8, osm.User.Messages.Received); - Assert.AreEqual(9, osm.User.Messages.Unread); - Assert.AreEqual(10, osm.User.Messages.Sent); + Assert.That(osm.User, Is.Not.Null); + Assert.That(osm.User.Id, Is.EqualTo(111)); + Assert.That(osm.User.DisplayName, Is.EqualTo("Test")); + Assert.That(osm.User.AccountCreated, Is.EqualTo(new DateTime(2000, 1, 1, 0, 0, 0))); + Assert.That(osm.User.Description, Is.EqualTo("Hello")); + Assert.That(osm.User.ContributorTermsAgreed, Is.True); + Assert.That(osm.User.ContributorTermsPublicDomain, Is.False); + Assert.That(osm.User.Image, Is.EqualTo("Image")); + Assert.That(osm.User.ChangeSetCount, Is.EqualTo(1)); + Assert.That(osm.User.TraceCount, Is.EqualTo(2)); + Assert.That(osm.User.BlocksReceived.Length, Is.EqualTo(1)); + Assert.That(osm.User.BlocksReceived.First().Count, Is.EqualTo(3)); + Assert.That(osm.User.BlocksReceived.First().Active, Is.EqualTo(4)); + Assert.That(osm.User.Home.Latitude, Is.EqualTo(5.5f)); + Assert.That(osm.User.Home.Longitude, Is.EqualTo(6.6f)); + Assert.That(osm.User.Home.Zoom, Is.EqualTo(7.7f)); + Assert.That(osm.User.Languages.Length, Is.EqualTo(3)); + Assert.That(osm.User.Languages.First(), Is.EqualTo("he")); + Assert.That(osm.User.Messages.Received, Is.EqualTo(8)); + Assert.That(osm.User.Messages.Unread, Is.EqualTo(9)); + Assert.That(osm.User.Messages.Sent, Is.EqualTo(10)); } } } diff --git a/test/OsmSharp.Test/IO/Xml/Changesets/ChangesetTests.cs b/test/OsmSharp.Test/IO/Xml/Changesets/ChangesetTests.cs index f63fd014..b7387e43 100755 --- a/test/OsmSharp.Test/IO/Xml/Changesets/ChangesetTests.cs +++ b/test/OsmSharp.Test/IO/Xml/Changesets/ChangesetTests.cs @@ -61,8 +61,7 @@ public void TestSerialize() }; var result = changeset.SerializeToXml(); - Assert.AreEqual("", - result); + Assert.That(result, Is.EqualTo("")); } /// @@ -75,29 +74,29 @@ public void TestDeserialize() var changeset = serializer.Deserialize( new StringReader("")) as Changeset; - Assert.IsNotNull(changeset); - Assert.AreEqual(10, changeset.Id); + Assert.That(changeset, Is.Not.Null); + Assert.That(changeset.Id, Is.EqualTo(10)); changeset = serializer.Deserialize( new StringReader("")) as Changeset; - Assert.IsNotNull(changeset); - Assert.AreEqual(10, changeset.Id); - Assert.AreEqual(123, changeset.UserId); - Assert.AreEqual("fred", changeset.UserName); - Assert.AreEqual(new System.DateTime(2008, 11, 08, 19, 07, 39), changeset.CreatedAt.Value.ToUniversalTime()); - Assert.IsNull(changeset.ClosedAt); - Assert.AreEqual(true, changeset.Open); - Assert.AreEqual(7.0191821f, changeset.MinLongitude, 0.00001f); - Assert.AreEqual(49.2785426f, changeset.MinLatitude, 0.00001f); - Assert.AreEqual(7.0197485f, changeset.MaxLongitude, 0.00001f); - Assert.AreEqual(49.27931011f, changeset.MaxLatitude, 0.00001f); - - Assert.IsNotNull(changeset.Tags); - Assert.AreEqual(2, changeset.Tags.Count); - Assert.IsTrue(changeset.Tags.Contains("created_by", "JOSM 1.61")); - Assert.IsTrue(changeset.Tags.Contains("comment", "Just adding some streetnames")); - - Assert.IsNull(changeset.Discussion); + Assert.That(changeset, Is.Not.Null); + Assert.That(changeset.Id, Is.EqualTo(10)); + Assert.That(changeset.UserId, Is.EqualTo(123)); + Assert.That(changeset.UserName, Is.EqualTo("fred")); + Assert.That(changeset.CreatedAt.Value.ToUniversalTime(), Is.EqualTo(new System.DateTime(2008, 11, 08, 19, 07, 39))); + Assert.That(changeset.ClosedAt, Is.Null); + Assert.That(changeset.Open, Is.EqualTo(true)); + Assert.That(changeset.MinLongitude, Is.EqualTo(7.0191821f).Within(0.00001f)); + Assert.That(changeset.MinLatitude, Is.EqualTo(49.2785426f).Within(0.00001f)); + Assert.That(changeset.MaxLongitude, Is.EqualTo(7.0197485f).Within(0.00001f)); + Assert.That(changeset.MaxLatitude, Is.EqualTo(49.27931011f).Within(0.00001f)); + + Assert.That(changeset.Tags, Is.Not.Null); + Assert.That(changeset.Tags.Count, Is.EqualTo(2)); + Assert.That(changeset.Tags.Contains("created_by", "JOSM 1.61"), Is.True); + Assert.That(changeset.Tags.Contains("comment", "Just adding some streetnames"), Is.True); + + Assert.That(changeset.Discussion, Is.Null); } /// @@ -128,40 +127,40 @@ public void TestDeserializeDiscussion() Func parseToUniversalTime = t => DateTime.Parse(t, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal); - Assert.IsNotNull(osm.Changesets); - Assert.AreEqual(1, osm.Changesets.Length); + Assert.That(osm.Changesets, Is.Not.Null); + Assert.That(osm.Changesets.Length, Is.EqualTo(1)); var changeset = osm.Changesets[0]; - Assert.IsNotNull(changeset); - Assert.AreEqual(10, changeset.Id); - Assert.AreEqual("fred", changeset.UserName); - Assert.AreEqual(123, changeset.UserId); - Assert.AreEqual(parseToUniversalTime("2008-11-08T19:07:39+01:00"), changeset.CreatedAt); - Assert.AreEqual(true, changeset.Open); - Assert.AreEqual(7.0191821f, changeset.MinLongitude, 0.00001f); - Assert.AreEqual(49.2785426f, changeset.MinLatitude, 0.00001f); - Assert.AreEqual(7.0197485f, changeset.MaxLongitude, 0.00001f); - Assert.AreEqual(49.27931011f, changeset.MaxLatitude, 0.00001f); - Assert.AreEqual(2, changeset.CommentsCount); - Assert.AreEqual(5, changeset.ChangesCount); - Assert.IsNull(changeset.ClosedAt); - - Assert.IsNotNull(changeset.Tags); - Assert.AreEqual(2, changeset.Tags.Count); - Assert.IsTrue(changeset.Tags.Contains("created_by", "JOSM 1.61")); - Assert.IsTrue(changeset.Tags.Contains("comment", "Just adding some streetnames")); - - Assert.IsNotNull(changeset.Discussion); - Assert.IsNotNull(changeset.Discussion.Comments); + Assert.That(changeset, Is.Not.Null); + Assert.That(changeset.Id, Is.EqualTo(10)); + Assert.That(changeset.UserName, Is.EqualTo("fred")); + Assert.That(changeset.UserId, Is.EqualTo(123)); + Assert.That(changeset.CreatedAt, Is.EqualTo(parseToUniversalTime("2008-11-08T19:07:39+01:00"))); + Assert.That(changeset.Open, Is.EqualTo(true)); + Assert.That(changeset.MinLongitude, Is.EqualTo(7.0191821f).Within(0.00001f)); + Assert.That(changeset.MinLatitude, Is.EqualTo(49.2785426f).Within(0.00001f)); + Assert.That(changeset.MaxLongitude, Is.EqualTo(7.0197485f).Within(0.00001f)); + Assert.That(changeset.MaxLatitude, Is.EqualTo(49.27931011f).Within(0.00001f)); + Assert.That(changeset.CommentsCount, Is.EqualTo(2)); + Assert.That(changeset.ChangesCount, Is.EqualTo(5)); + Assert.That(changeset.ClosedAt, Is.Null); + + Assert.That(changeset.Tags, Is.Not.Null); + Assert.That(changeset.Tags.Count, Is.EqualTo(2)); + Assert.That(changeset.Tags.Contains("created_by", "JOSM 1.61"), Is.True); + Assert.That(changeset.Tags.Contains("comment", "Just adding some streetnames"), Is.True); + + Assert.That(changeset.Discussion, Is.Not.Null); + Assert.That(changeset.Discussion.Comments, Is.Not.Null); var comments = changeset.Discussion.Comments; - Assert.AreEqual(2, comments.Length); - Assert.AreEqual(parseToUniversalTime("2015-01-01T18:56:48Z"), comments[0].Date); - Assert.AreEqual(1841, comments[0].UserId); - Assert.AreEqual("metaodi", comments[0].UserName); - Assert.AreEqual("Did you verify those street names?", comments[0].Text); - Assert.AreEqual(parseToUniversalTime("2015-01-01T18:58:03Z"), comments[1].Date); - Assert.AreEqual(123, comments[1].UserId); - Assert.AreEqual("fred", comments[1].UserName); - Assert.AreEqual("sure!", comments[1].Text); + Assert.That(comments.Length, Is.EqualTo(2)); + Assert.That(comments[0].Date, Is.EqualTo(parseToUniversalTime("2015-01-01T18:56:48Z"))); + Assert.That(comments[0].UserId, Is.EqualTo(1841)); + Assert.That(comments[0].UserName, Is.EqualTo("metaodi")); + Assert.That(comments[0].Text, Is.EqualTo("Did you verify those street names?")); + Assert.That(comments[1].Date, Is.EqualTo(parseToUniversalTime("2015-01-01T18:58:03Z"))); + Assert.That(comments[1].UserId, Is.EqualTo(123)); + Assert.That(comments[1].UserName, Is.EqualTo("fred")); + Assert.That(comments[1].Text, Is.EqualTo("sure!")); } } } \ No newline at end of file diff --git a/test/OsmSharp.Test/IO/Xml/Changesets/DiffResultTests.cs b/test/OsmSharp.Test/IO/Xml/Changesets/DiffResultTests.cs index 1829b0f8..c6d61f94 100755 --- a/test/OsmSharp.Test/IO/Xml/Changesets/DiffResultTests.cs +++ b/test/OsmSharp.Test/IO/Xml/Changesets/DiffResultTests.cs @@ -42,7 +42,7 @@ public void TestSerialize() { var diffResult = new DiffResult() { - Version = 0.6, + Version = System.Version.Parse("0.6"), Generator = "OsmSharp", Results = new OsmGeoResult[] { @@ -62,8 +62,7 @@ public void TestSerialize() }; var result = diffResult.SerializeToXml(); - Assert.AreEqual("", - result); + Assert.That(result, Is.EqualTo("")); } /// @@ -76,26 +75,26 @@ public void TestDeserialize() var diffResult = serializer.Deserialize( new StringReader("")) as DiffResult; - Assert.IsNotNull(diffResult); - Assert.IsNull(diffResult.Results); - Assert.AreEqual(0.6, diffResult.Version); - Assert.IsNull(diffResult.Generator); + Assert.That(diffResult, Is.Not.Null); + Assert.That(diffResult.Results, Is.Null); + Assert.That(diffResult.Version, Is.EqualTo(System.Version.Parse("0.6"))); + Assert.That(diffResult.Generator, Is.Null); diffResult = serializer.Deserialize( new StringReader("")) as DiffResult; - Assert.IsNotNull(diffResult); - Assert.IsNull(diffResult.Results); - Assert.AreEqual(0.6, diffResult.Version); - Assert.AreEqual("OsmSharp", diffResult.Generator); + Assert.That(diffResult, Is.Not.Null); + Assert.That(diffResult.Results, Is.Null); + Assert.That(diffResult.Version, Is.EqualTo(System.Version.Parse("0.6"))); + Assert.That(diffResult.Generator, Is.EqualTo("OsmSharp")); diffResult = serializer.Deserialize( new StringReader("")) as DiffResult; - Assert.IsNotNull(diffResult); - Assert.AreEqual(2, diffResult.Results.Length); - Assert.AreEqual(1, diffResult.Results[0].OldId); - Assert.AreEqual(3, diffResult.Results[1].OldId); - Assert.AreEqual(0.6, diffResult.Version); - Assert.AreEqual("OsmSharp", diffResult.Generator); + Assert.That(diffResult, Is.Not.Null); + Assert.That(diffResult.Results.Length, Is.EqualTo(2)); + Assert.That(diffResult.Results[0].OldId, Is.EqualTo(1)); + Assert.That(diffResult.Results[1].OldId, Is.EqualTo(3)); + Assert.That(diffResult.Version, Is.EqualTo(System.Version.Parse("0.6"))); + Assert.That(diffResult.Generator, Is.EqualTo("OsmSharp")); } } } \ No newline at end of file diff --git a/test/OsmSharp.Test/IO/Xml/Changesets/OsmChangeTests.cs b/test/OsmSharp.Test/IO/Xml/Changesets/OsmChangeTests.cs index 7df742b3..5e0f8d4a 100755 --- a/test/OsmSharp.Test/IO/Xml/Changesets/OsmChangeTests.cs +++ b/test/OsmSharp.Test/IO/Xml/Changesets/OsmChangeTests.cs @@ -42,7 +42,7 @@ public void TestSerialize() { var osmChange = new OsmChange() { - Version = 0.6, + Version = System.Version.Parse("0.6"), Generator = "OsmSharp", Create = new OsmGeo[] { @@ -92,8 +92,7 @@ public void TestSerialize() }; var result = osmChange.SerializeToXml(); - Assert.AreEqual("", - result); + Assert.That(result, Is.EqualTo("")); } /// @@ -106,15 +105,15 @@ public void TestDeserialize_Empty() var osmChange = serializer.Deserialize( new StringReader("")) as OsmChange; - Assert.IsNotNull(osmChange); - Assert.AreEqual(0, osmChange.Create.Length); - Assert.AreEqual(0, osmChange.Delete.Length); - Assert.AreEqual(0, osmChange.Modify.Length); - Assert.AreEqual(0.6, osmChange.Version); - Assert.IsNull(osmChange.Generator); - Assert.IsNull(osmChange.Copyright); - Assert.IsNull(osmChange.Attribution); - Assert.IsNull(osmChange.License); + Assert.That(osmChange, Is.Not.Null); + Assert.That(osmChange.Create.Length, Is.EqualTo(0)); + Assert.That(osmChange.Delete.Length, Is.EqualTo(0)); + Assert.That(osmChange.Modify.Length, Is.EqualTo(0)); + Assert.That(osmChange.Version, Is.EqualTo(System.Version.Parse("0.6"))); + Assert.That(osmChange.Generator, Is.Null); + Assert.That(osmChange.Copyright, Is.Null); + Assert.That(osmChange.Attribution, Is.Null); + Assert.That(osmChange.License, Is.Null); } [Test] @@ -123,15 +122,15 @@ public void TestDeserialize_WithAttributes() var serializer = new XmlSerializer(typeof(OsmChange)); var osmChange = serializer.Deserialize( new StringReader("")) as OsmChange; - Assert.IsNotNull(osmChange); - Assert.AreEqual(0, osmChange.Create.Length); - Assert.AreEqual(0, osmChange.Delete.Length); - Assert.AreEqual(0, osmChange.Modify.Length); - Assert.AreEqual(0.6, osmChange.Version); - Assert.AreEqual("OsmSharp", osmChange.Generator); - Assert.AreEqual("OpenStreetMap and contributors", osmChange.Copyright); - Assert.AreEqual("http://www.openstreetmap.org/copyright", osmChange.Attribution); - Assert.AreEqual("http://opendatacommons.org/licenses/odbl/1-0/", osmChange.License); + Assert.That(osmChange, Is.Not.Null); + Assert.That(osmChange.Create.Length, Is.EqualTo(0)); + Assert.That(osmChange.Delete.Length, Is.EqualTo(0)); + Assert.That(osmChange.Modify.Length, Is.EqualTo(0)); + Assert.That(osmChange.Version, Is.EqualTo(System.Version.Parse("0.6"))); + Assert.That(osmChange.Generator, Is.EqualTo("OsmSharp")); + Assert.That(osmChange.Copyright, Is.EqualTo("OpenStreetMap and contributors")); + Assert.That(osmChange.Attribution, Is.EqualTo("http://www.openstreetmap.org/copyright")); + Assert.That(osmChange.License, Is.EqualTo("http://opendatacommons.org/licenses/odbl/1-0/")); } [Test] @@ -141,37 +140,37 @@ public void TestDeserialize_Full() var osmChange = serializer.Deserialize( new StringReader("")) as OsmChange; - Assert.IsNotNull(osmChange); - - Assert.IsNotNull(osmChange.Create); - Assert.AreEqual(3, osmChange.Create.Length); - Assert.AreEqual(1, osmChange.Create[0].Id); - Assert.AreEqual(OsmGeoType.Node, osmChange.Create[0].Type); - Assert.AreEqual(10, osmChange.Create[1].Id); - Assert.AreEqual(OsmGeoType.Way, osmChange.Create[1].Type); - Assert.AreEqual(100, osmChange.Create[2].Id); - Assert.AreEqual(OsmGeoType.Relation, osmChange.Create[2].Type); - - Assert.IsNotNull(osmChange.Modify); - Assert.AreEqual(3, osmChange.Modify.Length); - Assert.AreEqual(2, osmChange.Modify[0].Id); - Assert.AreEqual(OsmGeoType.Node, osmChange.Modify[0].Type); - Assert.AreEqual(20, osmChange.Modify[1].Id); - Assert.AreEqual(OsmGeoType.Way, osmChange.Modify[1].Type); - Assert.AreEqual(200, osmChange.Modify[2].Id); - Assert.AreEqual(OsmGeoType.Relation, osmChange.Modify[2].Type); - - Assert.IsNotNull(osmChange.Delete); - Assert.AreEqual(3, osmChange.Delete.Length); - Assert.AreEqual(3, osmChange.Delete[0].Id); - Assert.AreEqual(OsmGeoType.Node, osmChange.Delete[0].Type); - Assert.AreEqual(30, osmChange.Delete[1].Id); - Assert.AreEqual(OsmGeoType.Way, osmChange.Delete[1].Type); - Assert.AreEqual(300, osmChange.Delete[2].Id); - Assert.AreEqual(OsmGeoType.Relation, osmChange.Delete[2].Type); - - Assert.AreEqual(0.6, osmChange.Version); - Assert.AreEqual("OsmSharp", osmChange.Generator); + Assert.That(osmChange, Is.Not.Null); + + Assert.That(osmChange.Create, Is.Not.Null); + Assert.That(osmChange.Create.Length, Is.EqualTo(3)); + Assert.That(osmChange.Create[0].Id, Is.EqualTo(1)); + Assert.That(osmChange.Create[0].Type, Is.EqualTo(OsmGeoType.Node)); + Assert.That(osmChange.Create[1].Id, Is.EqualTo(10)); + Assert.That(osmChange.Create[1].Type, Is.EqualTo(OsmGeoType.Way)); + Assert.That(osmChange.Create[2].Id, Is.EqualTo(100)); + Assert.That(osmChange.Create[2].Type, Is.EqualTo(OsmGeoType.Relation)); + + Assert.That(osmChange.Modify, Is.Not.Null); + Assert.That(osmChange.Modify.Length, Is.EqualTo(3)); + Assert.That(osmChange.Modify[0].Id, Is.EqualTo(2)); + Assert.That(osmChange.Modify[0].Type, Is.EqualTo(OsmGeoType.Node)); + Assert.That(osmChange.Modify[1].Id, Is.EqualTo(20)); + Assert.That(osmChange.Modify[1].Type, Is.EqualTo(OsmGeoType.Way)); + Assert.That(osmChange.Modify[2].Id, Is.EqualTo(200)); + Assert.That(osmChange.Modify[2].Type, Is.EqualTo(OsmGeoType.Relation)); + + Assert.That(osmChange.Delete, Is.Not.Null); + Assert.That(osmChange.Delete.Length, Is.EqualTo(3)); + Assert.That(osmChange.Delete[0].Id, Is.EqualTo(3)); + Assert.That(osmChange.Delete[0].Type, Is.EqualTo(OsmGeoType.Node)); + Assert.That(osmChange.Delete[1].Id, Is.EqualTo(30)); + Assert.That(osmChange.Delete[1].Type, Is.EqualTo(OsmGeoType.Way)); + Assert.That(osmChange.Delete[2].Id, Is.EqualTo(300)); + Assert.That(osmChange.Delete[2].Type, Is.EqualTo(OsmGeoType.Relation)); + + Assert.That(osmChange.Version, Is.EqualTo(System.Version.Parse("0.6"))); + Assert.That(osmChange.Generator, Is.EqualTo("OsmSharp")); } @@ -182,16 +181,16 @@ public void TestDeserialize_IfUnused() var osmChange = serializer.Deserialize( new StringReader("")) as OsmChange; - Assert.IsNotNull(osmChange); - - Assert.AreEqual(0 ,osmChange.Create.Length); - Assert.IsNotNull(osmChange.Modify); - Assert.AreEqual(1, osmChange.Modify.Length); - Assert.AreEqual(1014872736, osmChange.Modify[0].Id); - Assert.AreEqual(OsmGeoType.Node, osmChange.Modify[0].Type); - Assert.AreEqual(0, osmChange.Delete.Length); - Assert.AreEqual(0.6, osmChange.Version); - Assert.AreEqual("iD", osmChange.Generator); + Assert.That(osmChange, Is.Not.Null); + + Assert.That(osmChange.Create.Length, Is.EqualTo(0)); + Assert.That(osmChange.Modify, Is.Not.Null); + Assert.That(osmChange.Modify.Length, Is.EqualTo(1)); + Assert.That(osmChange.Modify[0].Id, Is.EqualTo(1014872736)); + Assert.That(osmChange.Modify[0].Type, Is.EqualTo(OsmGeoType.Node)); + Assert.That(osmChange.Delete.Length, Is.EqualTo(0)); + Assert.That(osmChange.Version, Is.EqualTo(System.Version.Parse("0.6"))); + Assert.That(osmChange.Generator, Is.EqualTo("iD")); } [Test] @@ -201,34 +200,34 @@ public void TestDeserialize_DuplicateContainerTags() var osmChange = serializer.Deserialize( new StringReader("")) as OsmChange; - Assert.IsNotNull(osmChange); - - Assert.IsNotNull(osmChange.Create); - Assert.AreEqual(3, osmChange.Create.Length); - Assert.AreEqual(1, osmChange.Create[0].Id); - Assert.AreEqual(OsmGeoType.Node, osmChange.Create[0].Type); - Assert.AreEqual(10, osmChange.Create[1].Id); - Assert.AreEqual(OsmGeoType.Way, osmChange.Create[1].Type); - Assert.AreEqual(100, osmChange.Create[2].Id); - Assert.AreEqual(OsmGeoType.Relation, osmChange.Create[2].Type); - - Assert.IsNotNull(osmChange.Modify); - Assert.AreEqual(3, osmChange.Modify.Length); - Assert.AreEqual(2, osmChange.Modify[0].Id); - Assert.AreEqual(OsmGeoType.Node, osmChange.Modify[0].Type); - Assert.AreEqual(20, osmChange.Modify[1].Id); - Assert.AreEqual(OsmGeoType.Way, osmChange.Modify[1].Type); - Assert.AreEqual(200, osmChange.Modify[2].Id); - Assert.AreEqual(OsmGeoType.Relation, osmChange.Modify[2].Type); - - Assert.IsNotNull(osmChange.Delete); - Assert.AreEqual(3, osmChange.Delete.Length); - Assert.AreEqual(3, osmChange.Delete[0].Id); - Assert.AreEqual(OsmGeoType.Node, osmChange.Delete[0].Type); - Assert.AreEqual(30, osmChange.Delete[1].Id); - Assert.AreEqual(OsmGeoType.Way, osmChange.Delete[1].Type); - Assert.AreEqual(300, osmChange.Delete[2].Id); - Assert.AreEqual(OsmGeoType.Relation, osmChange.Delete[2].Type); + Assert.That(osmChange, Is.Not.Null); + + Assert.That(osmChange.Create, Is.Not.Null); + Assert.That(osmChange.Create.Length, Is.EqualTo(3)); + Assert.That(osmChange.Create[0].Id, Is.EqualTo(1)); + Assert.That(osmChange.Create[0].Type, Is.EqualTo(OsmGeoType.Node)); + Assert.That(osmChange.Create[1].Id, Is.EqualTo(10)); + Assert.That(osmChange.Create[1].Type, Is.EqualTo(OsmGeoType.Way)); + Assert.That(osmChange.Create[2].Id, Is.EqualTo(100)); + Assert.That(osmChange.Create[2].Type, Is.EqualTo(OsmGeoType.Relation)); + + Assert.That(osmChange.Modify, Is.Not.Null); + Assert.That(osmChange.Modify.Length, Is.EqualTo(3)); + Assert.That(osmChange.Modify[0].Id, Is.EqualTo(2)); + Assert.That(osmChange.Modify[0].Type, Is.EqualTo(OsmGeoType.Node)); + Assert.That(osmChange.Modify[1].Id, Is.EqualTo(20)); + Assert.That(osmChange.Modify[1].Type, Is.EqualTo(OsmGeoType.Way)); + Assert.That(osmChange.Modify[2].Id, Is.EqualTo(200)); + Assert.That(osmChange.Modify[2].Type, Is.EqualTo(OsmGeoType.Relation)); + + Assert.That(osmChange.Delete, Is.Not.Null); + Assert.That(osmChange.Delete.Length, Is.EqualTo(3)); + Assert.That(osmChange.Delete[0].Id, Is.EqualTo(3)); + Assert.That(osmChange.Delete[0].Type, Is.EqualTo(OsmGeoType.Node)); + Assert.That(osmChange.Delete[1].Id, Is.EqualTo(30)); + Assert.That(osmChange.Delete[1].Type, Is.EqualTo(OsmGeoType.Way)); + Assert.That(osmChange.Delete[2].Id, Is.EqualTo(300)); + Assert.That(osmChange.Delete[2].Type, Is.EqualTo(OsmGeoType.Relation)); } } } \ No newline at end of file diff --git a/test/OsmSharp.Test/IO/Xml/NodeTests.cs b/test/OsmSharp.Test/IO/Xml/NodeTests.cs index 101519f6..fd3db731 100755 --- a/test/OsmSharp.Test/IO/Xml/NodeTests.cs +++ b/test/OsmSharp.Test/IO/Xml/NodeTests.cs @@ -46,7 +46,7 @@ public void TestSerialize() Id = 1 }; - Assert.AreEqual("", node.SerializeToXml()); + Assert.That(node.SerializeToXml(), Is.EqualTo("")); node = new Node() { @@ -57,8 +57,7 @@ public void TestSerialize() UserName = "ben", UserId = 1 }; - Assert.AreEqual("", - node.SerializeToXml()); + Assert.That(node.SerializeToXml(), Is.EqualTo("")); node = new Node() { Id = 1, @@ -72,8 +71,7 @@ public void TestSerialize() new Tag("amenity", "something"), new Tag("key", "some_value")) }; - Assert.AreEqual("", - node.SerializeToXml()); + Assert.That(node.SerializeToXml(), Is.EqualTo("")); } /// @@ -86,32 +84,32 @@ public void TestDeserialize() var node = serializer.Deserialize( new StringReader("")) as Node; - Assert.IsNotNull(node); - Assert.AreEqual(1, node.Id); + Assert.That(node, Is.Not.Null); + Assert.That(node.Id, Is.EqualTo(1)); node = serializer.Deserialize( new StringReader("")) as Node; - Assert.IsNotNull(node); - Assert.AreEqual(1, node.Id); - Assert.AreEqual(54.1, node.Latitude, float.Epsilon); - Assert.AreEqual(12.2, node.Longitude, float.Epsilon); - Assert.AreEqual("ben", node.UserName); - Assert.AreEqual(1, node.UserId); - Assert.AreEqual(1, node.Version); + Assert.That(node, Is.Not.Null); + Assert.That(node.Id, Is.EqualTo(1)); + Assert.That(node.Latitude, Is.EqualTo(54.1).Within(float.Epsilon)); + Assert.That(node.Longitude, Is.EqualTo(12.2).Within(float.Epsilon)); + Assert.That(node.UserName, Is.EqualTo("ben")); + Assert.That(node.UserId, Is.EqualTo(1)); + Assert.That(node.Version, Is.EqualTo(1)); node = serializer.Deserialize( new StringReader("")) as Node; - Assert.IsNotNull(node); - Assert.AreEqual(1, node.Id); - Assert.AreEqual(54.1, node.Latitude, float.Epsilon); - Assert.AreEqual(12.2, node.Longitude, float.Epsilon); - Assert.AreEqual("ben", node.UserName); - Assert.AreEqual(1, node.UserId); - Assert.AreEqual(1, node.Version); - Assert.AreEqual(new System.DateTime(2008, 09, 12, 21, 37, 45), node.TimeStamp.Value.ToUniversalTime()); - Assert.IsNotNull(node.Tags); - Assert.IsTrue(node.Tags.Contains("amenity", "something")); - Assert.IsTrue(node.Tags.Contains("key", "some_value")); + Assert.That(node, Is.Not.Null); + Assert.That(node.Id, Is.EqualTo(1)); + Assert.That(node.Latitude, Is.EqualTo(54.1).Within(float.Epsilon)); + Assert.That(node.Longitude, Is.EqualTo(12.2).Within(float.Epsilon)); + Assert.That(node.UserName, Is.EqualTo("ben")); + Assert.That(node.UserId, Is.EqualTo(1)); + Assert.That(node.Version, Is.EqualTo(1)); + Assert.That(node.TimeStamp.Value.ToUniversalTime(), Is.EqualTo(new System.DateTime(2008, 09, 12, 21, 37, 45))); + Assert.That(node.Tags, Is.Not.Null); + Assert.That(node.Tags.Contains("amenity", "something"), Is.True); + Assert.That(node.Tags.Contains("key", "some_value"), Is.True); } /// @@ -128,9 +126,9 @@ public void TestDeserializeMulti() "" + "")) as Osm; - Assert.IsNotNull(osm); - Assert.IsNotNull(osm.Nodes); - Assert.AreEqual(2, osm.Nodes.Length); + Assert.That(osm, Is.Not.Null); + Assert.That(osm.Nodes, Is.Not.Null); + Assert.That(osm.Nodes.Length, Is.EqualTo(2)); } } } \ No newline at end of file diff --git a/test/OsmSharp.Test/IO/Xml/RelationTests.cs b/test/OsmSharp.Test/IO/Xml/RelationTests.cs index 51b4650e..5ce7be92 100755 --- a/test/OsmSharp.Test/IO/Xml/RelationTests.cs +++ b/test/OsmSharp.Test/IO/Xml/RelationTests.cs @@ -47,7 +47,7 @@ public void TestSerialize() Id = 1 }; - Assert.AreEqual("", relation.SerializeToXml()); + Assert.That(relation.SerializeToXml(), Is.EqualTo("")); relation = new Relation() { @@ -56,8 +56,7 @@ public void TestSerialize() UserName = "ben", UserId = 1 }; - Assert.AreEqual("", - relation.SerializeToXml()); + Assert.That(relation.SerializeToXml(), Is.EqualTo("")); relation = new Relation() { @@ -70,8 +69,7 @@ public void TestSerialize() new Tag("amenity", "something"), new Tag("key", "some_value")) }; - Assert.AreEqual("", - relation.SerializeToXml()); + Assert.That(relation.SerializeToXml(), Is.EqualTo("")); relation = new Relation() { @@ -90,8 +88,7 @@ public void TestSerialize() new RelationMember(100, "role3", OsmGeoType.Relation) } }; - Assert.AreEqual("", - relation.SerializeToXml()); + Assert.That(relation.SerializeToXml(), Is.EqualTo("")); } /// @@ -104,44 +101,44 @@ public void TestDeserialize() var relation = serializer.Deserialize( new StringReader("")) as Relation; - Assert.IsNotNull(relation); - Assert.AreEqual(1, relation.Id); + Assert.That(relation, Is.Not.Null); + Assert.That(relation.Id, Is.EqualTo(1)); relation = serializer.Deserialize( new StringReader("")) as Relation; - Assert.IsNotNull(relation); - Assert.AreEqual(1, relation.Id); - Assert.AreEqual("ben", relation.UserName); - Assert.AreEqual(1, relation.UserId); - Assert.AreEqual(1, relation.Version); + Assert.That(relation, Is.Not.Null); + Assert.That(relation.Id, Is.EqualTo(1)); + Assert.That(relation.UserName, Is.EqualTo("ben")); + Assert.That(relation.UserId, Is.EqualTo(1)); + Assert.That(relation.Version, Is.EqualTo(1)); relation = serializer.Deserialize( new StringReader("")) as Relation; - Assert.IsNotNull(relation); - Assert.AreEqual(1, relation.Id); - Assert.AreEqual("ben", relation.UserName); - Assert.AreEqual(1, relation.UserId); - Assert.AreEqual(1, relation.Version); - Assert.AreEqual(new System.DateTime(2008, 09, 12, 21, 37, 45), relation.TimeStamp.Value.ToUniversalTime()); - Assert.IsNotNull(relation.Tags); - Assert.IsTrue(relation.Tags.Contains("amenity", "something")); - Assert.IsTrue(relation.Tags.Contains("key", "some_value")); + Assert.That(relation, Is.Not.Null); + Assert.That(relation.Id, Is.EqualTo(1)); + Assert.That(relation.UserName, Is.EqualTo("ben")); + Assert.That(relation.UserId, Is.EqualTo(1)); + Assert.That(relation.Version, Is.EqualTo(1)); + Assert.That(relation.TimeStamp.Value.ToUniversalTime(), Is.EqualTo(new System.DateTime(2008, 09, 12, 21, 37, 45))); + Assert.That(relation.Tags, Is.Not.Null); + Assert.That(relation.Tags.Contains("amenity", "something"), Is.True); + Assert.That(relation.Tags.Contains("key", "some_value"), Is.True); relation = serializer.Deserialize( new StringReader("")) as Relation; - Assert.IsNotNull(relation); - Assert.AreEqual(1, relation.Id); - Assert.AreEqual("ben", relation.UserName); - Assert.AreEqual(1, relation.UserId); - Assert.AreEqual(1, relation.Version); - Assert.AreEqual(new System.DateTime(2008, 09, 12, 21, 37, 45), relation.TimeStamp.Value.ToUniversalTime()); - Assert.IsNotNull(relation.Tags); - Assert.IsTrue(relation.Tags.Contains("amenity", "something")); - Assert.IsTrue(relation.Tags.Contains("key", "some_value")); - Assert.IsNotNull(relation.Members); - Assert.IsTrue(relation.Members.Any(x => x.Id == 1 && x.Role == "role1" && x.Type == OsmGeoType.Node)); - Assert.IsTrue(relation.Members.Any(x => x.Id == 10 && x.Role == "role2" && x.Type == OsmGeoType.Way)); - Assert.IsTrue(relation.Members.Any(x => x.Id == 100 && x.Role == "role3" && x.Type == OsmGeoType.Relation)); + Assert.That(relation, Is.Not.Null); + Assert.That(relation.Id, Is.EqualTo(1)); + Assert.That(relation.UserName, Is.EqualTo("ben")); + Assert.That(relation.UserId, Is.EqualTo(1)); + Assert.That(relation.Version, Is.EqualTo(1)); + Assert.That(relation.TimeStamp.Value.ToUniversalTime(), Is.EqualTo(new System.DateTime(2008, 09, 12, 21, 37, 45))); + Assert.That(relation.Tags, Is.Not.Null); + Assert.That(relation.Tags.Contains("amenity", "something"), Is.True); + Assert.That(relation.Tags.Contains("key", "some_value"), Is.True); + Assert.That(relation.Members, Is.Not.Null); + Assert.That(relation.Members.Any(x => x.Id == 1 && x.Role == "role1" && x.Type == OsmGeoType.Node), Is.True); + Assert.That(relation.Members.Any(x => x.Id == 10 && x.Role == "role2" && x.Type == OsmGeoType.Way), Is.True); + Assert.That(relation.Members.Any(x => x.Id == 100 && x.Role == "role3" && x.Type == OsmGeoType.Relation), Is.True); } /// @@ -158,9 +155,9 @@ public void TestDeserializeMulti() "" + "")) as Osm; - Assert.IsNotNull(osm); - Assert.IsNotNull(osm.Relations); - Assert.AreEqual(2, osm.Relations.Length); + Assert.That(osm, Is.Not.Null); + Assert.That(osm.Relations, Is.Not.Null); + Assert.That(osm.Relations.Length, Is.EqualTo(2)); } } } \ No newline at end of file diff --git a/test/OsmSharp.Test/IO/Xml/WayTests.cs b/test/OsmSharp.Test/IO/Xml/WayTests.cs index ba1b4350..91189178 100755 --- a/test/OsmSharp.Test/IO/Xml/WayTests.cs +++ b/test/OsmSharp.Test/IO/Xml/WayTests.cs @@ -46,7 +46,7 @@ public void TestSerialize() Id = 1 }; - Assert.AreEqual("", way.SerializeToXml()); + Assert.That(way.SerializeToXml(), Is.EqualTo("")); way = new Way() { @@ -55,8 +55,7 @@ public void TestSerialize() UserName = "ben", UserId = 1 }; - Assert.AreEqual("", - way.SerializeToXml()); + Assert.That(way.SerializeToXml(), Is.EqualTo("")); way = new Way() { Id = 1, @@ -72,8 +71,7 @@ public void TestSerialize() 1, 2, 3 } }; - Assert.AreEqual("", - way.SerializeToXml()); + Assert.That(way.SerializeToXml(), Is.EqualTo("")); } /// @@ -86,45 +84,45 @@ public void TestDeserialize() var way = serializer.Deserialize( new StringReader("")) as Way; - Assert.IsNotNull(way); - Assert.AreEqual(1, way.Id); + Assert.That(way, Is.Not.Null); + Assert.That(way.Id, Is.EqualTo(1)); way = serializer.Deserialize( new StringReader("")) as Way; - Assert.IsNotNull(way); - Assert.AreEqual(1, way.Id); - Assert.AreEqual("ben", way.UserName); - Assert.AreEqual(1, way.UserId); - Assert.AreEqual(1, way.Version); + Assert.That(way, Is.Not.Null); + Assert.That(way.Id, Is.EqualTo(1)); + Assert.That(way.UserName, Is.EqualTo("ben")); + Assert.That(way.UserId, Is.EqualTo(1)); + Assert.That(way.Version, Is.EqualTo(1)); way = serializer.Deserialize( new StringReader("")) as Way; - Assert.IsNotNull(way); - Assert.AreEqual(1, way.Id); - Assert.AreEqual("ben", way.UserName); - Assert.AreEqual(1, way.UserId); - Assert.AreEqual(1, way.Version); - Assert.AreEqual(new System.DateTime(2008, 09, 12, 21, 37, 45), way.TimeStamp.Value.ToUniversalTime()); - Assert.IsNotNull(way.Tags); - Assert.IsTrue(way.Tags.Contains("amenity", "something")); - Assert.IsTrue(way.Tags.Contains("key", "some_value")); + Assert.That(way, Is.Not.Null); + Assert.That(way.Id, Is.EqualTo(1)); + Assert.That(way.UserName, Is.EqualTo("ben")); + Assert.That(way.UserId, Is.EqualTo(1)); + Assert.That(way.Version, Is.EqualTo(1)); + Assert.That(way.TimeStamp.Value.ToUniversalTime(), Is.EqualTo(new System.DateTime(2008, 09, 12, 21, 37, 45))); + Assert.That(way.Tags, Is.Not.Null); + Assert.That(way.Tags.Contains("amenity", "something"), Is.True); + Assert.That(way.Tags.Contains("key", "some_value"), Is.True); way = serializer.Deserialize( new StringReader("")) as Way; - Assert.IsNotNull(way); - Assert.AreEqual(1, way.Id); - Assert.AreEqual("ben", way.UserName); - Assert.AreEqual(1, way.UserId); - Assert.AreEqual(1, way.Version); - Assert.AreEqual(new System.DateTime(2008, 09, 12, 21, 37, 45), way.TimeStamp.Value.ToUniversalTime()); - Assert.IsNotNull(way.Tags); - Assert.IsTrue(way.Tags.Contains("amenity", "something")); - Assert.IsTrue(way.Tags.Contains("key", "some_value")); - Assert.IsNotNull(way.Nodes); - Assert.AreEqual(3, way.Nodes.Length); - Assert.AreEqual(1, way.Nodes[0]); - Assert.AreEqual(2, way.Nodes[1]); - Assert.AreEqual(3, way.Nodes[2]); + Assert.That(way, Is.Not.Null); + Assert.That(way.Id, Is.EqualTo(1)); + Assert.That(way.UserName, Is.EqualTo("ben")); + Assert.That(way.UserId, Is.EqualTo(1)); + Assert.That(way.Version, Is.EqualTo(1)); + Assert.That(way.TimeStamp.Value.ToUniversalTime(), Is.EqualTo(new System.DateTime(2008, 09, 12, 21, 37, 45))); + Assert.That(way.Tags, Is.Not.Null); + Assert.That(way.Tags.Contains("amenity", "something"), Is.True); + Assert.That(way.Tags.Contains("key", "some_value"), Is.True); + Assert.That(way.Nodes, Is.Not.Null); + Assert.That(way.Nodes.Length, Is.EqualTo(3)); + Assert.That(way.Nodes[0], Is.EqualTo(1)); + Assert.That(way.Nodes[1], Is.EqualTo(2)); + Assert.That(way.Nodes[2], Is.EqualTo(3)); } /// @@ -141,16 +139,16 @@ public void TestDeserializeMulti() "" + "")) as Osm; - Assert.IsNotNull(osm); - Assert.IsNotNull(osm.Ways); - Assert.AreEqual(2, osm.Ways.Length); + Assert.That(osm, Is.Not.Null); + Assert.That(osm.Ways, Is.Not.Null); + Assert.That(osm.Ways.Length, Is.EqualTo(2)); osm = serializer.Deserialize( new StringReader("")) as Osm; - Assert.IsNotNull(osm); - Assert.IsNotNull(osm.Ways); - Assert.AreEqual(3, osm.Ways.Length); + Assert.That(osm, Is.Not.Null); + Assert.That(osm.Ways, Is.Not.Null); + Assert.That(osm.Ways.Length, Is.EqualTo(3)); } } } \ No newline at end of file diff --git a/test/OsmSharp.Test/OsmSharp.Test.csproj b/test/OsmSharp.Test/OsmSharp.Test.csproj index d9a830ef..7cc0a436 100755 --- a/test/OsmSharp.Test/OsmSharp.Test.csproj +++ b/test/OsmSharp.Test/OsmSharp.Test.csproj @@ -1,21 +1,29 @@  - - net6.0 - OsmSharp.Test - - - - - - - - - - - - - - - - + + net462;net6.0;net8;net9 + latest + OsmSharp.Test + + + + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + \ No newline at end of file diff --git a/test/OsmSharp.Test/Stream/Filters/OsmStreamFilterApplyChangesetTests.cs b/test/OsmSharp.Test/Stream/Filters/OsmStreamFilterApplyChangesetTests.cs index 202b22a4..f14d8dd0 100755 --- a/test/OsmSharp.Test/Stream/Filters/OsmStreamFilterApplyChangesetTests.cs +++ b/test/OsmSharp.Test/Stream/Filters/OsmStreamFilterApplyChangesetTests.cs @@ -90,23 +90,23 @@ public void TestCreate() filter.RegisterSource(source); var result = new List(filter); - Assert.AreEqual(7, result.Count); - Assert.AreEqual(1, result[0].Id); - Assert.AreEqual(OsmGeoType.Node, result[0].Type); - Assert.AreEqual(2, result[1].Id); - Assert.AreEqual(OsmGeoType.Node, result[1].Type); - Assert.AreEqual(3, result[2].Id); - Assert.AreEqual(OsmGeoType.Node, result[2].Type); + Assert.That(result.Count, Is.EqualTo(7)); + Assert.That(result[0].Id, Is.EqualTo(1)); + Assert.That(result[0].Type, Is.EqualTo(OsmGeoType.Node)); + Assert.That(result[1].Id, Is.EqualTo(2)); + Assert.That(result[1].Type, Is.EqualTo(OsmGeoType.Node)); + Assert.That(result[2].Id, Is.EqualTo(3)); + Assert.That(result[2].Type, Is.EqualTo(OsmGeoType.Node)); - Assert.AreEqual(2, result[3].Id); - Assert.AreEqual(OsmGeoType.Way, result[3].Type); - Assert.AreEqual(3, result[4].Id); - Assert.AreEqual(OsmGeoType.Way, result[4].Type); + Assert.That(result[3].Id, Is.EqualTo(2)); + Assert.That(result[3].Type, Is.EqualTo(OsmGeoType.Way)); + Assert.That(result[4].Id, Is.EqualTo(3)); + Assert.That(result[4].Type, Is.EqualTo(OsmGeoType.Way)); - Assert.AreEqual(3, result[5].Id); - Assert.AreEqual(OsmGeoType.Relation, result[5].Type); - Assert.AreEqual(4, result[6].Id); - Assert.AreEqual(OsmGeoType.Relation, result[6].Type); + Assert.That(result[5].Id, Is.EqualTo(3)); + Assert.That(result[5].Type, Is.EqualTo(OsmGeoType.Relation)); + Assert.That(result[6].Id, Is.EqualTo(4)); + Assert.That(result[6].Type, Is.EqualTo(OsmGeoType.Relation)); } /// @@ -179,30 +179,30 @@ public void TestModify() filter.RegisterSource(source); var result = new List(filter); - Assert.AreEqual(7, result.Count); - Assert.AreEqual(1, result[0].Id); - Assert.AreEqual(1, result[0].Version); - Assert.AreEqual(OsmGeoType.Node, result[0].Type); - Assert.AreEqual(2, result[1].Id); - Assert.AreEqual(1, result[1].Version); - Assert.AreEqual(OsmGeoType.Node, result[1].Type); - Assert.AreEqual(3, result[2].Id); - Assert.AreEqual(2, result[2].Version); - Assert.AreEqual(OsmGeoType.Node, result[2].Type); + Assert.That(result.Count, Is.EqualTo(7)); + Assert.That(result[0].Id, Is.EqualTo(1)); + Assert.That(result[0].Version, Is.EqualTo(1)); + Assert.That(result[0].Type, Is.EqualTo(OsmGeoType.Node)); + Assert.That(result[1].Id, Is.EqualTo(2)); + Assert.That(result[1].Version, Is.EqualTo(1)); + Assert.That(result[1].Type, Is.EqualTo(OsmGeoType.Node)); + Assert.That(result[2].Id, Is.EqualTo(3)); + Assert.That(result[2].Version, Is.EqualTo(2)); + Assert.That(result[2].Type, Is.EqualTo(OsmGeoType.Node)); - Assert.AreEqual(2, result[3].Id); - Assert.AreEqual(2, result[3].Version); - Assert.AreEqual(OsmGeoType.Way, result[3].Type); - Assert.AreEqual(3, result[4].Id); - Assert.AreEqual(1, result[4].Version); - Assert.AreEqual(OsmGeoType.Way, result[4].Type); + Assert.That(result[3].Id, Is.EqualTo(2)); + Assert.That(result[3].Version, Is.EqualTo(2)); + Assert.That(result[3].Type, Is.EqualTo(OsmGeoType.Way)); + Assert.That(result[4].Id, Is.EqualTo(3)); + Assert.That(result[4].Version, Is.EqualTo(1)); + Assert.That(result[4].Type, Is.EqualTo(OsmGeoType.Way)); - Assert.AreEqual(3, result[5].Id); - Assert.AreEqual(1, result[5].Version); - Assert.AreEqual(OsmGeoType.Relation, result[5].Type); - Assert.AreEqual(4, result[6].Id); - Assert.AreEqual(2, result[6].Version); - Assert.AreEqual(OsmGeoType.Relation, result[6].Type); + Assert.That(result[5].Id, Is.EqualTo(3)); + Assert.That(result[5].Version, Is.EqualTo(1)); + Assert.That(result[5].Type, Is.EqualTo(OsmGeoType.Relation)); + Assert.That(result[6].Id, Is.EqualTo(4)); + Assert.That(result[6].Version, Is.EqualTo(2)); + Assert.That(result[6].Type, Is.EqualTo(OsmGeoType.Relation)); } /// @@ -275,21 +275,21 @@ public void TestDelete() filter.RegisterSource(source); var result = new List(filter); - Assert.AreEqual(4, result.Count); - Assert.AreEqual(1, result[0].Id); - Assert.AreEqual(1, result[0].Version); - Assert.AreEqual(OsmGeoType.Node, result[0].Type); - Assert.AreEqual(2, result[1].Id); - Assert.AreEqual(1, result[1].Version); - Assert.AreEqual(OsmGeoType.Node, result[1].Type); + Assert.That(result.Count, Is.EqualTo(4)); + Assert.That(result[0].Id, Is.EqualTo(1)); + Assert.That(result[0].Version, Is.EqualTo(1)); + Assert.That(result[0].Type, Is.EqualTo(OsmGeoType.Node)); + Assert.That(result[1].Id, Is.EqualTo(2)); + Assert.That(result[1].Version, Is.EqualTo(1)); + Assert.That(result[1].Type, Is.EqualTo(OsmGeoType.Node)); - Assert.AreEqual(3, result[2].Id); - Assert.AreEqual(1, result[2].Version); - Assert.AreEqual(OsmGeoType.Way, result[2].Type); + Assert.That(result[2].Id, Is.EqualTo(3)); + Assert.That(result[2].Version, Is.EqualTo(1)); + Assert.That(result[2].Type, Is.EqualTo(OsmGeoType.Way)); - Assert.AreEqual(3, result[3].Id); - Assert.AreEqual(1, result[3].Version); - Assert.AreEqual(OsmGeoType.Relation, result[3].Type); + Assert.That(result[3].Id, Is.EqualTo(3)); + Assert.That(result[3].Version, Is.EqualTo(1)); + Assert.That(result[3].Type, Is.EqualTo(OsmGeoType.Relation)); } } } \ No newline at end of file diff --git a/test/OsmSharp.Test/Stream/Filters/OsmStreamFilterMergeTests.cs b/test/OsmSharp.Test/Stream/Filters/OsmStreamFilterMergeTests.cs index f3b866b1..0f825d28 100755 --- a/test/OsmSharp.Test/Stream/Filters/OsmStreamFilterMergeTests.cs +++ b/test/OsmSharp.Test/Stream/Filters/OsmStreamFilterMergeTests.cs @@ -60,9 +60,9 @@ public void TestMergeNodes() merge.RegisterSource(stream2); var result = new List(merge); - Assert.AreEqual(2, result.Count); - Assert.AreEqual(1, result[0].Id); - Assert.AreEqual(2, result[1].Id); + Assert.That(result.Count, Is.EqualTo(2)); + Assert.That(result[0].Id, Is.EqualTo(1)); + Assert.That(result[1].Id, Is.EqualTo(2)); } /// @@ -91,9 +91,9 @@ public void TestMergeWays() merge.RegisterSource(stream2); var result = new List(merge); - Assert.AreEqual(2, result.Count); - Assert.AreEqual(1, result[0].Id); - Assert.AreEqual(2, result[1].Id); + Assert.That(result.Count, Is.EqualTo(2)); + Assert.That(result[0].Id, Is.EqualTo(1)); + Assert.That(result[1].Id, Is.EqualTo(2)); } /// @@ -122,9 +122,9 @@ public void TestMergeRelations() merge.RegisterSource(stream2); var result = new List(merge); - Assert.AreEqual(2, result.Count); - Assert.AreEqual(1, result[0].Id); - Assert.AreEqual(2, result[1].Id); + Assert.That(result.Count, Is.EqualTo(2)); + Assert.That(result[0].Id, Is.EqualTo(1)); + Assert.That(result[1].Id, Is.EqualTo(2)); } /// @@ -190,13 +190,13 @@ public void TestMergeOneEmpty() merge.RegisterSource(stream2); var result = new List(merge); - Assert.AreEqual(3, result.Count); - Assert.AreEqual(1, result[0].Id); - Assert.AreEqual(OsmGeoType.Node, result[0].Type); - Assert.AreEqual(1, result[1].Id); - Assert.AreEqual(OsmGeoType.Way, result[1].Type); - Assert.AreEqual(1, result[2].Id); - Assert.AreEqual(OsmGeoType.Relation, result[2].Type); + Assert.That(result.Count, Is.EqualTo(3)); + Assert.That(result[0].Id, Is.EqualTo(1)); + Assert.That(result[0].Type, Is.EqualTo(OsmGeoType.Node)); + Assert.That(result[1].Id, Is.EqualTo(1)); + Assert.That(result[1].Type, Is.EqualTo(OsmGeoType.Way)); + Assert.That(result[2].Id, Is.EqualTo(1)); + Assert.That(result[2].Type, Is.EqualTo(OsmGeoType.Relation)); } /// @@ -256,25 +256,25 @@ public void TestMergeConflict() merge.RegisterSource(stream2); var result = new List(merge); - Assert.AreEqual(6, result.Count); + Assert.That(result.Count, Is.EqualTo(6)); - Assert.AreEqual(1, result[0].Id); - Assert.AreEqual(1, result[0].Version); - Assert.AreEqual(OsmGeoType.Node, result[0].Type); - Assert.AreEqual(2, result[1].Id); - Assert.AreEqual(OsmGeoType.Node, result[1].Type); + Assert.That(result[0].Id, Is.EqualTo(1)); + Assert.That(result[0].Version, Is.EqualTo(1)); + Assert.That(result[0].Type, Is.EqualTo(OsmGeoType.Node)); + Assert.That(result[1].Id, Is.EqualTo(2)); + Assert.That(result[1].Type, Is.EqualTo(OsmGeoType.Node)); - Assert.AreEqual(1, result[2].Id); - Assert.AreEqual(1, result[2].Version); - Assert.AreEqual(OsmGeoType.Way, result[2].Type); - Assert.AreEqual(2, result[3].Id); - Assert.AreEqual(OsmGeoType.Way, result[3].Type); + Assert.That(result[2].Id, Is.EqualTo(1)); + Assert.That(result[2].Version, Is.EqualTo(1)); + Assert.That(result[2].Type, Is.EqualTo(OsmGeoType.Way)); + Assert.That(result[3].Id, Is.EqualTo(2)); + Assert.That(result[3].Type, Is.EqualTo(OsmGeoType.Way)); - Assert.AreEqual(1, result[4].Id); - Assert.AreEqual(1, result[4].Version); - Assert.AreEqual(OsmGeoType.Relation, result[4].Type); - Assert.AreEqual(2, result[5].Id); - Assert.AreEqual(OsmGeoType.Relation, result[5].Type); + Assert.That(result[4].Id, Is.EqualTo(1)); + Assert.That(result[4].Version, Is.EqualTo(1)); + Assert.That(result[4].Type, Is.EqualTo(OsmGeoType.Relation)); + Assert.That(result[5].Id, Is.EqualTo(2)); + Assert.That(result[5].Type, Is.EqualTo(OsmGeoType.Relation)); } } } \ No newline at end of file diff --git a/test/OsmSharp.Test/Stream/Filters/OsmStreamFilterNodeTests.cs b/test/OsmSharp.Test/Stream/Filters/OsmStreamFilterNodeTests.cs index 63cdefd8..3076465a 100755 --- a/test/OsmSharp.Test/Stream/Filters/OsmStreamFilterNodeTests.cs +++ b/test/OsmSharp.Test/Stream/Filters/OsmStreamFilterNodeTests.cs @@ -39,11 +39,11 @@ class OsmStreamFilterNodeTests public void TestNode() { var result = (new OsmGeo[] { new Node() { Id = 1 } }).FilterNodes(x => x.Id == 1).ToList(); - Assert.AreEqual(1, result.Count); - Assert.AreEqual(1, result[0].Id); + Assert.That(result.Count, Is.EqualTo(1)); + Assert.That(result[0].Id, Is.EqualTo(1)); result = (new OsmGeo[] { new Node() { Id = 1 } }).FilterNodes(x => x.Id == 2).ToList(); - Assert.AreEqual(0, result.Count); + Assert.That(result.Count, Is.EqualTo(0)); } /// @@ -58,11 +58,11 @@ public void TestWay() new Node() { Id = 2 }, new Way() { Id = 1, Nodes = new long[] { 1, 2 } } }).FilterNodes(x => x.Id == 1).ToList(); - Assert.AreEqual(2, result.Count); - Assert.AreEqual(OsmGeoType.Node, result[0].Type); - Assert.AreEqual(1, result[0].Id); - Assert.AreEqual(OsmGeoType.Way, result[1].Type); - Assert.AreEqual(1, result[1].Id); + Assert.That(result.Count, Is.EqualTo(2)); + Assert.That(result[0].Type, Is.EqualTo(OsmGeoType.Node)); + Assert.That(result[0].Id, Is.EqualTo(1)); + Assert.That(result[1].Type, Is.EqualTo(OsmGeoType.Way)); + Assert.That(result[1].Id, Is.EqualTo(1)); result = (new OsmGeo[] { @@ -70,11 +70,11 @@ public void TestWay() new Node() { Id = 2 }, new Way() { Id = 1, Nodes = new long[] { 1, 2 } } }).FilterNodes(x => x.Id == 2).ToList(); - Assert.AreEqual(2, result.Count); - Assert.AreEqual(OsmGeoType.Node, result[0].Type); - Assert.AreEqual(2, result[0].Id); - Assert.AreEqual(OsmGeoType.Way, result[1].Type); - Assert.AreEqual(1, result[1].Id); + Assert.That(result.Count, Is.EqualTo(2)); + Assert.That(result[0].Type, Is.EqualTo(OsmGeoType.Node)); + Assert.That(result[0].Id, Is.EqualTo(2)); + Assert.That(result[1].Type, Is.EqualTo(OsmGeoType.Way)); + Assert.That(result[1].Id, Is.EqualTo(1)); result = (new OsmGeo[] { @@ -82,7 +82,7 @@ public void TestWay() new Node() { Id = 2 }, new Way() { Id = 1, Nodes = new long[] { 1, 2 } } }).FilterNodes(x => x.Id == 3).ToList(); - Assert.AreEqual(0, result.Count); + Assert.That(result.Count, Is.EqualTo(0)); } } } \ No newline at end of file diff --git a/test/OsmSharp.Test/Stream/PBFOsmStreamSourceTests.cs b/test/OsmSharp.Test/Stream/PBFOsmStreamSourceTests.cs index a850a9dc..28bc233c 100755 --- a/test/OsmSharp.Test/Stream/PBFOsmStreamSourceTests.cs +++ b/test/OsmSharp.Test/Stream/PBFOsmStreamSourceTests.cs @@ -98,7 +98,7 @@ public void ReadRealPBF() wechel.AddRange(reader); } - Assert.AreEqual(13978, wechel.Count); + Assert.That(wechel.Count, Is.EqualTo(13978)); } } @@ -117,7 +117,7 @@ public void ReadRealPBFNonSeekable() wechel.AddRange(reader); } - Assert.AreEqual(13978, wechel.Count); + Assert.That(wechel.Count, Is.EqualTo(13978)); } } @@ -142,7 +142,7 @@ public void ReadRealPBFNotAtBeginning() wechel.AddRange(reader); } - Assert.AreEqual(13978, wechel.Count); + Assert.That(wechel.Count, Is.EqualTo(13978)); } /// @@ -166,7 +166,7 @@ public void ReadRealPBFNonSeekableNotAtBeginning() wechel.AddRange(reader); } - Assert.AreEqual(13978, wechel.Count); + Assert.That(wechel.Count, Is.EqualTo(13978)); } /// @@ -184,7 +184,7 @@ public void PBFOsmStreamSource_ShouldBeAbleToReadFromStreamWithPositionNotAvaila wechel.AddRange(reader); } - Assert.AreEqual(13978, wechel.Count); + Assert.That(wechel.Count, Is.EqualTo(13978)); } } } diff --git a/test/OsmSharp.Test/Stream/PBFOsmStreamTargetTests.cs b/test/OsmSharp.Test/Stream/PBFOsmStreamTargetTests.cs index a2ef4ca6..87dd7d28 100755 --- a/test/OsmSharp.Test/Stream/PBFOsmStreamTargetTests.cs +++ b/test/OsmSharp.Test/Stream/PBFOsmStreamTargetTests.cs @@ -50,7 +50,7 @@ public void TestWriteNode() Latitude = 1.1f, Longitude = 1.2f, ChangeSetId = 1092, - TimeStamp = DateTime.UnixEpoch, + TimeStamp = DateTimeHelpers.UnixEpoch(), UserId = 9034, Version = 12 }; @@ -68,19 +68,19 @@ public void TestWriteNode() stream.Seek(0, SeekOrigin.Begin); var resultObjects = new List(new PBFOsmStreamSource(stream)); - Assert.IsNotNull(resultObjects); - Assert.AreEqual(1, resultObjects.Count); + Assert.That(resultObjects, Is.Not.Null); + Assert.That(resultObjects.Count, Is.EqualTo(1)); - Assert.AreEqual(sourceObjects[0].Id, resultObjects[0].Id); - Assert.AreEqual(1092, resultObjects[0].ChangeSetId); - Assert.AreEqual(OsmSharp.IO.PBF.PBFExtensions.FromUnixTime(0), resultObjects[0].TimeStamp); - Assert.AreEqual(9034, resultObjects[0].UserId); - Assert.AreEqual(sourceObjects[0].UserName, resultObjects[0].UserName); - Assert.AreEqual(12, resultObjects[0].Version); + Assert.That(resultObjects[0].Id, Is.EqualTo(sourceObjects[0].Id)); + Assert.That(resultObjects[0].ChangeSetId, Is.EqualTo(1092)); + Assert.That(resultObjects[0].TimeStamp, Is.EqualTo(OsmSharp.IO.PBF.PBFExtensions.FromUnixTime(0))); + Assert.That(resultObjects[0].UserId, Is.EqualTo(9034)); + Assert.That(resultObjects[0].UserName, Is.EqualTo(sourceObjects[0].UserName)); + Assert.That(resultObjects[0].Version, Is.EqualTo(12)); var resultNode = resultObjects[0] as Node; - Assert.AreEqual(sourceNode.Latitude.Value, resultNode.Latitude.Value, .0001f); - Assert.AreEqual(sourceNode.Longitude.Value, resultNode.Longitude.Value, .0001f); + Assert.That(resultNode.Latitude.Value, Is.EqualTo(sourceNode.Latitude.Value).Within(.0001f)); + Assert.That(resultNode.Longitude.Value, Is.EqualTo(sourceNode.Longitude.Value).Within(.0001f)); } // build source stream. @@ -90,7 +90,7 @@ public void TestWriteNode() Latitude = 1.1f, Longitude = 1.2f, ChangeSetId = 1092, - TimeStamp = DateTime.UnixEpoch, + TimeStamp = DateTimeHelpers.UnixEpoch(), UserId = 9034, Version = 12 }; @@ -110,21 +110,21 @@ public void TestWriteNode() stream.Seek(0, SeekOrigin.Begin); var resultObjects = new List(new PBFOsmStreamSource(stream)); - Assert.IsNotNull(resultObjects); - Assert.AreEqual(1, resultObjects.Count); + Assert.That(resultObjects, Is.Not.Null); + Assert.That(resultObjects.Count, Is.EqualTo(1)); - Assert.AreEqual(sourceObjects[0].Id, resultObjects[0].Id); - Assert.AreEqual(1092, resultObjects[0].ChangeSetId); - Assert.AreEqual(OsmSharp.IO.PBF.PBFExtensions.FromUnixTime(0), resultObjects[0].TimeStamp); - Assert.AreEqual(9034, resultObjects[0].UserId); - Assert.AreEqual(string.Empty, resultObjects[0].UserName); - Assert.AreEqual(12, resultObjects[0].Version); - Assert.AreEqual(sourceObjects[0].Tags.Count, resultObjects[0].Tags.Count); - Assert.IsTrue(resultObjects[0].Tags.Contains(sourceObjects[0].Tags.First())); + Assert.That(resultObjects[0].Id, Is.EqualTo(sourceObjects[0].Id)); + Assert.That(resultObjects[0].ChangeSetId, Is.EqualTo(1092)); + Assert.That(resultObjects[0].TimeStamp, Is.EqualTo(OsmSharp.IO.PBF.PBFExtensions.FromUnixTime(0))); + Assert.That(resultObjects[0].UserId, Is.EqualTo(9034)); + Assert.That(resultObjects[0].UserName, Is.EqualTo(string.Empty)); + Assert.That(resultObjects[0].Version, Is.EqualTo(12)); + Assert.That(resultObjects[0].Tags.Count, Is.EqualTo(sourceObjects[0].Tags.Count)); + Assert.That(resultObjects[0].Tags.Contains(sourceObjects[0].Tags.First()), Is.True); var resultNode = resultObjects[0] as Node; - Assert.AreEqual(sourceNode.Latitude.Value, resultNode.Latitude.Value, .0001f); - Assert.AreEqual(sourceNode.Longitude.Value, resultNode.Longitude.Value, .0001f); + Assert.That(resultNode.Latitude.Value, Is.EqualTo(sourceNode.Latitude.Value).Within(.0001f)); + Assert.That(resultNode.Longitude.Value, Is.EqualTo(sourceNode.Longitude.Value).Within(.0001f)); } // build source stream. @@ -134,7 +134,7 @@ public void TestWriteNode() Latitude = 1.1f, Longitude = 1.2f, ChangeSetId = 1092, - TimeStamp = DateTime.UnixEpoch, + TimeStamp = DateTimeHelpers.UnixEpoch(), UserId = 9034, Version = 12 }; @@ -160,21 +160,21 @@ public void TestWriteNode() stream.Seek(0, SeekOrigin.Begin); var resultObjects = new List(new PBFOsmStreamSource(stream)); - Assert.IsNotNull(resultObjects); - Assert.AreEqual(1, resultObjects.Count); + Assert.That(resultObjects, Is.Not.Null); + Assert.That(resultObjects.Count, Is.EqualTo(1)); - Assert.AreEqual(sourceObjects[0].Id, resultObjects[0].Id); - Assert.AreEqual(sourceObjects[0].ChangeSetId, resultObjects[0].ChangeSetId); - Assert.AreEqual(sourceObjects[0].TimeStamp.Value.Ticks, resultObjects[0].TimeStamp.Value.Ticks, 10000000); - Assert.AreEqual(sourceObjects[0].UserId, resultObjects[0].UserId); - Assert.AreEqual(sourceObjects[0].UserName, resultObjects[0].UserName); - Assert.AreEqual(sourceObjects[0].Version, resultObjects[0].Version); - Assert.AreEqual(sourceObjects[0].Tags.Count, resultObjects[0].Tags.Count); - Assert.IsTrue(resultObjects[0].Tags.Contains(sourceObjects[0].Tags.First())); + Assert.That(resultObjects[0].Id, Is.EqualTo(sourceObjects[0].Id)); + Assert.That(resultObjects[0].ChangeSetId, Is.EqualTo(sourceObjects[0].ChangeSetId)); + Assert.That(resultObjects[0].TimeStamp.Value.Ticks, Is.EqualTo(sourceObjects[0].TimeStamp.Value.Ticks).Within(10000000)); + Assert.That(resultObjects[0].UserId, Is.EqualTo(sourceObjects[0].UserId)); + Assert.That(resultObjects[0].UserName, Is.EqualTo(sourceObjects[0].UserName)); + Assert.That(resultObjects[0].Version, Is.EqualTo(sourceObjects[0].Version)); + Assert.That(resultObjects[0].Tags.Count, Is.EqualTo(sourceObjects[0].Tags.Count)); + Assert.That(resultObjects[0].Tags.Contains(sourceObjects[0].Tags.First()), Is.True); var resultNode = resultObjects[0] as Node; - Assert.AreEqual(sourceNode.Latitude.Value, resultNode.Latitude.Value, .0001f); - Assert.AreEqual(sourceNode.Longitude.Value, resultNode.Longitude.Value, .0001f); + Assert.That(resultNode.Latitude.Value, Is.EqualTo(sourceNode.Latitude.Value).Within(.0001f)); + Assert.That(resultNode.Longitude.Value, Is.EqualTo(sourceNode.Longitude.Value).Within(.0001f)); } } @@ -204,20 +204,20 @@ public void TestWriteWay() stream.Seek(0, SeekOrigin.Begin); var resultObjects = new List(new PBFOsmStreamSource(stream)); - Assert.IsNotNull(resultObjects); - Assert.AreEqual(1, resultObjects.Count); + Assert.That(resultObjects, Is.Not.Null); + Assert.That(resultObjects.Count, Is.EqualTo(1)); - Assert.AreEqual(sourceObjects[0].Id, resultObjects[0].Id); - Assert.AreEqual(0, resultObjects[0].ChangeSetId); - Assert.AreEqual(OsmSharp.IO.PBF.PBFExtensions.FromUnixTime(0), resultObjects[0].TimeStamp); - Assert.AreEqual(0, resultObjects[0].UserId); - Assert.AreEqual(sourceObjects[0].UserName, resultObjects[0].UserName); - Assert.AreEqual(0, resultObjects[0].Version); + Assert.That(resultObjects[0].Id, Is.EqualTo(sourceObjects[0].Id)); + Assert.That(resultObjects[0].ChangeSetId, Is.EqualTo(0)); + Assert.That(resultObjects[0].TimeStamp, Is.EqualTo(OsmSharp.IO.PBF.PBFExtensions.FromUnixTime(0))); + Assert.That(resultObjects[0].UserId, Is.EqualTo(0)); + Assert.That(resultObjects[0].UserName, Is.EqualTo(sourceObjects[0].UserName)); + Assert.That(resultObjects[0].Version, Is.EqualTo(0)); var resultWay = resultObjects[0] as Way; - Assert.AreEqual(sourceWay.Nodes.Length, resultWay.Nodes.Length); - Assert.AreEqual(sourceWay.Nodes[0], resultWay.Nodes[0]); - Assert.AreEqual(sourceWay.Nodes[1], resultWay.Nodes[1]); + Assert.That(resultWay.Nodes.Length, Is.EqualTo(sourceWay.Nodes.Length)); + Assert.That(resultWay.Nodes[0], Is.EqualTo(sourceWay.Nodes[0])); + Assert.That(resultWay.Nodes[1], Is.EqualTo(sourceWay.Nodes[1])); } // build source stream. @@ -242,22 +242,22 @@ public void TestWriteWay() stream.Seek(0, SeekOrigin.Begin); var resultObjects = new List(new PBFOsmStreamSource(stream)); - Assert.IsNotNull(resultObjects); - Assert.AreEqual(1, resultObjects.Count); + Assert.That(resultObjects, Is.Not.Null); + Assert.That(resultObjects.Count, Is.EqualTo(1)); - Assert.AreEqual(sourceObjects[0].Id, resultObjects[0].Id); - Assert.AreEqual(0, resultObjects[0].ChangeSetId); - Assert.AreEqual(OsmSharp.IO.PBF.PBFExtensions.FromUnixTime(0), resultObjects[0].TimeStamp); - Assert.AreEqual(0, resultObjects[0].UserId); - Assert.AreEqual(string.Empty, resultObjects[0].UserName); - Assert.AreEqual(0, resultObjects[0].Version); - Assert.AreEqual(sourceObjects[0].Tags.Count, resultObjects[0].Tags.Count); - Assert.IsTrue(resultObjects[0].Tags.Contains(sourceObjects[0].Tags.First())); + Assert.That(resultObjects[0].Id, Is.EqualTo(sourceObjects[0].Id)); + Assert.That(resultObjects[0].ChangeSetId, Is.EqualTo(0)); + Assert.That(resultObjects[0].TimeStamp, Is.EqualTo(OsmSharp.IO.PBF.PBFExtensions.FromUnixTime(0))); + Assert.That(resultObjects[0].UserId, Is.EqualTo(0)); + Assert.That(resultObjects[0].UserName, Is.EqualTo(string.Empty)); + Assert.That(resultObjects[0].Version, Is.EqualTo(0)); + Assert.That(resultObjects[0].Tags.Count, Is.EqualTo(sourceObjects[0].Tags.Count)); + Assert.That(resultObjects[0].Tags.Contains(sourceObjects[0].Tags.First()), Is.True); var resultWay = resultObjects[0] as Way; - Assert.AreEqual(sourceWay.Nodes.Length, resultWay.Nodes.Length); - Assert.AreEqual(sourceWay.Nodes[0], resultWay.Nodes[0]); - Assert.AreEqual(sourceWay.Nodes[1], resultWay.Nodes[1]); + Assert.That(resultWay.Nodes.Length, Is.EqualTo(sourceWay.Nodes.Length)); + Assert.That(resultWay.Nodes[0], Is.EqualTo(sourceWay.Nodes[0])); + Assert.That(resultWay.Nodes[1], Is.EqualTo(sourceWay.Nodes[1])); } // build source stream. @@ -288,22 +288,22 @@ public void TestWriteWay() stream.Seek(0, SeekOrigin.Begin); var resultObjects = new List(new PBFOsmStreamSource(stream)); - Assert.IsNotNull(resultObjects); - Assert.AreEqual(1, resultObjects.Count); + Assert.That(resultObjects, Is.Not.Null); + Assert.That(resultObjects.Count, Is.EqualTo(1)); - Assert.AreEqual(sourceObjects[0].Id, resultObjects[0].Id); - Assert.AreEqual(sourceObjects[0].ChangeSetId, resultObjects[0].ChangeSetId); - Assert.AreEqual(sourceObjects[0].TimeStamp.Value.Ticks, resultObjects[0].TimeStamp.Value.Ticks, 10000000); - Assert.AreEqual(sourceObjects[0].UserId, resultObjects[0].UserId); - Assert.AreEqual(sourceObjects[0].UserName, resultObjects[0].UserName); - Assert.AreEqual(sourceObjects[0].Version, resultObjects[0].Version); - Assert.AreEqual(sourceObjects[0].Tags.Count, resultObjects[0].Tags.Count); - Assert.IsTrue(resultObjects[0].Tags.Contains(sourceObjects[0].Tags.First())); + Assert.That(resultObjects[0].Id, Is.EqualTo(sourceObjects[0].Id)); + Assert.That(resultObjects[0].ChangeSetId, Is.EqualTo(sourceObjects[0].ChangeSetId)); + Assert.That(resultObjects[0].TimeStamp.Value.Ticks, Is.EqualTo(sourceObjects[0].TimeStamp.Value.Ticks).Within(10000000)); + Assert.That(resultObjects[0].UserId, Is.EqualTo(sourceObjects[0].UserId)); + Assert.That(resultObjects[0].UserName, Is.EqualTo(sourceObjects[0].UserName)); + Assert.That(resultObjects[0].Version, Is.EqualTo(sourceObjects[0].Version)); + Assert.That(resultObjects[0].Tags.Count, Is.EqualTo(sourceObjects[0].Tags.Count)); + Assert.That(resultObjects[0].Tags.Contains(sourceObjects[0].Tags.First()), Is.True); var resultWay = resultObjects[0] as Way; - Assert.AreEqual(sourceWay.Nodes.Length, resultWay.Nodes.Length); - Assert.AreEqual(sourceWay.Nodes[0], resultWay.Nodes[0]); - Assert.AreEqual(sourceWay.Nodes[1], resultWay.Nodes[1]); + Assert.That(resultWay.Nodes.Length, Is.EqualTo(sourceWay.Nodes.Length)); + Assert.That(resultWay.Nodes[0], Is.EqualTo(sourceWay.Nodes[0])); + Assert.That(resultWay.Nodes[1], Is.EqualTo(sourceWay.Nodes[1])); } } @@ -347,24 +347,24 @@ public void TestWriteRelation() stream.Seek(0, SeekOrigin.Begin); var resultObjects = new List(new PBFOsmStreamSource(stream)); - Assert.IsNotNull(resultObjects); - Assert.AreEqual(1, resultObjects.Count); + Assert.That(resultObjects, Is.Not.Null); + Assert.That(resultObjects.Count, Is.EqualTo(1)); - Assert.AreEqual(sourceObjects[0].Id, resultObjects[0].Id); - Assert.AreEqual(0, resultObjects[0].ChangeSetId); - Assert.AreEqual(OsmSharp.IO.PBF.PBFExtensions.FromUnixTime(0), resultObjects[0].TimeStamp); - Assert.AreEqual(0, resultObjects[0].UserId); - Assert.AreEqual(string.Empty, resultObjects[0].UserName); - Assert.AreEqual(0, resultObjects[0].Version); + Assert.That(resultObjects[0].Id, Is.EqualTo(sourceObjects[0].Id)); + Assert.That(resultObjects[0].ChangeSetId, Is.EqualTo(0)); + Assert.That(resultObjects[0].TimeStamp, Is.EqualTo(OsmSharp.IO.PBF.PBFExtensions.FromUnixTime(0))); + Assert.That(resultObjects[0].UserId, Is.EqualTo(0)); + Assert.That(resultObjects[0].UserName, Is.EqualTo(string.Empty)); + Assert.That(resultObjects[0].Version, Is.EqualTo(0)); var resultRelation = resultObjects[0] as Relation; - Assert.AreEqual(sourceRelation.Members.Length, resultRelation.Members.Length); - Assert.AreEqual(sourceRelation.Members[0].Id, resultRelation.Members[0].Id); - Assert.AreEqual(sourceRelation.Members[0].Role, resultRelation.Members[0].Role); - Assert.AreEqual(sourceRelation.Members[0].Type, resultRelation.Members[0].Type); - Assert.AreEqual(sourceRelation.Members[1].Id, resultRelation.Members[1].Id); - Assert.AreEqual(sourceRelation.Members[1].Role, resultRelation.Members[1].Role); - Assert.AreEqual(sourceRelation.Members[1].Type, resultRelation.Members[1].Type); + Assert.That(resultRelation.Members.Length, Is.EqualTo(sourceRelation.Members.Length)); + Assert.That(resultRelation.Members[0].Id, Is.EqualTo(sourceRelation.Members[0].Id)); + Assert.That(resultRelation.Members[0].Role, Is.EqualTo(sourceRelation.Members[0].Role)); + Assert.That(resultRelation.Members[0].Type, Is.EqualTo(sourceRelation.Members[0].Type)); + Assert.That(resultRelation.Members[1].Id, Is.EqualTo(sourceRelation.Members[1].Id)); + Assert.That(resultRelation.Members[1].Role, Is.EqualTo(sourceRelation.Members[1].Role)); + Assert.That(resultRelation.Members[1].Type, Is.EqualTo(sourceRelation.Members[1].Type)); } // build source stream. @@ -403,26 +403,26 @@ public void TestWriteRelation() stream.Seek(0, SeekOrigin.Begin); var resultObjects = new List(new PBFOsmStreamSource(stream)); - Assert.IsNotNull(resultObjects); - Assert.AreEqual(1, resultObjects.Count); + Assert.That(resultObjects, Is.Not.Null); + Assert.That(resultObjects.Count, Is.EqualTo(1)); - Assert.AreEqual(sourceObjects[0].Id, resultObjects[0].Id); - Assert.AreEqual(0, resultObjects[0].ChangeSetId); - Assert.AreEqual(OsmSharp.IO.PBF.PBFExtensions.FromUnixTime(0), resultObjects[0].TimeStamp); - Assert.AreEqual(0, resultObjects[0].UserId); - Assert.AreEqual(string.Empty, resultObjects[0].UserName); - Assert.AreEqual(0, resultObjects[0].Version); - Assert.AreEqual(sourceObjects[0].Tags.Count, resultObjects[0].Tags.Count); - Assert.IsTrue(resultObjects[0].Tags.Contains(sourceObjects[0].Tags.First())); + Assert.That(resultObjects[0].Id, Is.EqualTo(sourceObjects[0].Id)); + Assert.That(resultObjects[0].ChangeSetId, Is.EqualTo(0)); + Assert.That(resultObjects[0].TimeStamp, Is.EqualTo(OsmSharp.IO.PBF.PBFExtensions.FromUnixTime(0))); + Assert.That(resultObjects[0].UserId, Is.EqualTo(0)); + Assert.That(resultObjects[0].UserName, Is.EqualTo(string.Empty)); + Assert.That(resultObjects[0].Version, Is.EqualTo(0)); + Assert.That(resultObjects[0].Tags.Count, Is.EqualTo(sourceObjects[0].Tags.Count)); + Assert.That(resultObjects[0].Tags.Contains(sourceObjects[0].Tags.First()), Is.True); var resultRelation = resultObjects[0] as Relation; - Assert.AreEqual(sourceRelation.Members.Length, resultRelation.Members.Length); - Assert.AreEqual(sourceRelation.Members[0].Id, resultRelation.Members[0].Id); - Assert.AreEqual(sourceRelation.Members[0].Role, resultRelation.Members[0].Role); - Assert.AreEqual(sourceRelation.Members[0].Type, resultRelation.Members[0].Type); - Assert.AreEqual(sourceRelation.Members[1].Id, resultRelation.Members[1].Id); - Assert.AreEqual(sourceRelation.Members[1].Role, resultRelation.Members[1].Role); - Assert.AreEqual(sourceRelation.Members[1].Type, resultRelation.Members[1].Type); + Assert.That(resultRelation.Members.Length, Is.EqualTo(sourceRelation.Members.Length)); + Assert.That(resultRelation.Members[0].Id, Is.EqualTo(sourceRelation.Members[0].Id)); + Assert.That(resultRelation.Members[0].Role, Is.EqualTo(sourceRelation.Members[0].Role)); + Assert.That(resultRelation.Members[0].Type, Is.EqualTo(sourceRelation.Members[0].Type)); + Assert.That(resultRelation.Members[1].Id, Is.EqualTo(sourceRelation.Members[1].Id)); + Assert.That(resultRelation.Members[1].Role, Is.EqualTo(sourceRelation.Members[1].Role)); + Assert.That(resultRelation.Members[1].Type, Is.EqualTo(sourceRelation.Members[1].Type)); } // build source stream. @@ -467,26 +467,26 @@ public void TestWriteRelation() stream.Seek(0, SeekOrigin.Begin); var resultObjects = new List(new PBFOsmStreamSource(stream)); - Assert.IsNotNull(resultObjects); - Assert.AreEqual(1, resultObjects.Count); + Assert.That(resultObjects, Is.Not.Null); + Assert.That(resultObjects.Count, Is.EqualTo(1)); - Assert.AreEqual(sourceObjects[0].Id, resultObjects[0].Id); - Assert.AreEqual(sourceObjects[0].ChangeSetId, resultObjects[0].ChangeSetId); - Assert.AreEqual(sourceObjects[0].TimeStamp.Value.Ticks, resultObjects[0].TimeStamp.Value.Ticks, 10000000); - Assert.AreEqual(sourceObjects[0].UserId, resultObjects[0].UserId); - Assert.AreEqual(sourceObjects[0].UserName, resultObjects[0].UserName); - Assert.AreEqual(sourceObjects[0].Version, resultObjects[0].Version); - Assert.AreEqual(sourceObjects[0].Tags.Count, resultObjects[0].Tags.Count); - Assert.IsTrue(resultObjects[0].Tags.Contains(sourceObjects[0].Tags.First())); + Assert.That(resultObjects[0].Id, Is.EqualTo(sourceObjects[0].Id)); + Assert.That(resultObjects[0].ChangeSetId, Is.EqualTo(sourceObjects[0].ChangeSetId)); + Assert.That(resultObjects[0].TimeStamp.Value.Ticks, Is.EqualTo(sourceObjects[0].TimeStamp.Value.Ticks).Within(10000000)); + Assert.That(resultObjects[0].UserId, Is.EqualTo(sourceObjects[0].UserId)); + Assert.That(resultObjects[0].UserName, Is.EqualTo(sourceObjects[0].UserName)); + Assert.That(resultObjects[0].Version, Is.EqualTo(sourceObjects[0].Version)); + Assert.That(resultObjects[0].Tags.Count, Is.EqualTo(sourceObjects[0].Tags.Count)); + Assert.That(resultObjects[0].Tags.Contains(sourceObjects[0].Tags.First()), Is.True); var resultRelation = resultObjects[0] as Relation; - Assert.AreEqual(sourceRelation.Members.Length, resultRelation.Members.Length); - Assert.AreEqual(sourceRelation.Members[0].Id, resultRelation.Members[0].Id); - Assert.AreEqual(sourceRelation.Members[0].Role, resultRelation.Members[0].Role); - Assert.AreEqual(sourceRelation.Members[0].Type, resultRelation.Members[0].Type); - Assert.AreEqual(sourceRelation.Members[1].Id, resultRelation.Members[1].Id); - Assert.AreEqual(sourceRelation.Members[1].Role, resultRelation.Members[1].Role); - Assert.AreEqual(sourceRelation.Members[1].Type, resultRelation.Members[1].Type); + Assert.That(resultRelation.Members.Length, Is.EqualTo(sourceRelation.Members.Length)); + Assert.That(resultRelation.Members[0].Id, Is.EqualTo(sourceRelation.Members[0].Id)); + Assert.That(resultRelation.Members[0].Role, Is.EqualTo(sourceRelation.Members[0].Role)); + Assert.That(resultRelation.Members[0].Type, Is.EqualTo(sourceRelation.Members[0].Type)); + Assert.That(resultRelation.Members[1].Id, Is.EqualTo(sourceRelation.Members[1].Id)); + Assert.That(resultRelation.Members[1].Role, Is.EqualTo(sourceRelation.Members[1].Role)); + Assert.That(resultRelation.Members[1].Type, Is.EqualTo(sourceRelation.Members[1].Type)); } } @@ -569,53 +569,53 @@ public void TestWriteMix() stream.Seek(0, SeekOrigin.Begin); var resultObjects = new List(new PBFOsmStreamSource(stream)); - Assert.IsNotNull(resultObjects); - Assert.AreEqual(3, resultObjects.Count); + Assert.That(resultObjects, Is.Not.Null); + Assert.That(resultObjects.Count, Is.EqualTo(3)); - Assert.AreEqual(sourceObjects[0].Id, resultObjects[0].Id); - Assert.AreEqual(sourceObjects[0].ChangeSetId, resultObjects[0].ChangeSetId); - Assert.AreEqual(sourceObjects[0].TimeStamp.Value.Ticks, resultObjects[0].TimeStamp.Value.Ticks, 10000000); - Assert.AreEqual(sourceObjects[0].UserId, resultObjects[0].UserId); - Assert.AreEqual(sourceObjects[0].UserName, resultObjects[0].UserName); - Assert.AreEqual(sourceObjects[0].Version, resultObjects[0].Version); - Assert.AreEqual(sourceObjects[0].Tags.Count, resultObjects[0].Tags.Count); - Assert.IsTrue(resultObjects[0].Tags.Contains(sourceObjects[0].Tags.First())); + Assert.That(resultObjects[0].Id, Is.EqualTo(sourceObjects[0].Id)); + Assert.That(resultObjects[0].ChangeSetId, Is.EqualTo(sourceObjects[0].ChangeSetId)); + Assert.That(resultObjects[0].TimeStamp.Value.Ticks, Is.EqualTo(sourceObjects[0].TimeStamp.Value.Ticks).Within(10000000)); + Assert.That(resultObjects[0].UserId, Is.EqualTo(sourceObjects[0].UserId)); + Assert.That(resultObjects[0].UserName, Is.EqualTo(sourceObjects[0].UserName)); + Assert.That(resultObjects[0].Version, Is.EqualTo(sourceObjects[0].Version)); + Assert.That(resultObjects[0].Tags.Count, Is.EqualTo(sourceObjects[0].Tags.Count)); + Assert.That(resultObjects[0].Tags.Contains(sourceObjects[0].Tags.First()), Is.True); var resultNode = resultObjects[0] as Node; - Assert.AreEqual(sourceNode.Latitude.Value, resultNode.Latitude.Value, .0001f); - Assert.AreEqual(sourceNode.Longitude.Value, resultNode.Longitude.Value, .0001f); - - Assert.AreEqual(sourceObjects[1].Id, resultObjects[1].Id); - Assert.AreEqual(sourceObjects[1].ChangeSetId, resultObjects[1].ChangeSetId); - Assert.AreEqual(sourceObjects[1].TimeStamp.Value.Ticks, resultObjects[1].TimeStamp.Value.Ticks, 10000000); - Assert.AreEqual(sourceObjects[1].UserId, resultObjects[1].UserId); - Assert.AreEqual(sourceObjects[1].UserName, resultObjects[1].UserName); - Assert.AreEqual(sourceObjects[1].Version, resultObjects[1].Version); - Assert.AreEqual(sourceObjects[1].Tags.Count, resultObjects[1].Tags.Count); - Assert.IsTrue(resultObjects[1].Tags.Contains(sourceObjects[1].Tags.First())); + Assert.That(resultNode.Latitude.Value, Is.EqualTo(sourceNode.Latitude.Value).Within(.0001f)); + Assert.That(resultNode.Longitude.Value, Is.EqualTo(sourceNode.Longitude.Value).Within(.0001f)); + + Assert.That(resultObjects[1].Id, Is.EqualTo(sourceObjects[1].Id)); + Assert.That(resultObjects[1].ChangeSetId, Is.EqualTo(sourceObjects[1].ChangeSetId)); + Assert.That(resultObjects[1].TimeStamp.Value.Ticks, Is.EqualTo(sourceObjects[1].TimeStamp.Value.Ticks).Within(10000000)); + Assert.That(resultObjects[1].UserId, Is.EqualTo(sourceObjects[1].UserId)); + Assert.That(resultObjects[1].UserName, Is.EqualTo(sourceObjects[1].UserName)); + Assert.That(resultObjects[1].Version, Is.EqualTo(sourceObjects[1].Version)); + Assert.That(resultObjects[1].Tags.Count, Is.EqualTo(sourceObjects[1].Tags.Count)); + Assert.That(resultObjects[1].Tags.Contains(sourceObjects[1].Tags.First()), Is.True); var resultWay = resultObjects[1] as Way; - Assert.AreEqual(sourceWay.Nodes.Length, resultWay.Nodes.Length); - Assert.AreEqual(sourceWay.Nodes[0], resultWay.Nodes[0]); - Assert.AreEqual(sourceWay.Nodes[1], resultWay.Nodes[1]); - - Assert.AreEqual(sourceObjects[2].Id, resultObjects[2].Id); - Assert.AreEqual(sourceObjects[2].ChangeSetId, resultObjects[2].ChangeSetId); - Assert.AreEqual(sourceObjects[2].TimeStamp.Value.Ticks, resultObjects[2].TimeStamp.Value.Ticks, 10000000); - Assert.AreEqual(sourceObjects[2].UserId, resultObjects[2].UserId); - Assert.AreEqual(sourceObjects[2].UserName, resultObjects[2].UserName); - Assert.AreEqual(sourceObjects[2].Version, resultObjects[2].Version); - Assert.AreEqual(sourceObjects[2].Tags.Count, resultObjects[2].Tags.Count); - Assert.IsTrue(resultObjects[2].Tags.Contains(sourceObjects[2].Tags.First())); + Assert.That(resultWay.Nodes.Length, Is.EqualTo(sourceWay.Nodes.Length)); + Assert.That(resultWay.Nodes[0], Is.EqualTo(sourceWay.Nodes[0])); + Assert.That(resultWay.Nodes[1], Is.EqualTo(sourceWay.Nodes[1])); + + Assert.That(resultObjects[2].Id, Is.EqualTo(sourceObjects[2].Id)); + Assert.That(resultObjects[2].ChangeSetId, Is.EqualTo(sourceObjects[2].ChangeSetId)); + Assert.That(resultObjects[2].TimeStamp.Value.Ticks, Is.EqualTo(sourceObjects[2].TimeStamp.Value.Ticks).Within(10000000)); + Assert.That(resultObjects[2].UserId, Is.EqualTo(sourceObjects[2].UserId)); + Assert.That(resultObjects[2].UserName, Is.EqualTo(sourceObjects[2].UserName)); + Assert.That(resultObjects[2].Version, Is.EqualTo(sourceObjects[2].Version)); + Assert.That(resultObjects[2].Tags.Count, Is.EqualTo(sourceObjects[2].Tags.Count)); + Assert.That(resultObjects[2].Tags.Contains(sourceObjects[2].Tags.First()), Is.True); var resultRelation = resultObjects[2] as Relation; - Assert.AreEqual(sourceRelation.Members.Length, resultRelation.Members.Length); - Assert.AreEqual(sourceRelation.Members[0].Id, resultRelation.Members[0].Id); - Assert.AreEqual(sourceRelation.Members[0].Role, resultRelation.Members[0].Role); - Assert.AreEqual(sourceRelation.Members[0].Type, resultRelation.Members[0].Type); - Assert.AreEqual(sourceRelation.Members[1].Id, resultRelation.Members[1].Id); - Assert.AreEqual(sourceRelation.Members[1].Role, resultRelation.Members[1].Role); - Assert.AreEqual(sourceRelation.Members[1].Type, resultRelation.Members[1].Type); + Assert.That(resultRelation.Members.Length, Is.EqualTo(sourceRelation.Members.Length)); + Assert.That(resultRelation.Members[0].Id, Is.EqualTo(sourceRelation.Members[0].Id)); + Assert.That(resultRelation.Members[0].Role, Is.EqualTo(sourceRelation.Members[0].Role)); + Assert.That(resultRelation.Members[0].Type, Is.EqualTo(sourceRelation.Members[0].Type)); + Assert.That(resultRelation.Members[1].Id, Is.EqualTo(sourceRelation.Members[1].Id)); + Assert.That(resultRelation.Members[1].Role, Is.EqualTo(sourceRelation.Members[1].Role)); + Assert.That(resultRelation.Members[1].Type, Is.EqualTo(sourceRelation.Members[1].Type)); } } @@ -633,7 +633,7 @@ public void TestReadWriteCompressedRead_ShouldSucceed() target.Pull(); memoryStream.Seek(0, 0); - Assert.AreEqual(1715, new PBFOsmStreamSource(memoryStream).Count(n => n is Node)); + Assert.That(new PBFOsmStreamSource(memoryStream).Count(n => n is Node), Is.EqualTo(1715)); } } } diff --git a/test/OsmSharp.Test/Stream/XmlOsmStreamSourceTests.cs b/test/OsmSharp.Test/Stream/XmlOsmStreamSourceTests.cs index 7dedea10..58a1fe12 100755 --- a/test/OsmSharp.Test/Stream/XmlOsmStreamSourceTests.cs +++ b/test/OsmSharp.Test/Stream/XmlOsmStreamSourceTests.cs @@ -50,24 +50,24 @@ public void TestReadNode() var result = new List(source); // check results. - Assert.IsNotNull(result); - Assert.AreEqual(1, result.Count); - Assert.IsInstanceOf(result[0]); + Assert.That(result, Is.Not.Null); + Assert.That(result.Count, Is.EqualTo(1)); + Assert.That(result[0], Is.InstanceOf()); var node = result[0] as Node; - Assert.AreEqual(471625991, node.Id); - Assert.AreEqual(51.2704712, node.Latitude); - Assert.AreEqual(4.8006659, node.Longitude); - Assert.AreEqual("marc12", node.UserName); - Assert.AreEqual(540527, node.UserId); - Assert.AreEqual(true, node.Visible); - Assert.AreEqual(3, node.Version); - Assert.AreEqual(9797840, node.ChangeSetId); - Assert.AreEqual(new DateTime(2011, 11, 11, 16, 43, 47), node.TimeStamp.Value.ToUniversalTime()); - Assert.IsNotNull(node.Tags); - Assert.AreEqual(3, node.Tags.Count); - Assert.IsTrue(node.Tags.Contains("alt_name", "Lille")); - Assert.IsTrue(node.Tags.Contains("name", "Wechelderzande")); - Assert.IsTrue(node.Tags.Contains("traffic_sign", "city_limit")); + Assert.That(node.Id, Is.EqualTo(471625991)); + Assert.That(node.Latitude, Is.EqualTo(51.2704712)); + Assert.That(node.Longitude, Is.EqualTo(4.8006659)); + Assert.That(node.UserName, Is.EqualTo("marc12")); + Assert.That(node.UserId, Is.EqualTo(540527)); + Assert.That(node.Visible, Is.EqualTo(true)); + Assert.That(node.Version, Is.EqualTo(3)); + Assert.That(node.ChangeSetId, Is.EqualTo(9797840)); + Assert.That(node.TimeStamp.Value.ToUniversalTime(), Is.EqualTo(new DateTime(2011, 11, 11, 16, 43, 47))); + Assert.That(node.Tags, Is.Not.Null); + Assert.That(node.Tags.Count, Is.EqualTo(3)); + Assert.That(node.Tags.Contains("alt_name", "Lille"), Is.True); + Assert.That(node.Tags.Contains("name", "Wechelderzande"), Is.True); + Assert.That(node.Tags.Contains("traffic_sign", "city_limit"), Is.True); } /// @@ -85,27 +85,27 @@ public void TestReadWay() var result = new List(source); // check results. - Assert.IsNotNull(result); - Assert.AreEqual(1, result.Count); - Assert.IsInstanceOf(result[0]); + Assert.That(result, Is.Not.Null); + Assert.That(result.Count, Is.EqualTo(1)); + Assert.That(result[0], Is.InstanceOf()); var way = result[0] as Way; - Assert.AreEqual(88310427, way.Id); - Assert.AreEqual("Ben Abelshausen", way.UserName); - Assert.AreEqual(137772, way.UserId); - Assert.AreEqual(true, way.Visible); - Assert.AreEqual(1, way.Version); - Assert.AreEqual(6570367, way.ChangeSetId); - Assert.AreEqual(new DateTime(2010, 12, 06, 23, 58, 37), way.TimeStamp.Value.ToUniversalTime()); - Assert.IsNotNull(way.Tags); - Assert.AreEqual(1, way.Tags.Count); - Assert.IsTrue(way.Tags.Contains("building", "yes")); - Assert.IsNotNull(way.Nodes); - Assert.AreEqual(5, way.Nodes.Length); - Assert.AreEqual(1025709357, way.Nodes[0]); - Assert.AreEqual(1025709360, way.Nodes[1]); - Assert.AreEqual(1025709358, way.Nodes[2]); - Assert.AreEqual(1025709344, way.Nodes[3]); - Assert.AreEqual(1025709357, way.Nodes[4]); + Assert.That(way.Id, Is.EqualTo(88310427)); + Assert.That(way.UserName, Is.EqualTo("Ben Abelshausen")); + Assert.That(way.UserId, Is.EqualTo(137772)); + Assert.That(way.Visible, Is.EqualTo(true)); + Assert.That(way.Version, Is.EqualTo(1)); + Assert.That(way.ChangeSetId, Is.EqualTo(6570367)); + Assert.That(way.TimeStamp.Value.ToUniversalTime(), Is.EqualTo(new DateTime(2010, 12, 06, 23, 58, 37))); + Assert.That(way.Tags, Is.Not.Null); + Assert.That(way.Tags.Count, Is.EqualTo(1)); + Assert.That(way.Tags.Contains("building", "yes"), Is.True); + Assert.That(way.Nodes, Is.Not.Null); + Assert.That(way.Nodes.Length, Is.EqualTo(5)); + Assert.That(way.Nodes[0], Is.EqualTo(1025709357)); + Assert.That(way.Nodes[1], Is.EqualTo(1025709360)); + Assert.That(way.Nodes[2], Is.EqualTo(1025709358)); + Assert.That(way.Nodes[3], Is.EqualTo(1025709344)); + Assert.That(way.Nodes[4], Is.EqualTo(1025709357)); } /// @@ -123,77 +123,77 @@ public void TestReadRelation() var result = new List(source); // check results. - Assert.IsNotNull(result); - Assert.AreEqual(1, result.Count); - Assert.IsInstanceOf(result[0]); + Assert.That(result, Is.Not.Null); + Assert.That(result.Count, Is.EqualTo(1)); + Assert.That(result[0], Is.InstanceOf()); var relation = result[0] as Relation; - Assert.AreEqual(214314, relation.Id); - Assert.AreEqual("marc12", relation.UserName); - Assert.AreEqual(540527, relation.UserId); - Assert.AreEqual(true, relation.Visible); - Assert.AreEqual(18, relation.Version); - Assert.AreEqual(9797825, relation.ChangeSetId); - Assert.AreEqual(new DateTime(2011, 11, 11, 16, 42, 26), relation.TimeStamp.Value.ToUniversalTime()); - Assert.IsNotNull(relation.Tags); - Assert.AreEqual(4, relation.Tags.Count); - Assert.IsTrue(relation.Tags.Contains("network", "rcn")); - Assert.IsTrue(relation.Tags.Contains("note", "53-80")); - Assert.IsTrue(relation.Tags.Contains("route", "bicycle")); - Assert.IsTrue(relation.Tags.Contains("type", "route")); - Assert.IsNotNull(relation.Members); - Assert.AreEqual(13, relation.Members.Length); - - Assert.AreEqual(string.Empty, relation.Members[0].Role); - Assert.AreEqual(OsmGeoType.Way, relation.Members[0].Type); - Assert.AreEqual(37294428, relation.Members[0].Id); - - Assert.AreEqual("forward", relation.Members[1].Role); - Assert.AreEqual(OsmGeoType.Way, relation.Members[1].Type); - Assert.AreEqual(87492000, relation.Members[1].Id); - - Assert.AreEqual("forward", relation.Members[2].Role); - Assert.AreEqual(OsmGeoType.Way, relation.Members[2].Type); - Assert.AreEqual(37682837, relation.Members[2].Id); - - Assert.AreEqual("forward", relation.Members[3].Role); - Assert.AreEqual(OsmGeoType.Way, relation.Members[3].Type); - Assert.AreEqual(88614492, relation.Members[3].Id); - - Assert.AreEqual(string.Empty, relation.Members[4].Role); - Assert.AreEqual(OsmGeoType.Way, relation.Members[4].Type); - Assert.AreEqual(88614520, relation.Members[4].Id); - - Assert.AreEqual(string.Empty, relation.Members[5].Role); - Assert.AreEqual(OsmGeoType.Way, relation.Members[5].Type); - Assert.AreEqual(39448130, relation.Members[5].Id); - - Assert.AreEqual(string.Empty, relation.Members[6].Role); - Assert.AreEqual(OsmGeoType.Way, relation.Members[6].Type); - Assert.AreEqual(39364233, relation.Members[6].Id); - - Assert.AreEqual(string.Empty, relation.Members[7].Role); - Assert.AreEqual(OsmGeoType.Way, relation.Members[7].Type); - Assert.AreEqual(52285585, relation.Members[7].Id); - - Assert.AreEqual(string.Empty, relation.Members[8].Role); - Assert.AreEqual(OsmGeoType.Way, relation.Members[8].Type); - Assert.AreEqual(39364232, relation.Members[8].Id); - - Assert.AreEqual(string.Empty, relation.Members[9].Role); - Assert.AreEqual(OsmGeoType.Way, relation.Members[9].Type); - Assert.AreEqual(136621092, relation.Members[9].Id); - - Assert.AreEqual(string.Empty, relation.Members[10].Role); - Assert.AreEqual(OsmGeoType.Way, relation.Members[10].Type); - Assert.AreEqual(88195311, relation.Members[10].Id); - - Assert.AreEqual(string.Empty, relation.Members[11].Role); - Assert.AreEqual(OsmGeoType.Way, relation.Members[11].Type); - Assert.AreEqual(88195309, relation.Members[11].Id); - - Assert.AreEqual(string.Empty, relation.Members[12].Role); - Assert.AreEqual(OsmGeoType.Way, relation.Members[12].Type); - Assert.AreEqual(88195313, relation.Members[12].Id); + Assert.That(relation.Id, Is.EqualTo(214314)); + Assert.That(relation.UserName, Is.EqualTo("marc12")); + Assert.That(relation.UserId, Is.EqualTo(540527)); + Assert.That(relation.Visible, Is.EqualTo(true)); + Assert.That(relation.Version, Is.EqualTo(18)); + Assert.That(relation.ChangeSetId, Is.EqualTo(9797825)); + Assert.That(relation.TimeStamp.Value.ToUniversalTime(), Is.EqualTo(new DateTime(2011, 11, 11, 16, 42, 26))); + Assert.That(relation.Tags, Is.Not.Null); + Assert.That(relation.Tags.Count, Is.EqualTo(4)); + Assert.That(relation.Tags.Contains("network", "rcn"), Is.True); + Assert.That(relation.Tags.Contains("note", "53-80"), Is.True); + Assert.That(relation.Tags.Contains("route", "bicycle"), Is.True); + Assert.That(relation.Tags.Contains("type", "route"), Is.True); + Assert.That(relation.Members, Is.Not.Null); + Assert.That(relation.Members.Length, Is.EqualTo(13)); + + Assert.That(relation.Members[0].Role, Is.EqualTo(string.Empty)); + Assert.That(relation.Members[0].Type, Is.EqualTo(OsmGeoType.Way)); + Assert.That(relation.Members[0].Id, Is.EqualTo(37294428)); + + Assert.That(relation.Members[1].Role, Is.EqualTo("forward")); + Assert.That(relation.Members[1].Type, Is.EqualTo(OsmGeoType.Way)); + Assert.That(relation.Members[1].Id, Is.EqualTo(87492000)); + + Assert.That(relation.Members[2].Role, Is.EqualTo("forward")); + Assert.That(relation.Members[2].Type, Is.EqualTo(OsmGeoType.Way)); + Assert.That(relation.Members[2].Id, Is.EqualTo(37682837)); + + Assert.That(relation.Members[3].Role, Is.EqualTo("forward")); + Assert.That(relation.Members[3].Type, Is.EqualTo(OsmGeoType.Way)); + Assert.That(relation.Members[3].Id, Is.EqualTo(88614492)); + + Assert.That(relation.Members[4].Role, Is.EqualTo(string.Empty)); + Assert.That(relation.Members[4].Type, Is.EqualTo(OsmGeoType.Way)); + Assert.That(relation.Members[4].Id, Is.EqualTo(88614520)); + + Assert.That(relation.Members[5].Role, Is.EqualTo(string.Empty)); + Assert.That(relation.Members[5].Type, Is.EqualTo(OsmGeoType.Way)); + Assert.That(relation.Members[5].Id, Is.EqualTo(39448130)); + + Assert.That(relation.Members[6].Role, Is.EqualTo(string.Empty)); + Assert.That(relation.Members[6].Type, Is.EqualTo(OsmGeoType.Way)); + Assert.That(relation.Members[6].Id, Is.EqualTo(39364233)); + + Assert.That(relation.Members[7].Role, Is.EqualTo(string.Empty)); + Assert.That(relation.Members[7].Type, Is.EqualTo(OsmGeoType.Way)); + Assert.That(relation.Members[7].Id, Is.EqualTo(52285585)); + + Assert.That(relation.Members[8].Role, Is.EqualTo(string.Empty)); + Assert.That(relation.Members[8].Type, Is.EqualTo(OsmGeoType.Way)); + Assert.That(relation.Members[8].Id, Is.EqualTo(39364232)); + + Assert.That(relation.Members[9].Role, Is.EqualTo(string.Empty)); + Assert.That(relation.Members[9].Type, Is.EqualTo(OsmGeoType.Way)); + Assert.That(relation.Members[9].Id, Is.EqualTo(136621092)); + + Assert.That(relation.Members[10].Role, Is.EqualTo(string.Empty)); + Assert.That(relation.Members[10].Type, Is.EqualTo(OsmGeoType.Way)); + Assert.That(relation.Members[10].Id, Is.EqualTo(88195311)); + + Assert.That(relation.Members[11].Role, Is.EqualTo(string.Empty)); + Assert.That(relation.Members[11].Type, Is.EqualTo(OsmGeoType.Way)); + Assert.That(relation.Members[11].Id, Is.EqualTo(88195309)); + + Assert.That(relation.Members[12].Role, Is.EqualTo(string.Empty)); + Assert.That(relation.Members[12].Type, Is.EqualTo(OsmGeoType.Way)); + Assert.That(relation.Members[12].Id, Is.EqualTo(88195313)); } /// @@ -237,7 +237,7 @@ public void ReadRealXML() wechel.AddRange(reader); } - Assert.AreEqual(13978, wechel.Count); + Assert.That(wechel.Count, Is.EqualTo(13978)); } } @@ -256,7 +256,7 @@ public void ReadRealXMLNonSeekable() wechel.AddRange(reader); } - Assert.AreEqual(13978, wechel.Count); + Assert.That(wechel.Count, Is.EqualTo(13978)); } } @@ -281,7 +281,7 @@ public void ReadRealXMLNotAtBeginning() wechel.AddRange(reader); } - Assert.AreEqual(13978, wechel.Count); + Assert.That(wechel.Count, Is.EqualTo(13978)); } /// @@ -305,7 +305,7 @@ public void ReadRealXMLNonSeekableNotAtBeginning() wechel.AddRange(reader); } - Assert.AreEqual(13978, wechel.Count); + Assert.That(wechel.Count, Is.EqualTo(13978)); } /// @@ -323,7 +323,7 @@ public void XmlOsmStreamSource_ShouldBeAbleToReadFromStreamWithPositionNotAvaila wechel.AddRange(reader); } - Assert.AreEqual(13978, wechel.Count); + Assert.That(wechel.Count, Is.EqualTo(13978)); } } } diff --git a/test/OsmSharp.Test/Stream/XmlOsmStreamTargetTests.cs b/test/OsmSharp.Test/Stream/XmlOsmStreamTargetTests.cs index 5996582e..d9027459 100755 --- a/test/OsmSharp.Test/Stream/XmlOsmStreamTargetTests.cs +++ b/test/OsmSharp.Test/Stream/XmlOsmStreamTargetTests.cs @@ -55,8 +55,7 @@ public void TestWriteNode() memoryStream.Seek(0, SeekOrigin.Begin); var result = (new StreamReader(memoryStream)).ReadToEnd(); - Assert.AreEqual("", - result); + Assert.That(result, Is.EqualTo("")); } } @@ -82,8 +81,7 @@ public void TestWriteWay() memoryStream.Seek(0, SeekOrigin.Begin); var result = (new StreamReader(memoryStream)).ReadToEnd(); - Assert.AreEqual("", - result); + Assert.That(result, Is.EqualTo("")); } } @@ -109,8 +107,7 @@ public void TestWriteRelation() memoryStream.Seek(0, SeekOrigin.Begin); var result = (new StreamReader(memoryStream)).ReadToEnd(); - Assert.AreEqual("", - result); + Assert.That(result, Is.EqualTo("")); } } @@ -167,8 +164,7 @@ public void TestWrite() memoryStream.Seek(0, SeekOrigin.Begin); var result = (new StreamReader(memoryStream)).ReadToEnd(); - Assert.AreEqual("" - ,result); + Assert.That(result, Is.EqualTo("")); } } @@ -232,8 +228,8 @@ public void TestWriteWithBounds() memoryStream.Seek(0, SeekOrigin.Begin); var result = (new StreamReader(memoryStream)).ReadToEnd(); - Assert.AreEqual("" - ,result); + Assert.That(result, Is.EqualTo("" +)); } } }