Skip to content

Commit 3219339

Browse files
matt-lethargicmatt-lethargic
committed
Changing namespaces, adding System.Text.Json usings and changing JsonPRoperty attribute
1 parent ee56135 commit 3219339

53 files changed

Lines changed: 1551 additions & 1589 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/GeoJSON.Net.Tests/CoordinateReferenceSystem/DefaultCrsTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
using GeoJSON.Net.CoordinateReferenceSystem;
2-
using GeoJSON.Net.Feature;
3-
using GeoJSON.Net.Geometry;
4-
using Newtonsoft.Json;
1+
using GeoJSON.Text.CoordinateReferenceSystem;
2+
using GeoJSON.Text.Feature;
3+
using GeoJSON.Text.Geometry;
4+
55
using NUnit.Framework;
66

7-
namespace GeoJSON.Net.Tests.CoordinateReferenceSystem
7+
namespace GeoJSON.Text.Tests.CoordinateReferenceSystem
88
{
99
[TestFixture]
1010
public class DefaultCrsTests : TestBase

‎src/GeoJSON.Net.Tests/CoordinateReferenceSystem/LinkedCRSTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using System;
2-
using GeoJSON.Net.CoordinateReferenceSystem;
3-
using GeoJSON.Net.Geometry;
4-
using Newtonsoft.Json;
2+
using GeoJSON.Text.CoordinateReferenceSystem;
3+
using GeoJSON.Text.Geometry;
4+
55
using NUnit.Framework;
66

7-
namespace GeoJSON.Net.Tests.CoordinateReferenceSystem
7+
namespace GeoJSON.Text.Tests.CoordinateReferenceSystem
88
{
99
[TestFixture]
1010
public class LinkedCRSTests : TestBase

‎src/GeoJSON.Net.Tests/CoordinateReferenceSystem/NamedCrsTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using System;
2-
using GeoJSON.Net.CoordinateReferenceSystem;
3-
using GeoJSON.Net.Feature;
4-
using Newtonsoft.Json;
2+
using GeoJSON.Text.CoordinateReferenceSystem;
3+
using GeoJSON.Text.Feature;
4+
55
using NUnit.Framework;
66

7-
namespace GeoJSON.Net.Tests.CoordinateReferenceSystem
7+
namespace GeoJSON.Text.Tests.CoordinateReferenceSystem
88
{
99
[TestFixture]
1010
public class NamedCRSTests : TestBase

‎src/GeoJSON.Net.Tests/CoordinateReferenceSystem/UnspecifiedCRSTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
using GeoJSON.Net.CoordinateReferenceSystem;
2-
using GeoJSON.Net.Feature;
3-
using Newtonsoft.Json;
1+
using GeoJSON.Text.CoordinateReferenceSystem;
2+
using GeoJSON.Text.Feature;
3+
44
using NUnit.Framework;
55

6-
namespace GeoJSON.Net.Tests.CoordinateReferenceSystem
6+
namespace GeoJSON.Text.Tests.CoordinateReferenceSystem
77
{
88
[TestFixture]
99
public class UnspecifiedCRSTests : TestBase

‎src/GeoJSON.Net.Tests/Feature/FeatureCollectionTests.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4-
using GeoJSON.Net.Feature;
5-
using GeoJSON.Net.Geometry;
6-
using Newtonsoft.Json;
4+
using GeoJSON.Text.Feature;
5+
using GeoJSON.Text.Geometry;
6+
77
using NUnit.Framework;
88

9-
namespace GeoJSON.Net.Tests.Feature
9+
namespace GeoJSON.Text.Tests.Feature
1010
{
1111
[TestFixture]
1212
public class FeatureCollectionTests : TestBase
@@ -52,7 +52,7 @@ public void FeatureCollectionSerialization()
5252
{ "test2", 2 }
5353
};
5454

55-
var feature = new Net.Feature.Feature(geom, props);
55+
var feature = new Text.Feature.Feature(geom, props);
5656
model.Features.Add(feature);
5757
}
5858

@@ -108,7 +108,7 @@ public void FeatureCollection_Test_IndexOf()
108108

109109
var props = FeatureTests.GetPropertiesInRandomOrder();
110110

111-
var feature = new Net.Feature.Feature(geom, props, id);
111+
var feature = new Text.Feature.Feature(geom, props, id);
112112
model.Features.Add(feature);
113113
}
114114

@@ -146,7 +146,7 @@ private FeatureCollection GetFeatureCollection()
146146

147147
var props = FeatureTests.GetPropertiesInRandomOrder();
148148

149-
var feature = new Net.Feature.Feature(geom, props);
149+
var feature = new Text.Feature.Feature(geom, props);
150150
model.Features.Add(feature);
151151
}
152152
return model;

‎src/GeoJSON.Net.Tests/Feature/FeatureTests.cs‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
using GeoJSON.Net.Geometry;
2-
using Newtonsoft.Json;
1+
using GeoJSON.Text.Geometry;
2+
33
using NUnit.Framework;
44
using System;
55
using System.Collections.Generic;
66
using System.Linq;
77

8-
namespace GeoJSON.Net.Tests.Feature
8+
namespace GeoJSON.Text.Tests.Feature
99
{
1010
[TestFixture]
1111
public class FeatureTests : TestBase
@@ -15,7 +15,7 @@ public void Can_Deserialize_Point_Feature()
1515
{
1616
var json = GetExpectedJson();
1717

18-
var feature = JsonConvert.DeserializeObject<Net.Feature.Feature>(json);
18+
var feature = JsonConvert.DeserializeObject<Text.Feature.Feature>(json);
1919

2020
Assert.IsNotNull(feature);
2121
Assert.IsNotNull(feature.Properties);
@@ -53,7 +53,7 @@ public void Can_Serialize_LineString_Feature()
5353
var geometry = new LineString(coordinates[0]);
5454

5555

56-
var actualJson = JsonConvert.SerializeObject(new Net.Feature.Feature(geometry));
56+
var actualJson = JsonConvert.SerializeObject(new Text.Feature.Feature(geometry));
5757

5858
Console.WriteLine(actualJson);
5959

@@ -85,7 +85,7 @@ public void Can_Serialize_MultiLineString_Feature()
8585

8686
var expectedJson = GetExpectedJson();
8787

88-
var actualJson = JsonConvert.SerializeObject(new Net.Feature.Feature(geometry));
88+
var actualJson = JsonConvert.SerializeObject(new Text.Feature.Feature(geometry));
8989

9090
JsonAssert.AreEqual(expectedJson, actualJson);
9191
}
@@ -96,7 +96,7 @@ public void Can_Serialize_Point_Feature()
9696
var geometry = new Point(new Position(1, 2));
9797
var expectedJson = GetExpectedJson();
9898

99-
var actualJson = JsonConvert.SerializeObject(new Net.Feature.Feature(geometry));
99+
var actualJson = JsonConvert.SerializeObject(new Text.Feature.Feature(geometry));
100100

101101
JsonAssert.AreEqual(expectedJson, actualJson);
102102
}
@@ -114,7 +114,7 @@ public void Can_Serialize_Polygon_Feature()
114114

115115
var polygon = new Polygon(new List<LineString> { new LineString(coordinates) });
116116
var properties = new Dictionary<string, object> { { "Name", "Foo" } };
117-
var feature = new Net.Feature.Feature(polygon, properties);
117+
var feature = new Text.Feature.Feature(polygon, properties);
118118

119119
var expectedJson = GetExpectedJson();
120120
var actualJson = JsonConvert.SerializeObject(feature);
@@ -159,7 +159,7 @@ public void Can_Serialize_MultiPolygon_Feature()
159159
})
160160
});
161161

