From 26174dda221dfb3b62294a2dc73df61b9d922622 Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Sun, 6 Dec 2015 14:53:17 +0100 Subject: [PATCH] Fixture to fulfill the tests needs --- test/fixtures/geocoder_api_test_dataset.csv | 268 +------------------- test/integration/test_admin0_functions.py | 4 +- 2 files changed, 5 insertions(+), 267 deletions(-) diff --git a/test/fixtures/geocoder_api_test_dataset.csv b/test/fixtures/geocoder_api_test_dataset.csv index 3b65446..b27327b 100644 --- a/test/fixtures/geocoder_api_test_dataset.csv +++ b/test/fixtures/geocoder_api_test_dataset.csv @@ -1,265 +1,3 @@ -iso,name -AF,Afghanistan -AL,Albania -DZ,Algeria -AS,"American Samoa" -AD,Andorra -AO,Angola -AI,Anguilla -AQ,Antarctica -AG,"Antigua and Barbuda" -AR,Argentina -AM,Armenia -AW,Aruba -AU,Australia -AT,Austria -AZ,Azerbaijan -BS,Bahamas -BH,Bahrain -BD,Bangladesh -BB,Barbados -BY,Belarus -BE,Belgium -BZ,Belize -BJ,Benin -BM,Bermuda -BT,Bhutan -BO,Bolivia -BA,"Bosnia and Herzegovina" -BW,Botswana -BV,"Bouvet Island" -BR,Brazil -BQ,"British Antarctic Territory" -IO,"British Indian Ocean Territory" -VG,"British Virgin Islands" -BN,Brunei -BG,Bulgaria -BF,"Burkina Faso" -BI,Burundi -KH,Cambodia -CM,Cameroon -CA,Canada -CT,"Canton and Enderbury Islands" -CV,"Cape Verde" -KY,"Cayman Islands" -CF,"Central African Republic" -TD,Chad -CL,Chile -CN,China -CX,"Christmas Island" -CC,"Cocos [Keeling] Islands" -CO,Colombia -KM,Comoros -CG,"Congo - Brazzaville" -CD,"Congo - Kinshasa" -CK,"Cook Islands" -CR,"Costa Rica" -HR,Croatia -CU,Cuba -CY,Cyprus -CZ,"Czech Republic" -CI,"Côte d’Ivoire" -DK,Denmark -DJ,Djibouti -DM,Dominica -DO,"Dominican Republic" -NQ,"Dronning Maud Land" -DD,"East Germany" -EC,Ecuador -EG,Egypt -SV,"El Salvador" -GQ,"Equatorial Guinea" -ER,Eritrea -EE,Estonia -ET,Ethiopia -FK,"Falkland Islands" -FO,"Faroe Islands" -FJ,Fiji -FI,Finland -FR,France -GF,"French Guiana" -PF,"French Polynesia" -TF,"French Southern Territories" -FQ,"French Southern and Antarctic Territories" -GA,Gabon -GM,Gambia -GE,Georgia -DE,Germany -GH,Ghana -GI,Gibraltar -GR,Greece -GL,Greenland -GD,Grenada -GP,Guadeloupe -GU,Guam -GT,Guatemala -GG,Guernsey -GN,Guinea -GW,Guinea-Bissau -GY,Guyana -HT,Haiti -HM,"Heard Island and McDonald Islands" -HN,Honduras -HK,"Hong Kong SAR China" -HU,Hungary -IS,Iceland -IN,India -ID,Indonesia -IR,Iran -IQ,Iraq -IE,Ireland -IM,"Isle of Man" -IL,Israel -IT,Italy -JM,Jamaica -JP,Japan -JE,Jersey -JT,"Johnston Island" -JO,Jordan -KZ,Kazakhstan -KE,Kenya -KI,Kiribati -KW,Kuwait -KG,Kyrgyzstan -LA,Laos -LV,Latvia -LB,Lebanon -LS,Lesotho -LR,Liberia -LY,Libya -LI,Liechtenstein -LT,Lithuania -LU,Luxembourg -MO,"Macau SAR China" -MK,Macedonia -MG,Madagascar -MW,Malawi -MY,Malaysia -MV,Maldives -ML,Mali -MT,Malta -MH,"Marshall Islands" -MQ,Martinique -MR,Mauritania -MU,Mauritius -YT,Mayotte -FX,"Metropolitan France" -MX,Mexico -FM,Micronesia -MI,"Midway Islands" -MD,Moldova -MC,Monaco -MN,Mongolia -ME,Montenegro -MS,Montserrat -MA,Morocco -MZ,Mozambique -MM,"Myanmar [Burma]" -NA,Namibia -NR,Nauru -NP,Nepal -NL,Netherlands -AN,"Netherlands Antilles" -NT,"Neutral Zone" -NC,"New Caledonia" -NZ,"New Zealand" -NI,Nicaragua -NE,Niger -NG,Nigeria -NU,Niue -NF,"Norfolk Island" -KP,"North Korea" -VD,"North Vietnam" -MP,"Northern Mariana Islands" -NO,Norway -OM,Oman -PC,"Pacific Islands Trust Territory" -PK,Pakistan -PW,Palau -PS,"Palestinian Territories" -PA,Panama -PZ,"Panama Canal Zone" -PG,"Papua New Guinea" -PY,Paraguay -YD,"People's Democratic Republic of Yemen" -PE,Peru -PH,Philippines -PN,"Pitcairn Islands" -PL,Poland -PT,Portugal -PR,"Puerto Rico" -QA,Qatar -RO,Romania -RU,Russia -RW,Rwanda -RE,Réunion -BL,"Saint Barthélemy" -SH,"Saint Helena" -KN,"Saint Kitts and Nevis" -LC,"Saint Lucia" -MF,"Saint Martin" -PM,"Saint Pierre and Miquelon" -VC,"Saint Vincent and the Grenadines" -WS,Samoa -SM,"San Marino" -SA,"Saudi Arabia" -SN,Senegal -RS,Serbia -CS,"Serbia and Montenegro" -SC,Seychelles -SL,"Sierra Leone" -SG,Singapore -SK,Slovakia -SI,Slovenia -SB,"Solomon Islands" -SO,Somalia -ZA,"South Africa" -GS,"South Georgia and the South Sandwich Islands" -KR,"South Korea" -ES,Spain -LK,"Sri Lanka" -SD,Sudan -SR,Suriname -SJ,"Svalbard and Jan Mayen" -SZ,Swaziland -SE,Sweden -CH,Switzerland -SY,Syria -ST,"São Tomé and Príncipe" -TW,Taiwan -TJ,Tajikistan -TZ,Tanzania -TH,Thailand -TL,Timor-Leste -TG,Togo -TK,Tokelau -TO,Tonga -TT,"Trinidad and Tobago" -TN,Tunisia -TR,Turkey -TM,Turkmenistan -TC,"Turks and Caicos Islands" -TV,Tuvalu -UM,"U.S. Minor Outlying Islands" -PU,"U.S. Miscellaneous Pacific Islands" -VI,"U.S. Virgin Islands" -UG,Uganda -UA,Ukraine -SU,"Union of Soviet Socialist Republics" -AE,"United Arab Emirates" -GB,"United Kingdom" -US,"United States" -ZZ,"Unknown or Invalid Region" -UY,Uruguay -UZ,Uzbekistan -VU,Vanuatu -VA,"Vatican City" -VE,Venezuela -VN,Vietnam -WK,"Wake Island" -WF,"Wallis and Futuna" -EH,"Western Sahara" -YE,Yemen -ZM,Zambia -ZW,Zimbabwe -AX,"Åland Islands" +id,country,province,city,postalcode,ip +1,Spain,Castilla y León,Valladolid,47010,8.8.8.8 +2,USA,New York,Manhattn,10001,8.8.8.8 \ No newline at end of file diff --git a/test/integration/test_admin0_functions.py b/test/integration/test_admin0_functions.py index cb34171..ff8912a 100644 --- a/test/integration/test_admin0_functions.py +++ b/test/integration/test_admin0_functions.py @@ -15,7 +15,7 @@ class TestAdmin0Functions(TestCase): ) def test_if_select_with_admin0_is_ok(self): - query = "SELECT cdb_geocode_admin0_polygon(name) as geometry " \ + query = "SELECT cdb_geocode_admin0_polygon(country) as geometry " \ "FROM {0} LIMIT 1&api_key={1}".format( self.env_variables['table_name'], self.env_variables['api_key']) @@ -23,7 +23,7 @@ class TestAdmin0Functions(TestCase): assert_not_equal(geometry, None) def test_if_select_with_admin0_without_api_key_raise_error(self): - query = "SELECT cdb_geocode_admin0_polygon(name) as geometry " \ + query = "SELECT cdb_geocode_admin0_polygon(country) as geometry " \ "FROM {0} LIMIT 1".format( self.env_variables['table_name']) try: