Skip to content

Commit 4574422

Browse files
dr-jtsdr-jts
committed
Refactor WKTReadWriteTest code
1 parent c72711e commit 4574422

File tree

1 file changed

+57
-44
lines changed

1 file changed

+57
-44
lines changed

‎modules/core/src/test/java/org/locationtech/jts/io/WKTReadWriteTest.java‎

Lines changed: 57 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -32,70 +32,83 @@ public WKTReadWriteTest(String name) {
3232

3333
public void testReadNaN() throws Exception {
3434

35+
checkReadWrite("POINT (NaN NaN)");
36+
3537
final String pt = "POINT (10 10)";
36-
assertEquals(pt, writer.write(reader.read("POINT (10 10 NaN)")));
37-
assertEquals(pt, writer.write(reader.read("POINT (10 10 nan)")));
38-
assertEquals(pt, writer.write(reader.read("POINT (10 10 NAN)")));
38+
assertEquals(pt, readWrite("POINT (10 10 NaN)"));
39+
assertEquals(pt, readWrite("POINT (10 10 nan)"));
40+
assertEquals(pt, readWrite("POINT (10 10 NAN)"));
3941
}
4042

41-
public void testReadInf() throws Exception {
42-
final String pt = "POINT (Inf -Inf)";
43-
assertEquals(pt, writer.write(reader.read("POINT (Inf -Inf)")));
43+
public void testReadInf() {
44+
checkReadWrite("POINT (Inf -Inf)");
4445
}
4546

46-
public void testReadPoint() throws Exception {
47-
assertEquals("POINT (10 10)", writer.write(reader.read("POINT (10 10)")));
48-
assertEquals("POINT EMPTY", writer.write(reader.read("POINT EMPTY")));
47+
public void testReadPoint() {
48+
checkReadWrite("POINT (10 10)");
49+
checkReadWrite("POINT EMPTY");
4950
}
5051

51-
public void testReadLineString() throws Exception {
52-
assertEquals("LINESTRING (10 10, 20 20, 30 40)", writer.write(reader.read("LINESTRING (10 10, 20 20, 30 40)")));
53-
assertEquals("LINESTRING EMPTY", writer.write(reader.read("LINESTRING EMPTY")));
52+
public void testReadLineString() {
53+
checkReadWrite("LINESTRING (10 10, 20 20, 30 40)");
54+
checkReadWrite("LINESTRING EMPTY");
5455
}
5556

56-
public void testReadLinearRing() throws Exception {
57-
try {
58-
reader.read("LINEARRING (10 10, 20 20, 30 40, 10 99)");
59-
}
60-
catch (IllegalArgumentException e) {
61-
assertTrue(e.getMessage().contains("not form a closed linestring"));
62-
}
63-
assertEquals("LINEARRING (10 10, 20 20, 30 40, 10 10)", writer.write(reader.read("LINEARRING (10 10, 20 20, 30 40, 10 10)")));
64-
assertEquals("LINEARRING EMPTY", writer.write(reader.read("LINEARRING EMPTY")));
57+
public void testReadLinearRing() {
58+
checkReadWrite("LINEARRING (10 10, 20 20, 30 40, 10 10)");
59+
checkReadWrite("LINEARRING EMPTY");
6560
}
6661

67-
public void testReadPolygon() throws Exception {
68-
assertEquals("POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))", writer.write(reader.read("POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))")));
69-
assertEquals("POLYGON EMPTY", writer.write(reader.read("POLYGON EMPTY")));
62+
public void testReadPolygon() {
63+
checkReadWrite("POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))");
64+
checkReadWrite("POLYGON EMPTY");
7065
}
7166

72-
public void testReadMultiPoint() throws Exception {
73-
assertEquals("MULTIPOINT ((10 10), (20 20))", writer.write(reader.read("MULTIPOINT ((10 10), (20 20))")));
74-
assertEquals("MULTIPOINT EMPTY", writer.write(reader.read("MULTIPOINT EMPTY")));
75-
assertEquals("MULTIPOINT (EMPTY, EMPTY)", writer.write(reader.read("MULTIPOINT (EMPTY, EMPTY)")));
67+
public void testReadMultiPoint() {
68+
checkReadWrite("MULTIPOINT ((10 10), (20 20))");
69+
checkReadWrite("MULTIPOINT EMPTY");
70+
checkReadWrite("MULTIPOINT (EMPTY, EMPTY)");
7671
}
7772

78-
public void testReadMultiLineString() throws Exception {
79-
assertEquals("MULTILINESTRING ((10 10, 20 20), (15 15, 30 15))", writer.write(reader.read("MULTILINESTRING ((10 10, 20 20), (15 15, 30 15))")));
80-
assertEquals("MULTILINESTRING EMPTY", writer.write(reader.read("MULTILINESTRING EMPTY")));
81-
assertEquals("MULTILINESTRING (EMPTY, EMPTY)", writer.write(reader.read("MULTILINESTRING (EMPTY, EMPTY)")));
73+
public void testReadMultiLineString() {
74+
checkReadWrite("MULTILINESTRING ((10 10, 20 20), (15 15, 30 15))");
75+
checkReadWrite("MULTILINESTRING EMPTY");
76+
checkReadWrite("MULTILINESTRING (EMPTY, EMPTY)");
8277
}
8378

84-
public void testReadMultiPolygon() throws Exception {
85-
assertEquals("MULTIPOLYGON (((10 10, 10 20, 20 20, 20 15, 10 10)), ((60 60, 70 70, 80 60, 60 60)))", writer.write(reader.read("MULTIPOLYGON (((10 10, 10 20, 20 20, 20 15, 10 10)), ((60 60, 70 70, 80 60, 60 60)))")));
86-
assertEquals("MULTIPOLYGON EMPTY", writer.write(reader.read("MULTIPOLYGON EMPTY")));
87-
assertEquals("MULTIPOLYGON (EMPTY, EMPTY)", writer.write(reader.read("MULTIPOLYGON (EMPTY, EMPTY)")));
79+
public void testReadMultiPolygon() {
80+
checkReadWrite("MULTIPOLYGON (((10 10, 10 20, 20 20, 20 15, 10 10)), ((60 60, 70 70, 80 60, 60 60)))");
81+
checkReadWrite("MULTIPOLYGON EMPTY");
82+
checkReadWrite("MULTIPOLYGON (EMPTY, EMPTY)");
8883
}
8984

90-
public void testReadGeometryCollection() throws Exception {
91-
assertEquals("GEOMETRYCOLLECTION (POINT (10 10), POINT (30 30), LINESTRING (15 15, 20 20))", writer.write(reader.read("GEOMETRYCOLLECTION (POINT (10 10), POINT (30 30), LINESTRING (15 15, 20 20))")));
92-
assertEquals("GEOMETRYCOLLECTION (POINT (10 10), LINEARRING EMPTY, LINESTRING (15 15, 20 20))", writer.write(reader.read("GEOMETRYCOLLECTION (POINT (10 10), LINEARRING EMPTY, LINESTRING (15 15, 20 20))")));
93-
assertEquals("GEOMETRYCOLLECTION (POINT (10 10), LINEARRING (10 10, 20 20, 30 40, 10 10), LINESTRING (15 15, 20 20))", writer.write(reader.read("GEOMETRYCOLLECTION (POINT (10 10), LINEARRING (10 10, 20 20, 30 40, 10 10), LINESTRING (15 15, 20 20))")));
94-
assertEquals("GEOMETRYCOLLECTION EMPTY", writer.write(reader.read("GEOMETRYCOLLECTION EMPTY")));
85+
public void testReadGeometryCollection() {
86+
checkReadWrite("GEOMETRYCOLLECTION (POINT (10 10), POINT (30 30), LINESTRING (15 15, 20 20))");
87+
checkReadWrite("GEOMETRYCOLLECTION (POINT (10 10), LINEARRING EMPTY, LINESTRING (15 15, 20 20))");
88+
checkReadWrite("GEOMETRYCOLLECTION (POINT (10 10), LINEARRING (10 10, 20 20, 30 40, 10 10), LINESTRING (15 15, 20 20))");
89+
checkReadWrite("GEOMETRYCOLLECTION EMPTY");
9590
}
9691

97-
public void testReadGeometryCollectionEmptyWithElements() throws Exception {
98-
assertEquals("GEOMETRYCOLLECTION (POINT EMPTY)", writer.write(reader.read("GEOMETRYCOLLECTION ( POINT EMPTY )")));
99-
assertEquals("GEOMETRYCOLLECTION (POINT EMPTY, LINESTRING EMPTY)", writer.write(reader.read("GEOMETRYCOLLECTION ( POINT EMPTY, LINESTRING EMPTY )")));
92+
public void testReadGeometryCollectionEmptyWithElements() {
93+
checkReadWrite("GEOMETRYCOLLECTION (POINT EMPTY)");
94+
checkReadWrite("GEOMETRYCOLLECTION (POINT EMPTY, LINESTRING EMPTY)");
95+
}
96+
97+
//===============================================
98+
99+
private void checkReadWrite(final String wkt) {
100+
String wktResult = readWrite(wkt);
101+
assertEquals(wkt, wktResult);
102+
}
103+
104+
private String readWrite(final String wkt) {
105+
String wktResult = null;
106+
try {
107+
return writer.write(reader.read(wkt));
108+
}
109+
catch (ParseException ex) {
110+
fail(ex.getMessage());
111+
}
112+
return wktResult;
100113
}
101114
}

0 commit comments

Comments
 (0)