162-
var feature = new Net.Feature.Feature(multiPolygon);
162+
var feature = new Text.Feature.Feature(multiPolygon);
163163

164164
var expectedJson = GetExpectedJson();
165165
var actualJson = JsonConvert.SerializeObject(feature);
@@ -180,7 +180,7 @@ public void Can_Serialize_Dictionary_Subclass()
180180
StringProperty = "Hello, GeoJSON !"
181181
};
182182

183-
Net.Feature.Feature feature = new Net.Feature.Feature(new Point(new Position(10, 10)), properties);
183+
Text.Feature.Feature feature = new Text.Feature.Feature(new Point(new Position(10, 10)), properties);
184184

185185
var expectedJson = this.GetExpectedJson();
186186
var actualJson = JsonConvert.SerializeObject(feature);
@@ -202,7 +202,7 @@ public void Ctor_Can_Add_Properties_Using_Object()
202202
StringProperty = "Hello, GeoJSON !"
203203
};
204204

205-
Net.Feature.Feature feature = new Net.Feature.Feature(new Point(new Position(10, 10)), properties);
205+
Text.Feature.Feature feature = new Text.Feature.Feature(new Point(new Position(10, 10)), properties);
206206

207207
Assert.IsNotNull(feature.Properties);
208208
Assert.IsTrue(feature.Properties.Count > 1);
@@ -224,7 +224,7 @@ public void Ctor_Can_Add_Properties_Using_Object_Inheriting_Dictionary()
224224
StringProperty = "Hello, GeoJSON !"
225225
};
226226

227-
Net.Feature.Feature feature = new Net.Feature.Feature(new Point(new Position(10, 10)), properties);
227+
Text.Feature.Feature feature = new Text.Feature.Feature(new Point(new Position(10, 10)), properties);
228228

229229
Assert.IsNotNull(feature.Properties);
230230
Assert.IsTrue(feature.Properties.Count > 1);
@@ -237,7 +237,7 @@ public void Ctor_Can_Add_Properties_Using_Object_Inheriting_Dictionary()
237237
[Test]
238238
public void Ctor_Creates_Properties_Collection_When_Passed_Null_Proper_Object()
239239
{
240-
Net.Feature.Feature feature = new Net.Feature.Feature(new Point(new Position(10, 10)), (object)null);
240+
Text.Feature.Feature feature = new Text.Feature.Feature(new Point(new Position(10, 10)), (object)null);
241241

242242
Assert.IsNotNull(feature.Properties);
243243
CollectionAssert.IsEmpty(feature.Properties);
@@ -258,7 +258,7 @@ public void Feature_Equals_GetHashCode_Contract_Properties_Of_Objects()
258258
DoubleProperty = 1.2345d
259259
};
260260

261-
var left = new Net.Feature.Feature(new Point(new Position(10, 10)), leftProp);
261+
var left = new Text.Feature.Feature(new Point(new Position(10, 10)), leftProp);
262262

263263
var rightProp = new TestFeatureProperty
264264
{
@@ -270,7 +270,7 @@ public void Feature_Equals_GetHashCode_Contract_Properties_Of_Objects()
270270
StringProperty = "Hello, GeoJSON !"
271271
};
272272

273-
var right = new Net.Feature.Feature(new Point(new Position(10, 10)), rightProp);
273+
var right = new Text.Feature.Feature(new Point(new Position(10, 10)), rightProp);
274274

275275
Assert_Are_Equal(left, right);
276276
}
@@ -284,23 +284,23 @@ public void Feature_Equals_GetHashCode_Contract_Dictionary()
284284
var geometry10 = new Position(10, 10);
285285
var geometry20 = new Position(20, 20);
286286

