diff -r 000000000000 -r 2e3d3ce01487 tzservices/tzloc/test/unit/data/TzLocalizationTest.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tzservices/tzloc/test/unit/data/TzLocalizationTest.ini	Tue Feb 02 10:12:00 2010 +0200
@@ -0,0 +1,1453 @@
+# Test the reading of default cached zones
+# copied from resource file (need to keep in sync with both .rss and .rls)
+[DefaultCachedZones]
+
+default_home_zone_id = 2592
+default_zone_of_interest_id = 920
+
+
+# Test Time Zones for testing the reading of resource-defined time zones
+# copied from resource file
+[TestZone1]
+
+time_zone_id = 2592
+standard_name = Greenwich Mean Time
+daylight_name = British Summer Time
+short_standard_name = GMT
+short_daylight_name = BST
+number_of_cities = 3
+city_name1 = London
+city_group_id1 = 1
+city_name2 = Manchester
+city_group_id2 = 1
+city_name3 = Birmingham
+city_group_id3 = 0
+
+
+# copied from resource file - new addition
+[TestZone2]
+
+time_zone_id = 2728
+standard_name = Central European Time
+daylight_name = Central European Summer Time
+short_standard_name = CET
+short_daylight_name = CEST
+number_of_cities = 1
+city_name1 = Tirane
+city_group_id1 = 5
+
+
+# copied from resource file
+[TestZone3]
+
+time_zone_id = 2584
+standard_name = Western European Time
+daylight_name = Western European Summer Time
+short_standard_name = WET
+short_daylight_name = WEST
+number_of_cities = 2
+city_name1 = Lisbon
+city_group_id1 = 5
+city_name2 = Porto
+city_group_id2 = 5
+
+
+# copied from resource file
+[TestZone4]
+
+time_zone_id = 920
+standard_name = Pacific Standard Time
+daylight_name = Pacific Daylight Time
+short_standard_name = PST
+short_daylight_name = PDT
+number_of_cities = 4
+city_name1 = Los Angeles
+city_group_id1 = 2
+city_name2 = San Francisco
+city_group_id2 = 2
+city_name3 = Portland
+city_group_id3 = 3
+city_name4 = Seattle
+city_group_id4 = 4
+
+
+# copied from resource file - new addition
+[TestZone5]
+
+time_zone_id = 600
+standard_name = Central Standard Time
+daylight_name = Central Daylight Time
+short_standard_name = CST
+short_daylight_name = CDT
+number_of_cities = 1
+city_name1 = Chicago
+city_group_id1 = 7
+
+
+# copied from resource file
+[TestZone6]
+
+time_zone_id = 2488
+standard_name = Central European Time
+daylight_name = Central European Summer Time
+short_standard_name = CET
+short_daylight_name = CEST
+number_of_cities = 3
+city_name1 = Berlin
+city_group_id1 = 5
+city_name2 = Bonn
+city_group_id2 = 5
+city_name3 = Frankfurt
+city_group_id3 = 0
+	
+
+# copied from resource file
+[TestZone7]
+
+time_zone_id = 2656
+standard_name = Central European Time
+daylight_name = Central European Summer Time
+short_standard_name = CET
+short_daylight_name = CEST
+number_of_cities = 3
+city_name1 = Paris
+city_group_id1 = 5
+city_name2 = Nice
+city_group_id2 = 5
+city_name3 = Stockholm
+city_group_id3 = 5
+
+
+# copied from resource file
+[TestZone8]
+
+time_zone_id = 2208
+standard_name = Eastern Standard Time
+daylight_name = Eastern Standard Time
+short_standard_name = EST
+short_daylight_name = EST
+number_of_cities = 3
+city_name1 = Sydney
+city_group_id1 = 6
+city_name2 = Ballarat
+city_group_id2 = 0
+city_name3 = Canberra
+city_group_id3 = 6
+
+
+# copied from resource file - new addition
+[TestZone9]
+
+time_zone_id = 1928
+standard_name = 
+daylight_name = 
+short_standard_name = 
+short_daylight_name = 
+number_of_cities = 1
+city_name1 = Seoul
+city_group_id1 = 8
+
+
+# copied from resource file - new addition
+[TestZone10]
+
+time_zone_id = 1976
+standard_name = 
+daylight_name = 
+short_standard_name = 
+short_daylight_name = 
+number_of_cities = 1
+city_name1 = Tehran
+city_group_id1 = 8
+
+
+# copied from resource file - new addition
+[TestZone11]
+
+time_zone_id = 2904
+standard_name = 
+daylight_name = 
+short_standard_name = 
+short_daylight_name = 
+number_of_cities = 1
+city_name1 = Auckland
+city_group_id1 = 9
+
+
+# copied from resource file - new addition
+[TestZone12]
+
+time_zone_id = 2128
+standard_name = 
+daylight_name = 
+short_standard_name = 
+short_daylight_name = 
+number_of_cities = 1
+city_name1 = Stanley
+city_group_id1 = 10
+
+
+# copied from resource file - new addition
+[TestZone13]
+
+time_zone_id = 2704
+standard_name = Eastern European Summer
+daylight_name = Eastern European Summer Time
+short_standard_name = 
+short_daylight_name = 
+number_of_cities = 1
+city_name1 = Sofia
+city_group_id1 = 5
+
+
+
+# copied from resource file - new addition
+[TestZone14]
+
+time_zone_id = 1184
+standard_name = 
+daylight_name = 
+short_standard_name = 
+short_daylight_name = 
+number_of_cities = 1
+city_name1 = Rio Branco
+city_group_id1 = 11
+
+# copied from resource file - new addition
+[TestZone15]
+
+time_zone_id = 1320
+standard_name = Pacific Standard Time
+daylight_name = Pacific Daylight Time
+short_standard_name = PST
+short_daylight_name = PDT
+number_of_cities = 4
+city_name1 = Vancouver
+city_group_id1 = 128
+city_name2 = Burnaby
+city_group_id2 = 128
+city_name3 = Richmond
+city_group_id3 = 128
+city_name4 = Surrey
+city_group_id4 = 129
+
+
+# time zone that doesn't exist - should return KErrNotFound (-1)
+
+[TestZone16]
+
+time_zone_id = 666
+standard_name = Hell Standard Time
+daylight_name = Hell Daylight Time
+short_standard_name = HST
+short_daylight_name = HDT
+number_of_cities = 1
+city_name1 = Hell's Kitchen
+city_group_id1 = 0
+
+
+# For testing the reading of every time zone
+[AllZonesTest]
+
+number_of_zones = 15
+
+# For testing the reading of every city
+[AllCitiesTest]
+
+number_of_cities = 30
+
+# Test all cities with UTC offset - rely on TestZone [1-15] defined above
+[CitiesByUTCTest1]
+utc_offset = 60
+city_name1 = Berlin
+city_name2 = Bonn
+city_name3 = Frankfurt
+city_name4 = Nice
+city_name5 = Paris
+city_name6 = Stockholm
+city_name7 = Tirane
+
+[CitiesByUTCTest2]
+utc_offset = -480
+city_name1 = Burnaby
+city_name2 = Los Angeles
+city_name3 = Portland
+city_name4 = Richmond
+city_name5 = San Francisco
+city_name6 = Seattle
+city_name7 = Surrey
+city_name8 = Vancouver
+
+[CitiesByUTCTest3]
+utc_offset = 0
+city_name1 = Birmingham
+city_name2 = Lisbon
+city_name3 = London
+city_name4 = Manchester
+city_name5 = Porto
+
+# Test all timezones with UTC offset - rely on TestZone [1-6] defined above
+[TimeZonesByUTCTest1]
+utc_offset = 60
+standard_name1 = Central European Time
+standard_name2 = Central European Time
+standard_name3 = Central European Time
+
+[TimeZonesByUTCTest2]
+utc_offset = -480
+standard_name1 = Pacific Standard Time
+standard_name2 = Pacific Standard Time
+
+#how does the order get determined? //SX
+[TimeZonesByUTCTest3]
+utc_offset = 0
+standard_name1 = Greenwich Mean Time
+standard_name2 = Western European Time
+
+# Test cities to test the adding/removing of user-defined cities
+# Add a normal city - should succeed
+[TestCity1]
+
+city_name = Newcastle
+time_zone_id = 2592
+city_group_id = 1
+remove = true
+
+# Add/Remove another normal city to a different time zone- should succeed
+[TestCity2]
+
+city_name = Astoria
+time_zone_id = 920
+city_group_id = 3
+remove = true
+
+#Add/Remove a city without specifying a group id - should succeed
+[TestCity3]
+
+city_name = Saarbrucken
+time_zone_id = 2488
+city_group_id = 0
+remove = true
+
+# Add a city to a non-existent time zone - should leave with KErrNotFound (-1)
+[TestCity4]
+
+city_name = Newcastle
+time_zone_id = 65535
+city_group_id = 1
+remove = true
+
+# Add a city that already exists (in resource file) - should leave with KErrAlreadyExists (-11)
+[TestCity5]
+
+city_name = London
+time_zone_id = 2592
+city_group_id = 1
+remove = true
+
+# Add a city and don't remove it - for next test - should succeed
+[TestCity6]
+
+city_name = Newcastle
+time_zone_id = 2592
+city_group_id = 1
+remove = false
+
+# Add a city that already exists (in DB) - should leave with KErrAlreadyExists (-11)
+[TestCity7]
+
+city_name = Newcastle
+time_zone_id = 2592
+city_group_id = 0
+remove = true
+
+# Test groups for testing the reading of groups
+# copied from resource file
+[TestGroup1]
+
+city_group_id = 1
+city_group_name = United Kingdom
+number_of_cities = 2
+
+
+# copied from resource file
+[TestGroup2]
+
+city_group_id = 2
+city_group_name = California
+number_of_cities = 2
+
+# copied from resource file
+[TestGroup3]
+
+city_group_id = 3
+city_group_name = Oregon
+number_of_cities = 1
+
+# copied from resource file
+[TestGroup4]
+
+city_group_id = 4
+city_group_name = Washington
+number_of_cities = 1
+
+# copied from resource file
+[TestGroup5]
+
+city_group_id = 5
+city_group_name = Europe
+number_of_cities = 9
+
+# copied from resource file
+[TestGroup6]
+
+city_group_id = 6
+city_group_name = Australia
+number_of_cities = 2
+
+# copied from resource file - new addition
+[TestGroup7]
+
+city_group_id = 7
+city_group_name = Central Lakes
+number_of_cities = 1
+
+
+# copied from resource file - new addition
+[TestGroup8]
+
+city_group_id = 8
+city_group_name = Asia
+number_of_cities = 2
+
+
+# copied from resource file - new addition
+[TestGroup9]
+
+city_group_id = 9
+city_group_name = New Zealand
+number_of_cities = 1
+
+
+# copied from resource file - new addition
+[TestGroup10]
+
+city_group_id = 10
+city_group_name = Atlantic
+number_of_cities = 1
+
+
+# copied from resource file - new addition
+[TestGroup11]
+
+city_group_id = 11
+city_group_name = Acre
+number_of_cities = 1
+
+#New groups added to resource file, to test support 127+ groups. Used by AllGroupsTest
+[TestGroup12]
+city_group_id = 12
+city_group_name = 
+
+[TestGroup13]
+city_group_id = 13
+city_group_name = 
+
+
+[TestGroup14]
+city_group_id = 14
+city_group_name = 
+
+[TestGroup15]
+city_group_id = 15
+city_group_name =
+
+[TestGroup16]
+city_group_id = 16
+city_group_name = 
+
+[TestGroup17]
+city_group_id = 17
+city_group_name = 
+
+
+[TestGroup18]
+city_group_id = 18
+city_group_name = 
+
+[TestGroup19]
+city_group_id = 19
+city_group_name = 
+
+[TestGroup20]
+city_group_id = 20
+city_group_name = 
+
+[TestGroup21]
+city_group_id = 21
+city_group_name = 
+
+[TestGroup22]
+city_group_id = 22
+city_group_name = 
+
+[TestGroup23]
+city_group_id = 23
+city_group_name = 
+
+[TestGroup24]
+city_group_id = 24
+city_group_name = 
+
+[TestGroup25]
+city_group_id = 25
+city_group_name =
+
+[TestGroup26]
+city_group_id = 26
+city_group_name = 
+
+[TestGroup27]
+city_group_id = 27
+city_group_name = 
+
+[TestGroup28]
+city_group_id = 28
+city_group_name = 
+
+[TestGroup29]
+city_group_id = 29
+city_group_name = 
+
+[TestGroup30]
+city_group_id = 30
+city_group_name = 
+
+[TestGroup31]
+city_group_id = 31
+city_group_name = 
+
+[TestGroup32]
+city_group_id = 32
+city_group_name = 
+
+[TestGroup33]
+city_group_id = 33
+city_group_name = 
+
+[TestGroup34]
+city_group_id = 34
+city_group_name = 
+
+[TestGroup35]
+city_group_id = 35
+city_group_name =
+
+[TestGroup36]
+city_group_id = 36
+city_group_name = 
+
+[TestGroup37]
+city_group_id = 37
+city_group_name = 
+
+[TestGroup38]
+city_group_id = 38
+city_group_name = 
+
+[TestGroup39]
+city_group_id = 39
+city_group_name = 
+
+[TestGroup40]
+city_group_id = 40
+city_group_name = 
+
+[TestGroup41]
+city_group_id = 41
+city_group_name = 
+
+[TestGroup42]
+city_group_id = 42
+city_group_name = 
+
+[TestGroup43]
+city_group_id = 43
+city_group_name = 
+
+[TestGroup44]
+city_group_id = 44
+city_group_name = 
+
+[TestGroup45]
+city_group_id = 45
+city_group_name =
+
+[TestGroup46]
+city_group_id = 46
+city_group_name = 
+
+[TestGroup47]
+city_group_id = 47
+city_group_name = 
+
+[TestGroup48]
+city_group_id = 48
+city_group_name = 
+
+[TestGroup49]
+city_group_id = 49
+city_group_name = 
+
+[TestGroup50]
+city_group_id = 50
+city_group_name = 
+
+[TestGroup51]
+city_group_id = 51
+city_group_name = 
+
+[TestGroup52]
+city_group_id = 52
+city_group_name = 
+
+[TestGroup53]
+city_group_id = 53
+city_group_name = 
+
+[TestGroup54]
+city_group_id = 54
+city_group_name = 
+
+[TestGroup55]
+city_group_id = 55
+city_group_name =
+
+[TestGroup56]
+city_group_id = 56
+city_group_name = 
+
+[TestGroup57]
+city_group_id = 57
+city_group_name = 
+
+[TestGroup58]
+city_group_id = 58
+city_group_name = 
+
+[TestGroup59]
+city_group_id = 59
+city_group_name = 
+
+[TestGroup60]
+city_group_id = 60
+city_group_name = 
+
+[TestGroup61]
+city_group_id = 61
+city_group_name = 
+
+[TestGroup62]
+city_group_id = 62
+city_group_name = 
+
+[TestGroup63]
+city_group_id = 63
+city_group_name = 
+
+[TestGroup64]
+city_group_id = 64
+city_group_name = 
+
+[TestGroup65]
+city_group_id = 65
+city_group_name =
+
+[TestGroup66]
+city_group_id = 66
+city_group_name = 
+
+[TestGroup67]
+city_group_id = 67
+city_group_name = 
+
+[TestGroup68]
+city_group_id = 68
+city_group_name = 
+
+[TestGroup69]
+city_group_id = 69
+city_group_name = 
+
+[TestGroup70]
+city_group_id = 70
+city_group_name = 
+
+[TestGroup71]
+city_group_id = 71
+city_group_name = 
+
+[TestGroup72]
+city_group_id = 72
+city_group_name = 
+
+[TestGroup73]
+city_group_id = 73
+city_group_name = 
+
+[TestGroup74]
+city_group_id = 74
+city_group_name = 
+
+[TestGroup75]
+city_group_id = 75
+city_group_name =
+
+[TestGroup76]
+city_group_id = 76
+city_group_name = 
+
+[TestGroup77]
+city_group_id = 77
+city_group_name = 
+
+[TestGroup78]
+city_group_id = 78
+city_group_name = 
+
+[TestGroup79]
+city_group_id = 79
+city_group_name = 
+
+[TestGroup80]
+city_group_id = 80
+city_group_name = 
+
+[TestGroup81]
+city_group_id = 81
+city_group_name = 
+
+[TestGroup82]
+city_group_id = 82
+city_group_name = 
+
+[TestGroup83]
+city_group_id = 83
+city_group_name = 
+
+[TestGroup84]
+city_group_id = 84
+city_group_name = 
+
+[TestGroup85]
+city_group_id = 85
+city_group_name =
+
+[TestGroup86]
+city_group_id = 86
+city_group_name = 
+
+[TestGroup87]
+city_group_id = 87
+city_group_name = 
+
+[TestGroup88]
+city_group_id = 88
+city_group_name = 
+
+[TestGroup89]
+city_group_id = 89
+city_group_name = 
+
+[TestGroup90]
+city_group_id = 90
+city_group_name = 
+
+[TestGroup91]
+city_group_id = 91
+city_group_name = 
+
+[TestGroup92]
+city_group_id = 92
+city_group_name = 
+
+[TestGroup93]
+city_group_id = 93
+city_group_name = 
+
+[TestGroup94]
+city_group_id = 94
+city_group_name = 
+
+[TestGroup95]
+city_group_id = 95
+city_group_name =
+
+[TestGroup96]
+city_group_id = 96
+city_group_name = 
+
+[TestGroup97]
+city_group_id = 97
+city_group_name = 
+
+[TestGroup98]
+city_group_id = 98
+city_group_name = 
+
+[TestGroup99]
+city_group_id = 99
+city_group_name = 
+
+
+[TestGroup100]
+city_group_id = 100
+city_group_name = 
+
+[TestGroup101]
+city_group_id = 101
+city_group_name = 
+
+[TestGroup102]
+city_group_id = 102
+city_group_name = 
+
+[TestGroup103]
+city_group_id = 103
+city_group_name = 
+
+[TestGroup104]
+city_group_id = 104
+city_group_name = 
+
+[TestGroup105]
+city_group_id = 105
+city_group_name = 
+
+[TestGroup106]
+city_group_id = 106
+city_group_name =
+
+[TestGroup107]
+city_group_id = 107
+city_group_name = 
+
+[TestGroup108]
+city_group_id = 108
+city_group_name = 
+
+[TestGroup109]
+city_group_id = 109
+city_group_name = 
+
+[TestGroup110]
+city_group_id = 110
+city_group_name = 
+
+[TestGroup111]
+city_group_id = 111
+city_group_name = 
+
+[TestGroup112]
+city_group_id = 112
+city_group_name = 
+ 
+[TestGroup113]
+city_group_id = 113
+city_group_name = 
+
+[TestGroup114]
+city_group_id = 114
+city_group_name = 
+
+[TestGroup115]
+city_group_id = 115
+city_group_name = 
+
+[TestGroup116]
+city_group_id = 116
+city_group_name = 
+
+[TestGroup117]
+city_group_id = 117
+city_group_name = 
+
+[TestGroup118]
+city_group_id = 118
+city_group_name = 
+
+[TestGroup119]
+city_group_id = 119
+city_group_name = 
+
+[TestGroup120]
+city_group_id = 120
+city_group_name =
+
+[TestGroup121]
+city_group_id = 121
+city_group_name = 
+
+[TestGroup122]
+city_group_id = 122
+city_group_name = 
+
+[TestGroup123]
+city_group_id = 123
+city_group_name = 
+
+[TestGroup124]
+city_group_id = 124
+city_group_name = 
+
+[TestGroup125]
+city_group_id = 125
+city_group_name = 
+
+[TestGroup126]
+city_group_id = 126
+city_group_name = 
+
+[TestGroup127]
+city_group_id = 127
+city_group_name = 
+
+[TestGroup128]
+city_group_id = 128
+city_group_name = Vancouver
+number_of_cities = 3
+
+[TestGroup129]
+city_group_id = 129
+city_group_name = Canada West Coast
+number_of_cities = 1
+
+# Try to open a non-existent group - should leave with KErrNotFound (-1)
+[TestGroup130]
+
+city_group_id = 130
+city_group_name = DoesNotExist
+number_of_cities = 8
+
+# For testing the reading of all groups
+[AllGroupsTest]
+
+# number of groups that are expected to be in the resource file
+# not the number that is specified in this ini file
+number_of_groups = 129
+
+
+# Test for the sorting functionality
+[SortTest1]
+sort_test = time_zone
+sort_test_type = utc_ascending
+standard_name1 = Pacific Standard Time
+standard_name2 = Pacific Standard Time
+standard_name3 = Central Standard Time
+standard_name6 = Greenwich Mean Time
+standard_name7 = Western European Time
+standard_name8 = Central European Time
+standard_name9 = Central European Time
+standard_name10 = Central European Time
+standard_name11 = Eastern European Summer
+standard_name14 = Eastern Standard Time
+
+[SortTest2]
+sort_test = time_zone
+sort_test_type = utc_descending
+standard_name2 = Eastern Standard Time
+standard_name5 = Eastern European Summer
+standard_name6 = Central European Time
+standard_name7 = Central European Time
+standard_name8 = Central European Time
+standard_name9 = Western European Time
+standard_name10 = Greenwich Mean Time
+standard_name13 = Central Standard Time
+standard_name14 = Pacific Standard Time
+standard_name15 = Pacific Standard Time
+
+[SortTest3]
+sort_test = time_zone
+sort_test_type = alpha_name_ascending
+standard_name6 = Central European Time
+standard_name7 = Central European Time
+standard_name8 = Central European Time
+standard_name9  = Central Standard Time
+standard_name10 = Eastern European Summer
+standard_name11 = Eastern Standard Time
+standard_name12 = Greenwich Mean Time
+standard_name13 = Pacific Standard Time
+standard_name14 = Pacific Standard Time
+standard_name15 = Western European Time
+
+[SortTest4]
+sort_test = time_zone
+sort_test_type = alpha_name_descending
+standard_name1 = Western European Time
+standard_name2 = Pacific Standard Time
+standard_name3 = Pacific Standard Time
+standard_name4 = Greenwich Mean Time
+standard_name5 = Eastern Standard Time
+standard_name6 = Eastern European Summer
+standard_name7 = Central Standard Time
+standard_name8 = Central European Time
+standard_name9 = Central European Time
+standard_name10 = Central European Time
+
+[SortTest5]
+sort_test = city
+sort_test_type = utc_ascending
+city_name1  = Burnaby
+city_name2  = Los Angeles
+city_name3  = Portland
+city_name4  = Richmond
+city_name5  = San Francisco
+city_name6  = Seattle
+city_name7  = Surrey
+city_name8  = Vancouver
+city_name9  = Chicago
+city_name10 = Rio Branco
+city_name11 = Stanley
+city_name12 = Birmingham
+city_name13 = Lisbon
+city_name14 = London
+city_name15 = Manchester
+city_name16 = Porto
+city_name17 = Berlin
+city_name18 = Bonn
+city_name19 = Frankfurt
+city_name20 = Nice
+city_name21 = Paris
+city_name22 = Stockholm
+city_name23 = Tirane
+city_name24 = Sofia
+city_name25 = Tehran
+city_name26 = Seoul
+city_name27 = Ballarat
+city_name28 = Canberra
+city_name29 = Sydney
+city_name30 = Auckland
+
+[SortTest6]
+sort_test = city
+sort_test_type = utc_descending
+city_name1	=	Auckland
+city_name2	=	Sydney
+city_name3	=	Canberra
+city_name4	=	Ballarat
+city_name5	=	Seoul
+city_name6	=	Tehran
+city_name7	=	Sofia
+city_name8	=	Tirane
+city_name9	=	Stockholm
+city_name10	=	Paris
+city_name11	=	Nice
+city_name12	=	Frankfurt
+city_name13	=	Bonn
+city_name14	=	Berlin
+city_name15	=	Porto
+city_name16	=	Manchester
+city_name17	=	London
+city_name18	=	Lisbon
+city_name19	=	Birmingham
+city_name20	=	Stanley
+city_name21	=	Rio Branco
+city_name22	=	Chicago
+city_name23	=	Vancouver
+city_name24	=	Surrey
+city_name25	=	Seattle
+city_name26	=	San Francisco
+city_name27	=	Richmond
+city_name28	=	Portland
+city_name29	=	Los Angeles
+city_name30	=	Burnaby
+
+
+[SortTest7]
+sort_test = city
+sort_test_type = alpha_name_ascending
+city_name1	=	Auckland
+city_name2	=	Ballarat
+city_name3	=	Berlin
+city_name4	=	Birmingham
+city_name5	=	Bonn
+city_name6	=	Burnaby
+city_name7	=	Canberra
+city_name8	=	Chicago
+city_name9	=	Frankfurt
+city_name10	=	Lisbon
+city_name11	=	London
+city_name12	=	Los Angeles
+city_name13	=	Manchester
+city_name14	=	Nice
+city_name15	=	Paris
+city_name16	=	Portland
+city_name17	=	Porto
+city_name18	=	Richmond
+city_name19	=	Rio Branco
+city_name20	=	San Francisco
+city_name21	=	Seattle
+city_name22	=	Seoul
+city_name23	=	Sofia
+city_name24	=	Stanley
+city_name25	=	Stockholm
+city_name26	=	Surrey
+city_name27	=	Sydney
+city_name28	=	Tehran
+city_name29	=	Tirane
+city_name30	=	Vancouver
+
+[SortTest8]
+sort_test = city
+sort_test_type = alpha_name_descending
+city_name1	=	Vancouver
+city_name2	=	Tirane
+city_name3	=	Tehran
+city_name4	=	Sydney
+city_name5	=	Surrey
+city_name6	=	Stockholm
+city_name7	=	Stanley
+city_name8	=	Sofia
+city_name9	=	Seoul
+city_name10	=	Seattle
+city_name11	=	San Francisco
+city_name12	=	Rio Branco
+city_name13	=	Richmond
+city_name14	=	Porto
+city_name15	=	Portland
+city_name16	=	Paris
+city_name17	=	Nice
+city_name18	=	Manchester
+city_name19	=	Los Angeles
+city_name20	=	London
+city_name21	=	Lisbon
+city_name22	=	Frankfurt
+city_name23	=	Chicago
+city_name24	=	Canberra
+city_name25	=	Burnaby
+city_name26	=	Bonn
+city_name27	=	Birmingham
+city_name28	=	Berlin
+city_name29	=	Ballarat
+city_name30	=	Auckland
+
+
+[SortTest9]
+sort_test = group
+sort_test_type = alpha_name_ascending
+city_group_name117 = Acre
+city_group_name118 = Asia
+city_group_name119 = Atlantic
+city_group_name120 = Australia
+city_group_name121 = California
+city_group_name122 = Canada West Coast
+city_group_name123 = Central Lakes
+city_group_name124 = Europe
+city_group_name125 = New Zealand
+city_group_name126 = Oregon
+city_group_name127= United Kingdom
+city_group_name128 = Vancouver
+city_group_name129 = Washington
+
+[SortTest10]
+sort_test = group
+sort_test_type = alpha_name_descending
+city_group_name1	=	Washington
+city_group_name2	= 	Vancouver
+city_group_name3	=	United Kingdom
+city_group_name4	=	Oregon
+city_group_name5	=	New Zealand
+city_group_name6	=	Europe
+city_group_name7	=	Central Lakes
+city_group_name8	=	Canada West Coast
+city_group_name9	=	California
+city_group_name10	=	Australia
+city_group_name11	=	Atlantic
+city_group_name12	=	Asia
+city_group_name13	=	Acre
+
+[SortTest11]
+sort_test = cities_in_group
+sort_test_type = utc_ascending
+city_group_id = 0
+city_name1  = Birmingham
+city_name2  = Frankfurt
+city_name3  = Ballarat
+
+[SortTest12]
+sort_test = cities_in_group
+sort_test_type = utc_descending
+city_group_id = 0
+city_name1  = Ballarat
+city_name2  = Frankfurt
+city_name3  = Birmingham
+
+[SortTest13]
+sort_test = cities_in_group
+sort_test_type = alpha_name_ascending
+city_group_id = 0
+city_name1  = Ballarat
+city_name2  = Birmingham
+city_name3  = Frankfurt
+
+[SortTest14]
+sort_test = cities_in_group
+sort_test_type = alpha_name_descending
+city_group_id = 0
+city_name1  = Frankfurt
+city_name2  = Birmingham
+city_name3  = Ballarat
+
+# look for a real time zone, city and group - Should PASS
+[FindTest1]
+time_zone_id = 2592
+standard_name = Greenwich Mean Time
+daylight_name = British Summer Time
+short_standard_name = GMT
+short_daylight_name = BST
+city_name = Manchester
+city_group_name = United Kingdom
+
+# Look for non-existent standard name - should FAIL
+[FindTest2]
+time_zone_id = 2592
+standard_name = Foo Bar
+daylight_name = British Summer Time
+short_standard_name = GMT
+short_daylight_name = BST
+city_name = Manchester
+city_group_name = United Kingdom
+
+# Look for non-existent daylight name - should FAIL
+[FindTest3]
+time_zone_id = 2592
+standard_name = Greenwich Mean Time
+daylight_name = Foo Bar
+short_standard_name = GMT
+short_daylight_name = BST
+city_name = Manchester
+city_group_name = United Kingdom
+
+# Look for non-existent short standard name - should FAIL
+[FindTest4]
+time_zone_id = 2592
+standard_name = Greenwich Mean Time
+daylight_name = British Summer Time
+short_standard_name = Foo Bar
+short_daylight_name = BST
+city_name = Manchester
+city_group_name = United Kingdom
+
+# Look for non-existent short daylight name - should FAIL
+[FindTest5]
+time_zone_id = 2592
+standard_name = Greenwich Mean Time
+daylight_name = British Summer Time
+short_standard_name = GMT
+short_daylight_name = Foo Bar
+city_name = Manchester
+city_group_name = United Kingdom
+
+# Look for non-existent city name - should FAIL
+[FindTest6]
+time_zone_id = 2592
+standard_name = Greenwich Mean Time
+daylight_name = British Summer Time
+short_standard_name = GMT
+short_daylight_name = BST
+city_name = Foo Bar
+city_group_name = United Kingdom
+
+# Look for non-existent group name - should FAIL
+[FindTest7]
+time_zone_id = 2592
+standard_name = Greenwich Mean Time
+daylight_name = British Summer Time
+short_standard_name = GMT
+short_daylight_name = BST
+city_name = Manchester
+city_group_name = AS
+
+
+[SpeedTest1]
+
+sort_test_type = unsorted
+#Max time limit for 200 time zones
+all_zones_test_limit = 500000		
+#Max time limit for 600 cities
+all_cities_test_limit = 1500000
+#Max time limit for 400 cities
+all_cities_in_group_limit = 1000000
+// city group to read in test
+city_group_id = 1
+// time zone id of the time zone to add new cities into
+time_zone_id = 8
+
+[SpeedTest2]
+
+sort_test_type = utc_ascending
+#Max time limit for 200 time zones
+all_zones_test_limit = 500000		
+#Max time limit for 600 cities
+all_cities_test_limit = 1500000
+#Max time limit for 400 cities
+all_cities_in_group_limit = 1000000
+// city group to read in test
+city_group_id = 1
+// time zone id of the time zone to add new cities into
+time_zone_id = 8
+
+[SpeedTest3]
+
+sort_test_type = utc_descending
+#Max time limit for 200 time zones
+all_zones_test_limit = 500000		
+#Max time limit for 600 cities
+all_cities_test_limit = 1500000
+#Max time limit for 400 cities
+all_cities_in_group_limit = 1000000
+// city group to read in test
+city_group_id = 1
+// time zone id of the time zone to add new cities into
+time_zone_id = 8
+
+[SpeedTest4]
+
+sort_test_type = alpha_name_ascending
+#Max time limit for 200 time zones
+all_zones_test_limit = 500000		
+#Max time limit for 600 cities
+all_cities_test_limit = 1500000
+#Max time limit for 400 cities
+all_cities_in_group_limit = 1000000
+// city group to read in test
+city_group_id = 1
+// time zone id of the time zone to add new cities into
+time_zone_id = 8
+
+[SpeedTest5]
+
+sort_test_type = alpha_name_descending
+#Max time limit for 200 time zones
+all_zones_test_limit = 500000		
+#Max time limit for 600 cities
+all_cities_test_limit = 1500000
+#Max time limit for 400 cities
+all_cities_in_group_limit = 1000000
+// city group to read in test
+city_group_id = 1
+// time zone id of the time zone to add new cities into
+time_zone_id = 8
+
+[SpeedTest6]
+
+sort_test_type = standard_name_ascending
+#Max time limit for 200 time zones
+all_zones_test_limit = 500000		
+#Max time limit for 600 cities
+all_cities_test_limit = 1500000
+#Max time limit for 400 cities
+all_cities_in_group_limit = 1000000
+// city group to read in test
+city_group_id = 1
+// time zone id of the time zone to add new cities into
+time_zone_id = 8
+
+[SpeedTest7]
+
+sort_test_type = standard_name_descending
+#Max time limit for 200 time zones
+all_zones_test_limit = 500000		
+#Max time limit for 600 cities
+all_cities_test_limit = 1500000
+#Max time limit for 400 cities
+all_cities_in_group_limit = 1000000
+// city group to read in test
+city_group_id = 1
+// time zone id of the time zone to add new cities into
+time_zone_id = 8
+
+[SpeedTest8]
+
+sort_test_type = daylight_name_ascending
+#Max time limit for 200 time zones
+all_zones_test_limit = 500000		
+#Max time limit for 600 cities
+all_cities_test_limit = 1500000
+#Max time limit for 400 cities
+all_cities_in_group_limit = 1000000
+// city group to read in test
+city_group_id = 1
+// time zone id of the time zone to add new cities into
+time_zone_id = 8
+
+[SpeedTest9]
+
+sort_test_type = daylight_name_descending
+#Max time limit for 200 time zones
+all_zones_test_limit = 500000		
+#Max time limit for 600 cities
+all_cities_test_limit = 1500000
+#Max time limit for 400 cities
+all_cities_in_group_limit = 1000000
+// city group to read in test
+city_group_id = 1
+// time zone id of the time zone to add new cities into
+time_zone_id = 8
+
+[SpeedTest10]
+
+sort_test_type = short_standard_name_ascending
+#Max time limit for 200 time zones
+all_zones_test_limit = 500000		
+#Max time limit for 600 cities
+all_cities_test_limit = 1500000
+#Max time limit for 400 cities
+all_cities_in_group_limit = 1000000
+// city group to read in test
+city_group_id = 1
+// time zone id of the time zone to add new cities into
+time_zone_id = 8
+
+[SpeedTest11]
+
+sort_test_type = short_standard_name_descending
+#Max time limit for 200 time zones
+all_zones_test_limit = 500000		
+#Max time limit for 600 cities
+all_cities_test_limit = 1500000
+#Max time limit for 400 cities
+all_cities_in_group_limit = 1000000
+// city group to read in test
+city_group_id = 1
+// time zone id of the time zone to add new cities into
+time_zone_id = 8
+
+[SpeedTest12]
+
+sort_test_type = short_daylight_name_ascending
+#Max time limit for 200 time zones
+all_zones_test_limit = 500000		
+#Max time limit for 600 cities
+all_cities_test_limit = 1500000
+#Max time limit for 400 cities
+all_cities_in_group_limit = 1000000
+// city group to read in test
+city_group_id = 1;
+// time zone id of the time zone to add new cities into
+time_zone_id = 8
+
+[SpeedTest13]
+
+sort_test_type = short_daylight_name_descending
+#Max time limit for 200 time zones
+all_zones_test_limit = 500000		
+#Max time limit for 600 cities
+all_cities_test_limit = 1500000
+#Max time limit for 400 cities
+all_cities_in_group_limit = 1000000
+// city group to read in test
+city_group_id = 1;
+// time zone id of the time zone to add new cities into
+time_zone_id = 8
+