Fix csv2vcard test

program/lib/Roundcube/rcube_csv2vcard.php

@@ -139,12 +139,10 @@ class rcube_csv2vcard
         'info'                  => 'notes',
         'user_photo'            => 'photo',
         'url'                   => 'website:homepage',
-        'work_city'             => 'locality:work',
         'work_company'          => 'organization',
         'work_dept'             => 'departament',
         'work_fax'              => 'phone:work,fax',
         'work_mobile'           => 'phone:work,cell',
-        'work_state'            => 'region:work',
         'work_title'            => 'jobtitle',
         'work_zip'              => 'zipcode:work',
     );
@@ -247,7 +245,9 @@ class rcube_csv2vcard
         'work_phone'        => "Work Phone",
         'work_address'      => "Work Address",
         //'work_address_2'    => "Work Address 2",
+        'work_city'         => "Work City",
         'work_country'      => "Work Country",
+        'work_state'        => "Work State",
         'work_zipcode'      => "Work ZipCode",
 
         // Atmail
@@ -262,12 +262,10 @@ class rcube_csv2vcard
         'info'              => "Info",
         'user_photo'        => "User Photo",
         'url'               => "URL",
-        'work_city'         => "Work City",
         'work_company'      => "Work Company",
         'work_dept'         => "Work Dept",
         'work_fax'          => "Work Fax",
         'work_mobile'       => "Work Mobile",
-        'work_state'        => "Work State",
         'work_title'        => "Work Title",
         'work_zip'          => "Work Zip",
     );

tests/src/Csv2vcard/tb_plain.csv

@@ -1,2 +1,2 @@
 First Name,Last Name,Display Name,Nickname,Primary Email,Secondary Email,Screen Name,Work Phone,Home Phone,Fax Number,Pager Number,Mobile Number,Home Address,Home Address 2,Home City,Home State,Home ZipCode,Home Country,Work Address,Work Address 2,Work City,Work State,Work ZipCode,Work Country,Job Title,Department,Organization,Web Page 1,Web Page 2,Birth Year,Birth Month,Birth Day,Custom 1,Custom 2,Custom 3,Custom 4,Notes,
-Firstname,Lastname,Displayname,Nick,test@domain.tld,next@domain.tld,,phone work,phone home,fax,pager,mobile,Priv address,,City,region,xx-xxx,USA,Addr work,,city,region,33-333,Poland,title,department,Organization,http://page.com,http://webpage.tld,1970,11,15,,,,,,
+Firstname,Lastname,Displayname,Nick,test@domain.tld,next@domain.tld,,phone work,phone home,fax,pager,mobile,Priv address,,City,region,xx-xxx,USA,Addr work,,Wcity,Wstate,33-333,Poland,title,department,Organization,http://page.com,http://webpage.tld,1970,11,15,,,,,,

tests/src/Csv2vcard/tb_plain.vcf

@@ -16,5 +16,5 @@ URL;TYPE=homepage:http://page.com
 URL;TYPE=other:http://webpage.tld
 BDAY;VALUE=date:1970-11-15
 ADR;TYPE=home:;;Priv address;City;region;xx-xxx;USA
-ADR;TYPE=work:;;Addr work;;;33-333;Poland
+ADR;TYPE=work:;;Addr work;Wcity;Wstate;33-333;Poland
 END:VCARD