287-
var left = new Net.Feature.Feature(new Point(
287+
var left = new Text.Feature.Feature(new Point(
288288
geometry10),
289289
leftDictionary,
290290
"abc");
291-
var right = new Net.Feature.Feature(new Point(
291+
var right = new Text.Feature.Feature(new Point(
292292
geometry20),
293293
rightDictionary,
294294
"abc");
295295

296296
Assert_Are_Not_Equal(left, right); // different geometries
297297

298298

299-
left = new Net.Feature.Feature(new Point(
299+
left = new Text.Feature.Feature(new Point(
300300
geometry10),
301301
leftDictionary,
302302
"abc");
303-
right = new Net.Feature.Feature(new Point(
303+
right = new Text.Feature.Feature(new Point(
304304
geometry10),
305305
rightDictionary,
306306
"abc"); // identical geometries, different ids and or properties or not compared
@@ -314,43 +314,43 @@ public void Serialized_And_Deserialized_Feature_Equals_And_Share_HashCode()
314314
{
315315
var geometry = GetGeometry();
316316

317-
var leftFeature = new Net.Feature.Feature(geometry);
317+
var leftFeature = new Text.Feature.Feature(geometry);
318318
var leftJson = JsonConvert.SerializeObject(leftFeature);
319-
var left = JsonConvert.DeserializeObject<Net.Feature.Feature>(leftJson);
319+
var left = JsonConvert.DeserializeObject<Text.Feature.Feature>(leftJson);
320320

321-
var rightFeature = new Net.Feature.Feature(geometry);
321+
var rightFeature = new Text.Feature.Feature(geometry);
322322
var rightJson = JsonConvert.SerializeObject(rightFeature);
323-
var right = JsonConvert.DeserializeObject<Net.Feature.Feature>(rightJson);
323+
var right = JsonConvert.DeserializeObject<Text.Feature.Feature>(rightJson);
324324

325325
Assert_Are_Equal(left, right);
326326

327-
leftFeature = new Net.Feature.Feature(geometry, GetPropertiesInRandomOrder());
327+
leftFeature = new Text.Feature.Feature(geometry, GetPropertiesInRandomOrder());
328328
leftJson = JsonConvert.SerializeObject(leftFeature);
329-
left = JsonConvert.DeserializeObject<Net.Feature.Feature>(leftJson);
329+
left = JsonConvert.DeserializeObject<Text.Feature.Feature>(leftJson);
330330

331-
rightFeature = new Net.Feature.Feature(geometry, GetPropertiesInRandomOrder());
331+
rightFeature = new Text.Feature.Feature(geometry, GetPropertiesInRandomOrder());
332332
rightJson = JsonConvert.SerializeObject(rightFeature);
333-
right = JsonConvert.DeserializeObject<Net.Feature.Feature>(rightJson);
333+
right = JsonConvert.DeserializeObject<Text.Feature.Feature>(rightJson);
334334

335335
Assert_Are_Equal(left, right); // assert properties doesn't influence comparison and hashcode
336336

337-
leftFeature = new Net.Feature.Feature(geometry, null, "abc_abc");
337+
leftFeature = new Text.Feature.Feature(geometry, null, "abc_abc");
338338
leftJson = JsonConvert.SerializeObject(leftFeature);
339-
left = JsonConvert.DeserializeObject<Net.Feature.Feature>(leftJson);
339+
left = JsonConvert.DeserializeObject<Text.Feature.Feature>(leftJson);
340340

341-
rightFeature = new Net.Feature.Feature(geometry, null, "xyz_XYZ");
341+
rightFeature = new Text.Feature.Feature(geometry, null, "xyz_XYZ");
342342
rightJson = JsonConvert.SerializeObject(rightFeature);
343-
right = JsonConvert.DeserializeObject<Net.Feature.Feature>(rightJson);
343+
right = JsonConvert.DeserializeObject<Text.Feature.Feature>(rightJson);
344344

345345
Assert_Are_Equal(left, right); // assert id's doesn't influence comparison and hashcode
346346

347-
leftFeature = new Net.Feature.Feature(geometry, GetPropertiesInRandomOrder(), "abc");
347+
leftFeature = new Text.Feature.Feature(geometry, GetPropertiesInRandomOrder(), "abc");
348348
leftJson = JsonConvert.SerializeObject(leftFeature);
349-
left = JsonConvert.DeserializeObject<Net.Feature.Feature>(leftJson);
349+
left = JsonConvert.DeserializeObject<Text.Feature.Feature>(leftJson);
350350

351-
rightFeature = new Net.Feature.Feature(geometry, GetPropertiesInRandomOrder(), "abc");
351+
rightFeature = new Text.Feature.Feature(geometry, GetPropertiesInRandomOrder(), "abc");
352352
rightJson = JsonConvert.SerializeObject(rightFeature);
353-
right = JsonConvert.DeserializeObject<Net.Feature.Feature>(rightJson);
353+
right = JsonConvert.DeserializeObject<Text.Feature.Feature>(rightJson);
354354

355355
Assert_Are_Equal(left, right); // assert id's + properties doesn't influence comparison and hashcode
356356
}
@@ -361,7 +361,7 @@ public void Feature_Equals_Null_Issue94()
361361
bool equal1 = true;
362362
bool equal2 = true;
363363

364-
var feature = new Net.Feature.Feature(new Point(new Position(12, 123)));
364+
var feature = new Text.Feature.Feature(new Point(new Position(12, 123)));
365365
Assert.DoesNotThrow(() =>
366366
{
367367
equal1 = feature.Equals(null);
@@ -377,7 +377,7 @@ public void Feature_Null_Instance_Equals_Null_Issue94()
377377
{
378378
var equal1 = true;
379379

380-
Net.Feature.Feature feature = null;
380+
Text.Feature.Feature feature = null;
381381
Assert.DoesNotThrow(() =>
382382
{
383383
equal1 = feature != null;
@@ -392,7 +392,7 @@ public void Feature_Equals_Itself_Issue94()
392392
bool equal1 = false;
393393
bool equal2 = false;
394394

395-
var feature = new Net.Feature.Feature(new Point(new Position(12, 123)));
395+
var feature = new Text.Feature.Feature(new Point(new Position(12, 123)));
396396
Assert.DoesNotThrow(() =>
397397
{
398398
equal1 = feature == feature;
@@ -409,8 +409,8 @@ public void Feature_Equals_Geometry_Null_Issue115()
409409
bool equal1 = false;
410410
bool equal2 = false;
411411

412-
var feature1 = new Net.Feature.Feature(null);
413-
var feature2 = new Net.Feature.Feature(new Point(new Position(12, 123)));
412+
var feature1 = new Text.Feature.Feature(null);
413+
var feature2 = new Text.Feature.Feature(new Point(new Position(12, 123)));
414414

415415
Assert.DoesNotThrow(() =>
416416
{
@@ -428,8 +428,8 @@ public void Feature_Equals_Other_Geometry_Null_Issue115()
428428
bool equal1 = false;
429429
bool equal2 = false;
430430

431-
var feature1 = new Net.Feature.Feature(new Point(new Position(12, 123)));
432-
var feature2 = new Net.Feature.Feature(null);
431+
var feature1 = new Text.Feature.Feature(new Point(new Position(12, 123)));
432+
var feature2 = new Text.Feature.Feature(null);
433433

434434
Assert.DoesNotThrow(() =>
435435
{
@@ -447,8 +447,8 @@ public void Feature_Equals_All_Geometry_Null_Issue115()
447447
bool equal1 = false;
448448
bool equal2 = false;
449449

450-
var feature1 = new Net.Feature.Feature(null);
451-
var feature2 = new Net.Feature.Feature(null);
450+
var feature1 = new Text.Feature.Feature(null);
451+
var feature2 = new Text.Feature.Feature(null);
452452

453453
Assert.DoesNotThrow(() =>
454454
{
@@ -505,7 +505,7 @@ public static IDictionary<string, object> GetPropertiesInRandomOrder()
505505
return randomlyOrdered;
506506
}
507507

508-
private void Assert_Are_Equal(Net.Feature.Feature left, Net.Feature.Feature right)
508+
private void Assert_Are_Equal(Text.Feature.Feature left, Text.Feature.Feature right)
509509
{
510510
Assert.AreEqual(left, right);
511511

@@ -524,7 +524,7 @@ private void Assert_Are_Equal(Net.Feature.Feature left, Net.Feature.Feature righ
524524
Assert.AreEqual(left.GetHashCode(), right.GetHashCode());
525525
}
526526

527-
private void Assert_Are_Not_Equal(Net.Feature.Feature left, Net.Feature.Feature right)
527+
private void Assert_Are_Not_Equal(Text.Feature.Feature left, Text.Feature.Feature right)
528528
{
529529
Assert.AreNotEqual(left, right);
530530

0 commit comments

Comments
 (0)