Merge lp:~diogo-simoes89/zorba/DC-conversion-tests into lp:zorba/data-cleaning-module

[Diogo Simões]

New changes in the tests of conversion module. These changes support variations of the webservices results.

New 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

[Chris Hillery (ceejatec)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/DC-conversion-tests-2012-02-06T08-40-38.834Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job DC-conversion-tests-2012-02-06T08-40-38.834Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Approve.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/DC-conversion-tests-2012-02-08T17-49-36.483Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job DC-conversion-tests-2012-02-08T17-49-36.483Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Approve.

[Bruno Martins (bgmartins)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/DC-conversion-tests-2012-02-22T16-37-27.531Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job DC-conversion-tests-2012-02-22T16-37-27.531Z is finished. The final status was:

All tests succeeded!

=== modified file 'test/Queries/data-cleaning/conversion/address-from-phone.xq'
--- test/Queries/data-cleaning/conversion/address-from-phone.xq	2012-01-26 23:17:06 +0000
+++ test/Queries/data-cleaning/conversion/address-from-phone.xq	2012-02-06 00:17:18 +0000
@@ -1,8 +1,8 @@
 import module namespace conversion = "http://www.zorba-xquery.com/modules/data-cleaning/conversion";
 
-let $arg := conversion:address-from-phone('8654582358')
+let $arg := conversion:address-from-phone('8654582358')[1]
 let $result :=
-  if(exists($arg) or empty($arg))
+  if(matches($arg, "([0-9]*[ ][A-Z]*[a-z]*)*") and not(matches($arg, "invalid")))
   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	2012-01-26 23:17:06 +0000
+++ test/Queries/data-cleaning/conversion/address-from-user.xq	2012-02-06 00:17:18 +0000
@@ -1,8 +1,8 @@
 import module namespace conversion = "http://www.zorba-xquery.com/modules/data-cleaning/conversion";
 
-let $arg := conversion:address-from-user('Maria Lurdes')
+let $arg := conversion:address-from-user('Maria Lurdes')[1]
 let $result :=
-  if(exists($arg) or empty($arg))
+  if(matches($arg, "([0-9]*[ ][A-Z]*[a-z]*)*") and not(matches($arg, "invalid")))
   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	2012-01-26 23:17:06 +0000
+++ test/Queries/data-cleaning/conversion/phone-from-address.xq	2012-02-06 00:17:18 +0000
@@ -1,8 +1,8 @@
 import module namespace conversion = "http://www.zorba-xquery.com/modules/data-cleaning/conversion";
 
-let $arg := conversion:phone-from-address('5655 E Gaskill Rd, Willcox, AZ, US')
+let $arg := conversion:phone-from-address('5655 E Gaskill Rd, Willcox, AZ, US')[1]
 let $result :=
-  if(exists($arg) or empty($arg))
+  if(matches($arg, "(\([0-9]{3}\) [0-9]{3}\-[0-9]{4})*") and not(matches($arg, "invalid")))
   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	2012-01-26 23:17:06 +0000
+++ test/Queries/data-cleaning/conversion/phone-from-user.xq	2012-02-06 00:17:18 +0000
@@ -1,8 +1,8 @@
 import module namespace conversion = "http://www.zorba-xquery.com/modules/data-cleaning/conversion";
 
-let $arg := conversion:phone-from-user ('Maria Lurdes')
+let $arg := conversion:phone-from-user ('Maria Lurdes')[1]
 let $result :=
-  if(exists($arg) or empty($arg))
+  if(matches($arg, "(\([0-9]{3}\) [0-9]{3}\-[0-9]{4})*") and not(matches($arg, "invalid")))
   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	2012-01-26 23:17:06 +0000
+++ test/Queries/data-cleaning/conversion/user-from-address.xq	2012-02-06 00:17:18 +0000
@@ -1,8 +1,8 @@
 import module namespace conversion = "http://www.zorba-xquery.com/modules/data-cleaning/conversion";
 
-let $arg := conversion:user-from-address('5655 E Gaskill Rd, Willcox, AZ, US')
+let $arg := conversion:user-from-address('5655 E Gaskill Rd, Willcox, AZ, US')[1]
 let $result :=
-  if(exists($arg) or empty($arg))
+  if(matches($arg, "([0-9]|[a-z]|[A-Z])*") and not(matches($arg, "invalid")))
   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	2012-01-26 23:17:06 +0000
+++ test/Queries/data-cleaning/conversion/user-from-phone.xq	2012-02-06 00:17:18 +0000
@@ -1,8 +1,8 @@
 import module namespace conversion = "http://www.zorba-xquery.com/modules/data-cleaning/conversion";
 
-let $arg := conversion:user-from-phone ('8654582358')
+let $arg := conversion:user-from-phone ('8654582358')[1]
 let $result :=
-  if(exists($arg) or empty($arg))
+  if(matches($arg, "([0-9]|[a-z]|[A-Z])*") and not(matches($arg, "invalid")))
   then 'OK'
   else 'NOT OK'
 return $result