Skip to content

Commit 2123b29

Browse files
rijnbrijnb
committed
Removed offending test cases pointing at changed data in data file
1 parent c1e537a commit 2123b29

File tree

2 files changed

+249
-387
lines changed

2 files changed

+249
-387
lines changed

‎src/test/scala/com/mapcode/scala/CommonTest.scala‎

Lines changed: 70 additions & 139 deletions
Original file line numberDiff line numberDiff line change
@@ -113,150 +113,81 @@ class CommonTest extends FunSuite with Matchers with GeneratorDrivenPropertyChec
113113
implicit override val generatorDrivenConfig = PropertyCheckConfig(minSuccessful = 10000000)
114114
val codexGenerator = Gen.choose(0, DataAccess.FILE_DATA.length / 20 - 1)
115115
test("countCityCoordinatesForCountry") {
116-
Common.countCityCoordinatesForCountry(22, 5088, 4096) should equal(39)
117-
Common.countCityCoordinatesForCountry(22, 13643, 5116) should equal(6)
118-
Common.countCityCoordinatesForCountry(22, 11031, 3170) should equal(26)
116+
Common.countCityCoordinatesForCountry(13, 7567, 3625) should equal(3)
119117
Common.countCityCoordinatesForCountry(13, 11118, 3257) should equal(3)
120-
Common.countCityCoordinatesForCountry(22, 6529, 2129) should equal(26)
121-
Common.countCityCoordinatesForCountry(13, 15899, 6295) should equal(3)
122-
Common.countCityCoordinatesForCountry(22, 12371, 5200) should equal(4)
123-
Common.countCityCoordinatesForCountry(22, 7209, 1595) should equal(55)
124-
Common.countCityCoordinatesForCountry(22, 14691, 14165) should equal(14)
125-
Common.countCityCoordinatesForCountry(22, 9191, 3172) should equal(41)
126-
Common.countCityCoordinatesForCountry(22, 8773, 7115) should equal(41)
127-
Common.countCityCoordinatesForCountry(22, 13416, 1115) should equal(7)
128-
Common.countCityCoordinatesForCountry(22, 2485, 1207) should equal(39)
129-
Common.countCityCoordinatesForCountry(22, 8407, 1035) should equal(30)
130-
Common.countCityCoordinatesForCountry(22, 3006, 1818) should equal(29)
131-
Common.countCityCoordinatesForCountry(22, 6760, 5565) should equal(37)
132-
Common.countCityCoordinatesForCountry(22, 8982, 5425) should equal(44)
133-
Common.countCityCoordinatesForCountry(22, 7803, 1813) should equal(41)
134-
Common.countCityCoordinatesForCountry(22, 9809, 8892) should equal(10)
135-
Common.countCityCoordinatesForCountry(22, 13565, 3304) should equal(10)
136-
Common.countCityCoordinatesForCountry(22, 14109, 9389) should equal(9)
137-
Common.countCityCoordinatesForCountry(22, 9563, 3675) should equal(4)
138-
Common.countCityCoordinatesForCountry(22, 11859, 6481) should equal(11)
139-
Common.countCityCoordinatesForCountry(22, 7379, 1461) should equal(33)
140-
Common.countCityCoordinatesForCountry(22, 7242, 3825) should equal(55)
141-
Common.countCityCoordinatesForCountry(22, 8410, 5573) should equal(30)
142-
Common.countCityCoordinatesForCountry(22, 15595, 2801) should equal(17)
143-
Common.countCityCoordinatesForCountry(22, 8274, 6874) should equal(45)
144-
Common.countCityCoordinatesForCountry(22, 11862, 2747) should equal(11)
145-
Common.countCityCoordinatesForCountry(22, 11308, 5999) should equal(38)
146-
Common.countCityCoordinatesForCountry(22, 16062, 1661) should equal(13)
147-
Common.countCityCoordinatesForCountry(22, 6034, 2646) should equal(30)
148-
Common.countCityCoordinatesForCountry(22, 13104, 10731) should equal(13)
149-
Common.countCityCoordinatesForCountry(22, 15609, 724) should equal(17)
150-
Common.countCityCoordinatesForCountry(22, 12566, 10724) should equal(7)
151-
Common.countCityCoordinatesForCountry(22, 2407, 952) should equal(37)
152-
Common.countCityCoordinatesForCountry(22, 10800, 5554) should equal(7)
153-
Common.countCityCoordinatesForCountry(22, 9851, 8454) should equal(29)
154-
Common.countCityCoordinatesForCountry(22, 6354, 3387) should equal(24)
155-
Common.countCityCoordinatesForCountry(22, 8910, 373) should equal(32)
156-
Common.countCityCoordinatesForCountry(22, 15364, 6092) should equal(7)
157-
Common.countCityCoordinatesForCountry(22, 12689, 12575) should equal(5)
158-
Common.countCityCoordinatesForCountry(13, 15542, 8007) should equal(3)
159-
Common.countCityCoordinatesForCountry(22, 8696, 7465) should equal(38)
160-
Common.countCityCoordinatesForCountry(22, 9226, 5884) should equal(40)
161-
Common.countCityCoordinatesForCountry(13, 15541, 13067) should equal(3)
162-
Common.countCityCoordinatesForCountry(22, 11313, 5852) should equal(38)
163-
Common.countCityCoordinatesForCountry(22, 15031, 11507) should equal(10)
118+
Common.countCityCoordinatesForCountry(21, 10681, 6222) should equal(2)
119+
Common.countCityCoordinatesForCountry(22, 1532, 908) should equal(53)
120+
Common.countCityCoordinatesForCountry(22, 2056, 667) should equal(23)
121+
Common.countCityCoordinatesForCountry(22, 2407, 952) should equal(37)
122+
Common.countCityCoordinatesForCountry(22, 2485, 1207) should equal(39)
123+
Common.countCityCoordinatesForCountry(22, 2740, 365) should equal(50)
124+
Common.countCityCoordinatesForCountry(22, 3006, 1818) should equal(29)
125+
Common.countCityCoordinatesForCountry(22, 3101, 2432) should equal(42)
126+
Common.countCityCoordinatesForCountry(22, 3130, 2961) should equal(42)
127+
Common.countCityCoordinatesForCountry(22, 3422, 2894) should equal(30)
128+
Common.countCityCoordinatesForCountry(22, 4552, 4259) should equal(28)
129+
Common.countCityCoordinatesForCountry(22, 5088, 4096) should equal(39)
130+
Common.countCityCoordinatesForCountry(22, 5152, 5098) should equal(16)
131+
Common.countCityCoordinatesForCountry(22, 5301, 3881) should equal(28)
132+
Common.countCityCoordinatesForCountry(22, 5411, 1741) should equal(43)
133+
Common.countCityCoordinatesForCountry(22, 5539, 2753) should equal(45)
134+
Common.countCityCoordinatesForCountry(22, 5664, 1116) should equal(41)
135+
Common.countCityCoordinatesForCountry(22, 5832, 2313) should equal(39)
136+
Common.countCityCoordinatesForCountry(22, 6034, 2646) should equal(30)
137+
Common.countCityCoordinatesForCountry(22, 6191, 595) should equal(42)
138+
Common.countCityCoordinatesForCountry(22, 6304, 4328) should equal(28)
139+
Common.countCityCoordinatesForCountry(22, 6354, 3387) should equal(24)
140+
Common.countCityCoordinatesForCountry(22, 6529, 2129) should equal(26)
141+
Common.countCityCoordinatesForCountry(22, 6580, 2617) should equal(43)
142+
Common.countCityCoordinatesForCountry(22, 6760, 5565) should equal(37)
143+
Common.countCityCoordinatesForCountry(22, 6813, 6687) should equal(42)
144+
Common.countCityCoordinatesForCountry(22, 6817, 6158) should equal(42)
145+
Common.countCityCoordinatesForCountry(22, 7209, 1595) should equal(55)
146+
Common.countCityCoordinatesForCountry(22, 7242, 3825) should equal(55)
147+
Common.countCityCoordinatesForCountry(22, 7379, 1461) should equal(33)
148+
Common.countCityCoordinatesForCountry(22, 7573, 82) should equal(31)
149+
Common.countCityCoordinatesForCountry(22, 7733, 7295) should equal(47)
150+
Common.countCityCoordinatesForCountry(22, 7803, 1813) should equal(41)
151+
Common.countCityCoordinatesForCountry(22, 8104, 268) should equal(49)
152+
Common.countCityCoordinatesForCountry(22, 8249, 3764) should equal(45)
153+
Common.countCityCoordinatesForCountry(22, 8274, 6874) should equal(45)
154+
Common.countCityCoordinatesForCountry(22, 8407, 1035) should equal(30)
155+
Common.countCityCoordinatesForCountry(22, 8410, 5573) should equal(30)
156+
Common.countCityCoordinatesForCountry(22, 8419, 4698) should equal(30)
157+
Common.countCityCoordinatesForCountry(22, 8435, 1489) should equal(30)
158+
Common.countCityCoordinatesForCountry(22, 8684, 1123) should equal(38)
159+
Common.countCityCoordinatesForCountry(22, 8696, 7465) should equal(38)
160+
Common.countCityCoordinatesForCountry(22, 8697, 643) should equal(38)
161+
Common.countCityCoordinatesForCountry(22, 8773, 7115) should equal(41)
162+
Common.countCityCoordinatesForCountry(22, 8845, 4763) should equal(39)
163+
Common.countCityCoordinatesForCountry(22, 8910, 373) should equal(32)
164+
Common.countCityCoordinatesForCountry(22, 8982, 5425) should equal(44)
165+
Common.countCityCoordinatesForCountry(22, 9191, 3172) should equal(41)
166+
Common.countCityCoordinatesForCountry(22, 9226, 5884) should equal(40)
167+
Common.countCityCoordinatesForCountry(22, 9563, 3675) should equal(4)
168+
Common.countCityCoordinatesForCountry(22, 9604, 8890) should equal(5)
169+
Common.countCityCoordinatesForCountry(22, 9631, 62) should equal(8)
170+
Common.countCityCoordinatesForCountry(22, 9768, 6331) should equal(4)
171+
Common.countCityCoordinatesForCountry(22, 9809, 8892) should equal(10)
172+
Common.countCityCoordinatesForCountry(22, 9813, 2747) should equal(10)
173+
Common.countCityCoordinatesForCountry(22, 9844, 4740) should equal(29)
174+
Common.countCityCoordinatesForCountry(22, 9847, 6561) should equal(29)
175+
Common.countCityCoordinatesForCountry(22, 9851, 8454) should equal(29)
176+
Common.countCityCoordinatesForCountry(22, 9953, 7481) should equal(48)
177+
Common.countCityCoordinatesForCountry(22, 10251, 7830) should equal(89)
178+
Common.countCityCoordinatesForCountry(22, 10270, 3740) should equal(89)
164179
Common.countCityCoordinatesForCountry(22, 10280, 6680) should equal(89)
165-
Common.countCityCoordinatesForCountry(22, 14571, 7751) should equal(5)
166-
Common.countCityCoordinatesForCountry(22, 12479, 2517) should equal(6)
167-
Common.countCityCoordinatesForCountry(22, 11581, 4544) should equal(35)
168-
Common.countCityCoordinatesForCountry(22, 10714, 790) should equal(33)
169-
Common.countCityCoordinatesForCountry(22, 5539, 2753) should equal(45)
170-
Common.countCityCoordinatesForCountry(22, 12430, 3858) should equal(12)
171-
Common.countCityCoordinatesForCountry(22, 3422, 2894) should equal(30)
172-
Common.countCityCoordinatesForCountry(22, 13036, 10147) should equal(5)
173-
Common.countCityCoordinatesForCountry(22, 12074, 9428) should equal(6)
174-
Common.countCityCoordinatesForCountry(22, 15268, 6288) should equal(7)
175-
Common.countCityCoordinatesForCountry(22, 15768, 8736) should equal(15)
176-
Common.countCityCoordinatesForCountry(22, 8435, 1489) should equal(30)
177-
Common.countCityCoordinatesForCountry(22, 9604, 8890) should equal(5)
178-
Common.countCityCoordinatesForCountry(22, 6580, 2617) should equal(43)
179-
Common.countCityCoordinatesForCountry(22, 8104, 268) should equal(49)
180-
Common.countCityCoordinatesForCountry(22, 15432, 7001) should equal(9)
181-
Common.countCityCoordinatesForCountry(22, 15324, 10003) should equal(7)
182-
Common.countCityCoordinatesForCountry(13, 7567, 3625) should equal(3)
180+
Common.countCityCoordinatesForCountry(22, 10481, 8974) should equal(9)
181+
Common.countCityCoordinatesForCountry(22, 10569, 8531) should equal(22)
183182
Common.countCityCoordinatesForCountry(22, 10600, 6625) should equal(13)
184-
Common.countCityCoordinatesForCountry(22, 16056, 12250) should equal(13)
185-
Common.countCityCoordinatesForCountry(22, 11392, 724) should equal(44)
186-
Common.countCityCoordinatesForCountry(22, 13942, 4233) should equal(34)
187-
Common.countCityCoordinatesForCountry(22, 14917, 14784) should equal(13)
188-
Common.countCityCoordinatesForCountry(22, 15511, 11371) should equal(16)
189-
Common.countCityCoordinatesForCountry(22, 3130, 2961) should equal(42)
190-
Common.countCityCoordinatesForCountry(22, 9844, 4740) should equal(29)
191-
Common.countCityCoordinatesForCountry(22, 13035, 509) should equal(5)
192-
Common.countCityCoordinatesForCountry(22, 15928, 5370) should equal(11)
193-
Common.countCityCoordinatesForCountry(22, 5152, 5098) should equal(16)
194-
Common.countCityCoordinatesForCountry(22, 7573, 82) should equal(31)
195-
Common.countCityCoordinatesForCountry(22, 5664, 1116) should equal(41)
196-
Common.countCityCoordinatesForCountry(22, 6813, 6687) should equal(42)
197183
Common.countCityCoordinatesForCountry(22, 10615, 3984) should equal(19)
198-
Common.countCityCoordinatesForCountry(22, 14772, 1711) should equal(9)
199-
Common.countCityCoordinatesForCountry(22, 6191, 595) should equal(42)
200-
Common.countCityCoordinatesForCountry(22, 5301, 3881) should equal(28)
201-
Common.countCityCoordinatesForCountry(22, 2740, 365) should equal(50)
202-
Common.countCityCoordinatesForCountry(22, 9631, 62) should equal(8)
203-
Common.countCityCoordinatesForCountry(22, 14115, 4861) should equal(9)
204-
Common.countCityCoordinatesForCountry(22, 14596, 257) should equal(9)
205-
Common.countCityCoordinatesForCountry(22, 9813, 2747) should equal(10)
206-
Common.countCityCoordinatesForCountry(22, 10481, 8974) should equal(9)
207-
Common.countCityCoordinatesForCountry(22, 13657, 3926) should equal(28)
208-
Common.countCityCoordinatesForCountry(22, 15797, 13445) should equal(19)
209-
Common.countCityCoordinatesForCountry(22, 14665, 11311) should equal(6)
210-
Common.countCityCoordinatesForCountry(22, 8419, 4698) should equal(30)
211-
Common.countCityCoordinatesForCountry(22, 1532, 908) should equal(53)
212-
Common.countCityCoordinatesForCountry(22, 14713, 11355) should equal(12)
213-
Common.countCityCoordinatesForCountry(22, 15639, 12830) should equal(11)
214-
Common.countCityCoordinatesForCountry(22, 8697, 643) should equal(38)
215-
Common.countCityCoordinatesForCountry(22, 14865, 5846) should equal(11)
216-
Common.countCityCoordinatesForCountry(22, 15650, 10512) should equal(10)
217-
Common.countCityCoordinatesForCountry(22, 10251, 7830) should equal(89)
218-
Common.countCityCoordinatesForCountry(22, 15958, 15217) should equal(12)
219-
Common.countCityCoordinatesForCountry(22, 15165, 8865) should equal(9)
220-
Common.countCityCoordinatesForCountry(22, 14680, 1122) should equal(14)
221-
Common.countCityCoordinatesForCountry(22, 6817, 6158) should equal(42)
222-
Common.countCityCoordinatesForCountry(22, 14291, 3140) should equal(3)
223-
Common.countCityCoordinatesForCountry(22, 15201, 12196) should equal(8)
224-
Common.countCityCoordinatesForCountry(22, 14465, 13504) should equal(5)
184+
Common.countCityCoordinatesForCountry(22, 10714, 790) should equal(33)
185+
Common.countCityCoordinatesForCountry(22, 10800, 5554) should equal(7)
186+
Common.countCityCoordinatesForCountry(22, 11031, 3170) should equal(26)
225187
Common.countCityCoordinatesForCountry(22, 11225, 1158) should equal(26)
226-
Common.countCityCoordinatesForCountry(21, 10681, 6222) should equal(2)
227-
Common.countCityCoordinatesForCountry(22, 11502, 4025) should equal(41)
228-
Common.countCityCoordinatesForCountry(22, 10569, 8531) should equal(22)
229-
Common.countCityCoordinatesForCountry(22, 7733, 7295) should equal(47)
230-
Common.countCityCoordinatesForCountry(13, 12564, 2568) should equal(2)
231-
Common.countCityCoordinatesForCountry(22, 15860, 4470) should equal(11)
232-
Common.countCityCoordinatesForCountry(22, 8249, 3764) should equal(45)
233-
Common.countCityCoordinatesForCountry(22, 9768, 6331) should equal(4)
234-
Common.countCityCoordinatesForCountry(22, 15430, 737) should equal(9)
235-
Common.countCityCoordinatesForCountry(22, 15324, 8866) should equal(7)
236-
Common.countCityCoordinatesForCountry(22, 15669, 12595) should equal(14)
237-
Common.countCityCoordinatesForCountry(22, 2056, 667) should equal(23)
238-
Common.countCityCoordinatesForCountry(22, 10270, 3740) should equal(89)
239-
Common.countCityCoordinatesForCountry(22, 14615, 2342) should equal(5)
240-
Common.countCityCoordinatesForCountry(22, 5411, 1741) should equal(43)
241-
Common.countCityCoordinatesForCountry(22, 3101, 2432) should equal(42)
242-
Common.countCityCoordinatesForCountry(22, 13996, 6449) should equal(31)
243-
Common.countCityCoordinatesForCountry(22, 14573, 11871) should equal(5)
244-
Common.countCityCoordinatesForCountry(22, 14582, 2362) should equal(7)
245-
Common.countCityCoordinatesForCountry(22, 5832, 2313) should equal(39)
246-
Common.countCityCoordinatesForCountry(22, 15484, 7958) should equal(10)
247-
Common.countCityCoordinatesForCountry(22, 11676, 3439) should equal(16)
248-
Common.countCityCoordinatesForCountry(22, 15018, 1786) should equal(7)
249-
Common.countCityCoordinatesForCountry(22, 15723, 577) should equal(10)
250-
Common.countCityCoordinatesForCountry(22, 8684, 1123) should equal(38)
251-
Common.countCityCoordinatesForCountry(22, 11746, 1450) should equal(37)
252-
Common.countCityCoordinatesForCountry(22, 4552, 4259) should equal(28)
253-
Common.countCityCoordinatesForCountry(22, 6304, 4328) should equal(28)
188+
Common.countCityCoordinatesForCountry(22, 11308, 5999) should equal(38)
254189
Common.countCityCoordinatesForCountry(22, 11309, 8680) should equal(38)
255-
Common.countCityCoordinatesForCountry(22, 8845, 4763) should equal(39)
256-
Common.countCityCoordinatesForCountry(22, 15191, 4681) should equal(7)
257-
Common.countCityCoordinatesForCountry(22, 14776, 11995) should equal(9)
258-
Common.countCityCoordinatesForCountry(22, 9953, 7481) should equal(48)
259-
Common.countCityCoordinatesForCountry(22, 13542, 4447) should equal(7)
260-
Common.countCityCoordinatesForCountry(22, 9847, 6561) should equal(29)
190+
Common.countCityCoordinatesForCountry(22, 11313, 5852) should equal(38)
191+
Common.countCityCoordinatesForCountry(22, 11392, 724) should equal(44)
261192
}
262193
}

0 commit comments

Comments
 (0)