Skip to content

Commit 94d95e6

Browse files
mapcodefoundationmapcodefoundation
committed
Made DecoderTest strict again
1 parent a940393 commit 94d95e6

File tree

1 file changed

+46
-52
lines changed

1 file changed

+46
-52
lines changed

‎src/test/java/com/mapcode/DecoderTest.java‎

Lines changed: 46 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -26,82 +26,76 @@
2626
public class DecoderTest {
2727
private static final Logger LOG = LoggerFactory.getLogger(DecoderTest.class);
2828

29-
private void assertEqualsWithinMillionth(final String name,final int v1,final int v2) throws Exception {
30-
if ( (v1-v2)>1 || (v2-v1)>1 ) {
31-
assertEquals(name,v1,v2);
32-
}
33-
}
34-
3529
@Test
3630
public void decodeMapcodeWithTerritory() throws Exception {
3731
LOG.info("decodeMapcodeWithTerritory");
3832
final Point point = MapcodeCodec.decode("49.4V", Territory.NLD);
39-
assertEqualsWithinMillionth("decode latitude", 52376514, point.getLatMicroDeg());
40-
assertEqualsWithinMillionth("decode longitude", 4908542, point.getLonMicroDeg());
33+
assertEquals("decode latitude", 52376514, point.getLatMicroDeg());
34+
assertEquals("decode longitude", 4908543, point.getLonMicroDeg());
4135
}
4236

4337
@Test
4438
public void decodeUpperLowercaseMapcode() throws Exception {
4539
LOG.info("decodeUpperLowercaseMapcode");
4640
final Point point1 = MapcodeCodec.decode("XXXXX.1234");
47-
assertEqualsWithinMillionth("decode latitude", 59596312, point1.getLatMicroDeg());
48-
assertEqualsWithinMillionth("decode longitude", 155931892, point1.getLonMicroDeg());
41+
assertEquals("decode latitude", 59596312, point1.getLatMicroDeg());
42+
assertEquals("decode longitude", 155931892, point1.getLonMicroDeg());
4943

5044
final Point point2 = MapcodeCodec.decode("Xxxxx.1234");
51-
assertEqualsWithinMillionth("decode latitude", 59596312, point2.getLatMicroDeg());
52-
assertEqualsWithinMillionth("decode longitude", 155931892, point2.getLonMicroDeg());
45+
assertEquals("decode latitude", 59596312, point2.getLatMicroDeg());
46+
assertEquals("decode longitude", 155931892, point2.getLonMicroDeg());
5347

5448
final Point point3 = MapcodeCodec.decode("xxxxx.1234");
55-
assertEqualsWithinMillionth("decode latitude", 59596312, point3.getLatMicroDeg());
56-
assertEqualsWithinMillionth("decode longitude", 155931892, point3.getLonMicroDeg());
49+
assertEquals("decode latitude", 59596312, point3.getLatMicroDeg());
50+
assertEquals("decode longitude", 155931892, point3.getLonMicroDeg());
5751
}
5852

5953
@Test
6054
public void decodeFullMapcode() throws Exception {
6155
LOG.info("decodeFullMapcode");
6256
final Point point1 = MapcodeCodec.decode("NLD 49.4V");
63-
assertEqualsWithinMillionth("decode latitude", 52376514, point1.getLatMicroDeg());
64-
assertEqualsWithinMillionth("decode longitude", 4908542, point1.getLonMicroDeg());
57+
assertEquals("decode latitude", 52376514, point1.getLatMicroDeg());
58+
assertEquals("decode longitude", 4908543, point1.getLonMicroDeg());
6559

6660
final Point point2 = MapcodeCodec.decode("US-ID LQJT.N94S");
67-
assertEqualsWithinMillionth("decode latitude", 45011346, point2.getLatMicroDeg());
68-
assertEqualsWithinMillionth("decode longitude", -113232731, point2.getLonMicroDeg());
61+
assertEquals("decode latitude", 45011346, point2.getLatMicroDeg());
62+
assertEquals("decode longitude", -113232731, point2.getLonMicroDeg());
6963

7064
final Point point3 = MapcodeCodec.decode("US_ID LQJT.N94S");
71-
assertEqualsWithinMillionth("decode latitude", 45011346, point3.getLatMicroDeg());
72-
assertEqualsWithinMillionth("decode longitude", -113232731, point3.getLonMicroDeg());
65+
assertEquals("decode latitude", 45011346, point3.getLatMicroDeg());
66+
assertEquals("decode longitude", -113232731, point3.getLonMicroDeg());
7367
}
7468

7569
@Test
7670
public void decodeInternationalMapcodeWithTerritory() throws Exception {
7771
LOG.info("decodeInternationalMapcodeWithTerritory");
7872
final Point point = MapcodeCodec.decode("VHXGB.1J9J", Territory.AAA);
79-
assertEqualsWithinMillionth("decode latitude", 52376504, point.getLatMicroDeg());
80-
assertEqualsWithinMillionth("decode longitude", 4908535, point.getLonMicroDeg());
73+
assertEquals("decode latitude", 52376504, point.getLatMicroDeg());
74+
assertEquals("decode longitude", 4908535, point.getLonMicroDeg());
8175
}
8276

8377
@Test
8478
public void decodeFullInternationalMapcode() throws Exception {
8579
LOG.info("decodeFullInternationalMapcode");
8680
final Point point = MapcodeCodec.decode("VHXGB.1J9J");
87-
assertEqualsWithinMillionth("decode latitude", 52376504, point.getLatMicroDeg());
88-
assertEqualsWithinMillionth("decode longitude", 4908535, point.getLonMicroDeg());
81+
assertEquals("decode latitude", 52376504, point.getLatMicroDeg());
82+
assertEquals("decode longitude", 4908535, point.getLonMicroDeg());
8983
}
9084

9185
@Test
9286
public void highPrecisionMapcodeWithTerritory() throws Exception {
9387
LOG.info("highPrecisionMapcodeWithTerritory");
9488
final Point point = MapcodeCodec.decode("49.4V-K2", Territory.NLD);
95-
assertEqualsWithinMillionth("decode hi-precision latitude", 52376512, point.getLatMicroDeg());
96-
assertEqualsWithinMillionth("decode hi-precision longitude", 4908540, point.getLonMicroDeg());
89+
assertEquals("decode hi-precision latitude", 52376512, point.getLatMicroDeg());
90+
assertEquals("decode hi-precision longitude", 4908540, point.getLonMicroDeg());
9791
}
9892

9993
@Test
10094
public void highPrecisionFullMapcode() throws Exception {
10195
LOG.info("highPrecisionFullMapcode");
10296
Point point = MapcodeCodec.decode("NLD 49.4V-K2");
103-
assertEqualsWithinMillionth("decode hi-precision latitude", 52376512, point.getLatMicroDeg());
104-
assertEqualsWithinMillionth("decode hi-precision longitude", 4908540, point.getLonMicroDeg());
97+
assertEquals("decode hi-precision latitude", 52376512, point.getLatMicroDeg());
98+
assertEquals("decode hi-precision longitude", 4908540, point.getLonMicroDeg());
10599
point = MapcodeCodec.decode("NLD P42.NB1-0");
106100
assertEquals("decode 8-precision latitude", 51999954, point.getLatMicroDeg());
107101
assertEquals("decode 8-precision longitude", 4999900, point.getLonMicroDeg());
@@ -117,44 +111,44 @@ public void highPrecisionFullMapcode() throws Exception {
117111
public void highPrecisionUnicodeAthensAcropolis1() throws Exception {
118112
LOG.info("highPrecisionUnicodeAthensAcropolis1");
119113
final Point point = MapcodeCodec.decode("\u0397\u03a0.\u03982-\u03a62", Territory.GRC);
120-
assertEqualsWithinMillionth("decodeUnicode latitude", 37971844, point.getLatMicroDeg());
121-
assertEqualsWithinMillionth("decodeUnicode longitude", 23726223,
114+
assertEquals("decodeUnicode latitude", 37971843, point.getLatMicroDeg());
115+
assertEquals("decodeUnicode longitude", 23726223,
122116
point.getLonMicroDeg());
123117
}
124118

125119
@Test
126120
public void highPrecisionUnicodeAthensAcropolis2() throws Exception {
127121
LOG.info("highPrecisionUnicodeAthensAcropolis2");
128122
final Point point = MapcodeCodec.decode("GRC \u0397\u03a0.\u03982-\u03a62");
129-
assertEqualsWithinMillionth("decodeUnicode latitude", 37971844, point.getLatMicroDeg());
130-
assertEqualsWithinMillionth("decodeUnicode longitude", 23726223,
123+
assertEquals("decodeUnicode latitude", 37971843, point.getLatMicroDeg());
124+
assertEquals("decodeUnicode longitude", 23726223,
131125
point.getLonMicroDeg());
132126
}
133127

134128
@Test
135129
public void unicodeMapcodeAthensAcropolis1() throws Exception {
136130
LOG.info("unicodeMapcodeAthensAcropolis1");
137131
final Point point = MapcodeCodec.decode("\u0397\u03a0.\u03982", Territory.GRC);
138-
assertEqualsWithinMillionth("decodeUnicode latitude", 37971812, point.getLatMicroDeg());
139-
assertEqualsWithinMillionth("decodeUnicode longitude", 23726247,
132+
assertEquals("decodeUnicode latitude", 37971812, point.getLatMicroDeg());
133+
assertEquals("decodeUnicode longitude", 23726247,
140134
point.getLonMicroDeg());
141135
}
142136

143137
@Test
144138
public void unicodeMapcodeAthensAcropolis2() throws Exception {
145139
LOG.info("unicodeMapcodeAthensAcropolis2");
146140
final Point point = MapcodeCodec.decode("GRC \u0397\u03a0.\u03982");
147-
assertEqualsWithinMillionth("decodeUnicode latitude", 37971812, point.getLatMicroDeg());
148-
assertEqualsWithinMillionth("decodeUnicode longitude", 23726247,
141+
assertEquals("decodeUnicode latitude", 37971812, point.getLatMicroDeg());
142+
assertEquals("decodeUnicode longitude", 23726247,
149143
point.getLonMicroDeg());
150144
}
151145

152146
@Test
153147
public void unicodeMapcodeAthensAcropolis3() throws Exception {
154148
LOG.info("unicodeMapcodeAthensAcropolis3");
155149
final Point point = MapcodeCodec.decode("\u0393\u03a8\u039e \u0397\u03a0.\u03982");
156-
assertEqualsWithinMillionth("decodeUnicode latitude", 37971812, point.getLatMicroDeg());
157-
assertEqualsWithinMillionth("decodeUnicode longitude", 23726247,
150+
assertEquals("decodeUnicode latitude", 37971812, point.getLatMicroDeg());
151+
assertEquals("decodeUnicode longitude", 23726247,
158152
point.getLonMicroDeg());
159153
}
160154

@@ -163,47 +157,47 @@ public void unicodeMapcodeTokyoTower1() throws Exception {
163157
LOG.info("unicodeMapcodeTokyoTower1");
164158
final Point point = MapcodeCodec.decode("\u30c1\u30ca.8\u30c1",
165159
Territory.JPN);
166-
assertEqualsWithinMillionth("decodeUnicode latitude", 35658660, point.getLatMicroDeg());
167-
assertEqualsWithinMillionth("decodeUnicode longitude", 139745394,
160+
assertEquals("decodeUnicode latitude", 35658660, point.getLatMicroDeg());
161+
assertEquals("decodeUnicode longitude", 139745394,
168162
point.getLonMicroDeg());
169163
}
170164

171165
@Test
172166
public void unicodeMapcodeTokyoTower2() throws Exception {
173167
LOG.info("unicodeMapcodeTokyoTower2");
174168
final Point point = MapcodeCodec.decode("JPN \u30c1\u30ca.8\u30c1");
175-
assertEqualsWithinMillionth("decodeUnicode latitude", 35658660, point.getLatMicroDeg());
176-
assertEqualsWithinMillionth("decodeUnicode longitude", 139745394,
169+
assertEquals("decodeUnicode latitude", 35658660, point.getLatMicroDeg());
170+
assertEquals("decodeUnicode longitude", 139745394,
177171
point.getLonMicroDeg());
178172
}
179173

180174
@Test
181175
public void mapCodeWithZeroGroitzsch() throws Exception {
182176
LOG.info("mapCodeWithZeroGroitzsch");
183177
final Point point = MapcodeCodec.decode("HMVM.3Q0", Territory.DEU);
184-
assertEqualsWithinMillionth("decodeUnicode latitude", 51154852, point.getLatMicroDeg());
185-
assertEqualsWithinMillionth("decodeUnicode longitude", 12278574,
178+
assertEquals("decodeUnicode latitude", 51154852, point.getLatMicroDeg());
179+
assertEquals("decodeUnicode longitude", 12278574,
186180
point.getLonMicroDeg());
187181
}
188182

189183
@Test
190184
public void validTerritory() throws Exception {
191185
LOG.info("validTerritory");
192186
final Point point0 = MapcodeCodec.decode("NLD 49.4V", null);
193-
assertEqualsWithinMillionth("decode latitude", 52376514, point0.getLatMicroDeg());
194-
assertEqualsWithinMillionth("decode longitude", 4908542, point0.getLonMicroDeg());
187+
assertEquals("decode latitude", 52376514, point0.getLatMicroDeg());
188+
assertEquals("decode longitude", 4908543, point0.getLonMicroDeg());
195189

196190
final Point point1 = MapcodeCodec.decode("NLD 49.4V", Territory.NLD);
197-
assertEqualsWithinMillionth("decode latitude", 52376514, point1.getLatMicroDeg());
198-
assertEqualsWithinMillionth("decode longitude", 4908542, point1.getLonMicroDeg());
191+
assertEquals("decode latitude", 52376514, point1.getLatMicroDeg());
192+
assertEquals("decode longitude", 4908543, point1.getLonMicroDeg());
199193

200194
final Point point2 = MapcodeCodec.decode("NLD 49.4V", Territory.USA);
201-
assertEqualsWithinMillionth("decode latitude", 52376514, point2.getLatMicroDeg());
202-
assertEqualsWithinMillionth("decode longitude", 4908542, point2.getLonMicroDeg());
195+
assertEquals("decode latitude", 52376514, point2.getLatMicroDeg());
196+
assertEquals("decode longitude", 4908543, point2.getLonMicroDeg());
203197

204198
final Point point3 = MapcodeCodec.decode("NLD 49.4V");
205-
assertEqualsWithinMillionth("decode latitude", 52376514, point3.getLatMicroDeg());
206-
assertEqualsWithinMillionth("decode longitude", 4908542, point3.getLonMicroDeg());
199+
assertEquals("decode latitude", 52376514, point3.getLatMicroDeg());
200+
assertEquals("decode longitude", 4908543, point3.getLonMicroDeg());
207201
}
208202

209203
@Test(expected = IllegalArgumentException.class)

0 commit comments

Comments
 (0)