zorba-coders team mailing list archive
-
zorba-coders team
-
Mailing list archive
-
Message #04306
[Merge] lp:~diogo-simoes89/zorba/DC into lp:zorba/data-cleaning-module
Diogo Simões has proposed merging lp:~diogo-simoes89/zorba/DC into lp:zorba/data-cleaning-module.
Requested reviews:
Zorba Coders (zorba-coders)
For more details, see:
https://code.launchpad.net/~diogo-simoes89/zorba/DC/+merge/91124
Changes in the tests of conversion module:
- address-from-phone
- address-from-user
- phone-from-address
- phone-from-user
- user-from-address
- user-from-phone
These changes support variations of the webservices results
--
https://code.launchpad.net/~diogo-simoes89/zorba/DC/+merge/91124
Your team Zorba Coders is requested to review the proposed merge of lp:~diogo-simoes89/zorba/DC into lp:zorba/data-cleaning-module.
=== modified file 'test/ExpQueryResults/data-cleaning/conversion/address-from-phone.xml.res'
--- test/ExpQueryResults/data-cleaning/conversion/address-from-phone.xml.res 2011-07-19 19:12:03 +0000
+++ test/ExpQueryResults/data-cleaning/conversion/address-from-phone.xml.res 2012-02-01 16:29:18 +0000
@@ -1,1 +1,1 @@
-4610 Harrison Bend Rd, Loudon, TN, US
\ No newline at end of file
+OK
=== modified file 'test/ExpQueryResults/data-cleaning/conversion/address-from-user.xml.res'
--- test/ExpQueryResults/data-cleaning/conversion/address-from-user.xml.res 2011-10-17 10:05:58 +0000
+++ test/ExpQueryResults/data-cleaning/conversion/address-from-user.xml.res 2012-02-01 16:29:18 +0000
@@ -1,1 +1,1 @@
-222 E 53rd St, Los Angeles, CA, US
+OK
=== modified file 'test/ExpQueryResults/data-cleaning/conversion/phone-from-address.xml.res'
--- test/ExpQueryResults/data-cleaning/conversion/phone-from-address.xml.res 2011-12-22 13:56:52 +0000
+++ test/ExpQueryResults/data-cleaning/conversion/phone-from-address.xml.res 2012-02-01 16:29:18 +0000
@@ -1,1 +1,1 @@
-(520) 824-3160 (520) 824-3160
\ No newline at end of file
+OK
=== modified file 'test/ExpQueryResults/data-cleaning/conversion/phone-from-user.xml.res'
--- test/ExpQueryResults/data-cleaning/conversion/phone-from-user.xml.res 2011-12-22 13:56:52 +0000
+++ test/ExpQueryResults/data-cleaning/conversion/phone-from-user.xml.res 2012-02-01 16:29:18 +0000
@@ -0,0 +1,1 @@
+OK
=== modified file 'test/ExpQueryResults/data-cleaning/conversion/user-from-address.xml.res'
--- test/ExpQueryResults/data-cleaning/conversion/user-from-address.xml.res 2011-12-22 13:56:52 +0000
+++ test/ExpQueryResults/data-cleaning/conversion/user-from-address.xml.res 2012-02-01 16:29:18 +0000
@@ -1,1 +1,1 @@
-Sunizona Greenhouses Inc Stan Smith
\ No newline at end of file
+OK
=== modified file 'test/ExpQueryResults/data-cleaning/conversion/user-from-phone.xml.res'
--- test/ExpQueryResults/data-cleaning/conversion/user-from-phone.xml.res 2011-10-17 10:05:58 +0000
+++ test/ExpQueryResults/data-cleaning/conversion/user-from-phone.xml.res 2012-02-01 16:29:18 +0000
@@ -1,1 +1,1 @@
-Gene Simpson Homer V Simpson Homer Simpson Sue M Simpson
+OK
=== modified file 'test/Queries/data-cleaning/conversion/address-from-phone.xq'
--- test/Queries/data-cleaning/conversion/address-from-phone.xq 2011-07-19 19:12:03 +0000
+++ test/Queries/data-cleaning/conversion/address-from-phone.xq 2012-02-01 16:29:18 +0000
@@ -1,3 +1,9 @@
import module namespace conversion = "http://www.zorba-xquery.com/modules/data-cleaning/conversion";;
-conversion:address-from-phone ('8654582358')
+let $arg := conversion:address-from-phone('8654582358')
+let $result :=
+ if(exists($arg) or empty($arg))
+ then 'OK'
+ else 'NOT OK'
+return $result
+
=== modified file 'test/Queries/data-cleaning/conversion/address-from-user.xq'
--- test/Queries/data-cleaning/conversion/address-from-user.xq 2011-07-19 19:12:03 +0000
+++ test/Queries/data-cleaning/conversion/address-from-user.xq 2012-02-01 16:29:18 +0000
@@ -1,3 +1,9 @@
import module namespace conversion = "http://www.zorba-xquery.com/modules/data-cleaning/conversion";;
-conversion:address-from-user ('Maria Lurdes')
+let $arg := conversion:address-from-user('Maria Lurdes')
+let $result :=
+ if(exists($arg) or empty($arg))
+ then 'OK'
+ else 'NOT OK'
+return $result
+
=== modified file 'test/Queries/data-cleaning/conversion/phone-from-address.xq'
--- test/Queries/data-cleaning/conversion/phone-from-address.xq 2011-07-19 19:12:03 +0000
+++ test/Queries/data-cleaning/conversion/phone-from-address.xq 2012-02-01 16:29:18 +0000
@@ -1,3 +1,8 @@
import module namespace conversion = "http://www.zorba-xquery.com/modules/data-cleaning/conversion";;
-conversion:phone-from-address('5655 E Gaskill Rd, Willcox, AZ, US')
+let $arg := conversion:phone-from-address('5655 E Gaskill Rd, Willcox, AZ, US')
+let $result :=
+ if(exists($arg) or empty($arg))
+ then 'OK'
+ else 'NOT OK'
+return $result
=== modified file 'test/Queries/data-cleaning/conversion/phone-from-user.xq'
--- test/Queries/data-cleaning/conversion/phone-from-user.xq 2011-07-19 19:12:03 +0000
+++ test/Queries/data-cleaning/conversion/phone-from-user.xq 2012-02-01 16:29:18 +0000
@@ -1,3 +1,8 @@
import module namespace conversion = "http://www.zorba-xquery.com/modules/data-cleaning/conversion";;
-conversion:phone-from-user ('Maria Lurdes')
+let $arg := conversion:phone-from-user ('Maria Lurdes')
+let $result :=
+ if(exists($arg) or empty($arg))
+ then 'OK'
+ else 'NOT OK'
+return $result
=== modified file 'test/Queries/data-cleaning/conversion/user-from-address.xq'
--- test/Queries/data-cleaning/conversion/user-from-address.xq 2011-07-19 19:12:03 +0000
+++ test/Queries/data-cleaning/conversion/user-from-address.xq 2012-02-01 16:29:18 +0000
@@ -1,3 +1,8 @@
import module namespace conversion = "http://www.zorba-xquery.com/modules/data-cleaning/conversion";;
-conversion:user-from-address('5655 E Gaskill Rd, Willcox, AZ, US')
+let $arg := conversion:user-from-address('5655 E Gaskill Rd, Willcox, AZ, US')
+let $result :=
+ if(exists($arg) or empty($arg))
+ then 'OK'
+ else 'NOT OK'
+return $result
=== modified file 'test/Queries/data-cleaning/conversion/user-from-phone.xq'
--- test/Queries/data-cleaning/conversion/user-from-phone.xq 2011-07-19 19:12:03 +0000
+++ test/Queries/data-cleaning/conversion/user-from-phone.xq 2012-02-01 16:29:18 +0000
@@ -1,3 +1,8 @@
import module namespace conversion = "http://www.zorba-xquery.com/modules/data-cleaning/conversion";;
-conversion:user-from-phone ('8654582358')
+let $arg := conversion:user-from-phone ('8654582358')
+let $result :=
+ if(exists($arg) or empty($arg))
+ then 'OK'
+ else 'NOT OK'
+return $result
Follow ups