1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
|
From: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
Date: Fri, 12 Nov 2021 22:37:58 +0100
Subject: Fix FTBFS caused by update of carrotsearch-randomizedtesting
upstream link: https://github.com/locationtech/spatial4j/commit/135c3b87cb32994b791585fcd95907f944d87fb6
---
src/test/java/com/spatial4j/core/distance/TestDistances.java | 2 ++
src/test/java/com/spatial4j/core/io/BinaryCodecTest.java | 2 ++
src/test/java/com/spatial4j/core/io/JtsWKTReaderShapeParserTest.java | 4 ++++
src/test/java/com/spatial4j/core/io/JtsWktShapeParserTest.java | 4 ++++
src/test/java/com/spatial4j/core/io/ShapeReadWriterTest.java | 3 +++
src/test/java/com/spatial4j/core/io/WktCustomShapeParserTest.java | 2 ++
src/test/java/com/spatial4j/core/io/WktShapeParserTest.java | 4 ++++
src/test/java/com/spatial4j/core/shape/AbstractTestShapes.java | 2 ++
src/test/java/com/spatial4j/core/shape/BufferedLineTest.java | 5 ++++-
src/test/java/com/spatial4j/core/shape/JtsGeometryTest.java | 5 +++++
src/test/java/com/spatial4j/core/shape/RandomizedShapeTest.java | 3 +++
.../java/com/spatial4j/core/shape/RectIntersectionTestHelper.java | 4 +++-
src/test/java/com/spatial4j/core/shape/ShapeCollectionTest.java | 2 ++
src/test/java/com/spatial4j/core/shape/TestShapes2D.java | 3 +++
src/test/java/com/spatial4j/core/shape/TestShapesGeo.java | 3 +++
15 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/src/test/java/com/spatial4j/core/distance/TestDistances.java b/src/test/java/com/spatial4j/core/distance/TestDistances.java
index 09c08af..ee6ac4b 100644
--- a/src/test/java/com/spatial4j/core/distance/TestDistances.java
+++ b/src/test/java/com/spatial4j/core/distance/TestDistances.java
@@ -27,6 +27,8 @@ import com.spatial4j.core.shape.impl.PointImpl;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import static com.spatial4j.core.distance.DistanceUtils.DEG_TO_KM;
import static com.spatial4j.core.distance.DistanceUtils.KM_TO_DEG;
diff --git a/src/test/java/com/spatial4j/core/io/BinaryCodecTest.java b/src/test/java/com/spatial4j/core/io/BinaryCodecTest.java
index 23d9a52..c98ba19 100644
--- a/src/test/java/com/spatial4j/core/io/BinaryCodecTest.java
+++ b/src/test/java/com/spatial4j/core/io/BinaryCodecTest.java
@@ -31,6 +31,8 @@ import java.io.IOException;
import java.text.ParseException;
import java.util.Arrays;
+import static org.junit.Assert.assertEquals;
+
public class BinaryCodecTest extends RandomizedTest {
final SpatialContext ctx;
diff --git a/src/test/java/com/spatial4j/core/io/JtsWKTReaderShapeParserTest.java b/src/test/java/com/spatial4j/core/io/JtsWKTReaderShapeParserTest.java
index 4e624f3..0f3b2fe 100644
--- a/src/test/java/com/spatial4j/core/io/JtsWKTReaderShapeParserTest.java
+++ b/src/test/java/com/spatial4j/core/io/JtsWKTReaderShapeParserTest.java
@@ -29,6 +29,10 @@ import org.junit.Test;
import java.io.IOException;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class JtsWKTReaderShapeParserTest extends RandomizedTest {
final SpatialContext ctx;
diff --git a/src/test/java/com/spatial4j/core/io/JtsWktShapeParserTest.java b/src/test/java/com/spatial4j/core/io/JtsWktShapeParserTest.java
index 10fa16a..72d2f4c 100644
--- a/src/test/java/com/spatial4j/core/io/JtsWktShapeParserTest.java
+++ b/src/test/java/com/spatial4j/core/io/JtsWktShapeParserTest.java
@@ -32,6 +32,10 @@ import java.text.ParseException;
import java.util.Arrays;
import java.util.Collections;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class JtsWktShapeParserTest extends WktShapeParserTest {
//By extending WktShapeParserTest we inherit its test too
diff --git a/src/test/java/com/spatial4j/core/io/ShapeReadWriterTest.java b/src/test/java/com/spatial4j/core/io/ShapeReadWriterTest.java
index c76a162..c08988c 100644
--- a/src/test/java/com/spatial4j/core/io/ShapeReadWriterTest.java
+++ b/src/test/java/com/spatial4j/core/io/ShapeReadWriterTest.java
@@ -27,6 +27,9 @@ import org.junit.Test;
import java.io.IOException;
import java.util.Arrays;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
@SuppressWarnings("unchecked")
public class ShapeReadWriterTest extends RandomizedTest {
diff --git a/src/test/java/com/spatial4j/core/io/WktCustomShapeParserTest.java b/src/test/java/com/spatial4j/core/io/WktCustomShapeParserTest.java
index 0f01efb..33ade35 100644
--- a/src/test/java/com/spatial4j/core/io/WktCustomShapeParserTest.java
+++ b/src/test/java/com/spatial4j/core/io/WktCustomShapeParserTest.java
@@ -25,6 +25,8 @@ import org.junit.Test;
import java.text.ParseException;
+import static org.junit.Assert.assertEquals;
+
public class WktCustomShapeParserTest extends WktShapeParserTest {
static class CustomShape extends PointImpl {
diff --git a/src/test/java/com/spatial4j/core/io/WktShapeParserTest.java b/src/test/java/com/spatial4j/core/io/WktShapeParserTest.java
index 40e3aaf..456cf43 100644
--- a/src/test/java/com/spatial4j/core/io/WktShapeParserTest.java
+++ b/src/test/java/com/spatial4j/core/io/WktShapeParserTest.java
@@ -28,6 +28,10 @@ import java.text.ParseException;
import java.util.Arrays;
import java.util.Collections;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
public class WktShapeParserTest extends RandomizedTest {
final SpatialContext ctx;
diff --git a/src/test/java/com/spatial4j/core/shape/AbstractTestShapes.java b/src/test/java/com/spatial4j/core/shape/AbstractTestShapes.java
index 12d448d..3d81036 100755
--- a/src/test/java/com/spatial4j/core/shape/AbstractTestShapes.java
+++ b/src/test/java/com/spatial4j/core/shape/AbstractTestShapes.java
@@ -26,6 +26,8 @@ import com.spatial4j.core.shape.impl.RectangleImpl;
import org.junit.Rule;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import static com.spatial4j.core.shape.SpatialRelation.CONTAINS;
import static com.spatial4j.core.shape.SpatialRelation.DISJOINT;
diff --git a/src/test/java/com/spatial4j/core/shape/BufferedLineTest.java b/src/test/java/com/spatial4j/core/shape/BufferedLineTest.java
index 68c0f68..e99c6e6 100644
--- a/src/test/java/com/spatial4j/core/shape/BufferedLineTest.java
+++ b/src/test/java/com/spatial4j/core/shape/BufferedLineTest.java
@@ -32,6 +32,9 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedList;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
public class BufferedLineTest extends RandomizedTest {
private final SpatialContext ctx = new SpatialContextFactory()
@@ -181,4 +184,4 @@ public class BufferedLineTest extends RandomizedTest {
}
}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/spatial4j/core/shape/JtsGeometryTest.java b/src/test/java/com/spatial4j/core/shape/JtsGeometryTest.java
index bf15ca6..7aebb39 100755
--- a/src/test/java/com/spatial4j/core/shape/JtsGeometryTest.java
+++ b/src/test/java/com/spatial4j/core/shape/JtsGeometryTest.java
@@ -37,6 +37,11 @@ import java.io.InputStreamReader;
import java.text.ParseException;
import java.util.Random;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static com.spatial4j.core.shape.SpatialRelation.CONTAINS;
import static com.spatial4j.core.shape.SpatialRelation.DISJOINT;
import static com.spatial4j.core.shape.SpatialRelation.INTERSECTS;
diff --git a/src/test/java/com/spatial4j/core/shape/RandomizedShapeTest.java b/src/test/java/com/spatial4j/core/shape/RandomizedShapeTest.java
index 360e948..bc34033 100644
--- a/src/test/java/com/spatial4j/core/shape/RandomizedShapeTest.java
+++ b/src/test/java/com/spatial4j/core/shape/RandomizedShapeTest.java
@@ -22,6 +22,9 @@ import com.spatial4j.core.context.SpatialContext;
import com.spatial4j.core.distance.DistanceUtils;
import com.spatial4j.core.shape.impl.Range;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static com.spatial4j.core.shape.SpatialRelation.CONTAINS;
import static com.spatial4j.core.shape.SpatialRelation.WITHIN;
diff --git a/src/test/java/com/spatial4j/core/shape/RectIntersectionTestHelper.java b/src/test/java/com/spatial4j/core/shape/RectIntersectionTestHelper.java
index 8bdd616..227a561 100644
--- a/src/test/java/com/spatial4j/core/shape/RectIntersectionTestHelper.java
+++ b/src/test/java/com/spatial4j/core/shape/RectIntersectionTestHelper.java
@@ -22,6 +22,8 @@ import com.spatial4j.core.context.SpatialContext;
import com.spatial4j.core.shape.impl.InfBufLine;
import com.spatial4j.core.shape.impl.PointImpl;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static com.spatial4j.core.shape.SpatialRelation.CONTAINS;
import static com.spatial4j.core.shape.SpatialRelation.DISJOINT;
@@ -173,4 +175,4 @@ public abstract class RectIntersectionTestHelper<S extends Shape> extends Random
return ctx.makeRectangle(minX, maxX, minY, maxY);
}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/spatial4j/core/shape/ShapeCollectionTest.java b/src/test/java/com/spatial4j/core/shape/ShapeCollectionTest.java
index 24ded8f..9a15538 100644
--- a/src/test/java/com/spatial4j/core/shape/ShapeCollectionTest.java
+++ b/src/test/java/com/spatial4j/core/shape/ShapeCollectionTest.java
@@ -29,6 +29,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import static com.spatial4j.core.shape.SpatialRelation.CONTAINS;
/** @author David Smiley - dsmiley@mitre.org */
diff --git a/src/test/java/com/spatial4j/core/shape/TestShapes2D.java b/src/test/java/com/spatial4j/core/shape/TestShapes2D.java
index eeac0b8..31966c6 100644
--- a/src/test/java/com/spatial4j/core/shape/TestShapes2D.java
+++ b/src/test/java/com/spatial4j/core/shape/TestShapes2D.java
@@ -33,6 +33,9 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
import static com.spatial4j.core.shape.SpatialRelation.CONTAINS;
import static com.spatial4j.core.shape.SpatialRelation.DISJOINT;
import static com.spatial4j.core.shape.SpatialRelation.INTERSECTS;
diff --git a/src/test/java/com/spatial4j/core/shape/TestShapesGeo.java b/src/test/java/com/spatial4j/core/shape/TestShapesGeo.java
index b2d133d..0d8d04a 100644
--- a/src/test/java/com/spatial4j/core/shape/TestShapesGeo.java
+++ b/src/test/java/com/spatial4j/core/shape/TestShapesGeo.java
@@ -29,6 +29,9 @@ import org.junit.Test;
import java.util.Arrays;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static com.spatial4j.core.shape.SpatialRelation.CONTAINS;
import static com.spatial4j.core.shape.SpatialRelation.DISJOINT;
import static com.spatial4j.core.shape.SpatialRelation.INTERSECTS;
|
