zorba-coders team mailing list archive

[Matthias Brantner <matthias.brantner@xxxxxxxxxx>]

Matthias Brantner has proposed merging lp:~zorba-coders/zorba/test-remove_hash_dependency into lp:zorba.

Requested reviews:
  Matthias Brantner (matthias-brantner)
  Chris Hillery (ceejatec)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/test-remove_hash_dependency/+merge/116033

removed a non-core module dependency from the reuse-stream test. the purpose of the test shouldn't change with this commit.
-- 
https://code.launchpad.net/~zorba-coders/zorba/test-remove_hash_dependency/+merge/116033
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'test/rbkt/ExpQueryResults/zorba/base64/reuse-stream.xml.res'
--- test/rbkt/ExpQueryResults/zorba/base64/reuse-stream.xml.res	2012-05-08 01:09:52 +0000
+++ test/rbkt/ExpQueryResults/zorba/base64/reuse-stream.xml.res	2012-07-20 16:59:28 +0000
@@ -1,1 +1,1 @@
-<file><content>f0VMRgEBAQAAAAAAAAAAAAMAAwABAAAAIPxDADQAAAD0JTMHAAAAADQAIAAHACgAKAAlAAEAAAAAAAAAAAAAAAAAAAAv22gBL9toAQUAAAAAEAAAAQAAAJTbaAGU62gBlOtoAehnBwAwpgcABgAAAAAQAAACAAAAvKBuAbywbgG8sG4BGAEAABgBAAAGAAAABAAAAAQAAAAUAQAAFAEAABQBAAAkAAAAJAAAAAQAAAAEAAAAUOV0ZKyHJwGshycBrIcnAfyBCAD8gQgABAAAAAQAAABR5XRkAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAABAAAAFLldGSU22gBlOtoAZTraAFs5AUAbOQFAAQAAAABAAAABAAAABQAAAADAAAAR05VANMOFlHRDhyfmkw9H3+lYuAncwGhG0AAAAYDAAAAIAAAEgAAABBkRVIkEIgUIwhRukiBHLCOBAAEAgggoSCCg0CkED5YAAAGFAIgABkACJAAiQAwAFCQEwAQIABBAIIFYAIACAASAAZARACAABkTpAQB5EQIYEF0IBIAIgAhciYEoEICZGgAAQAABCAAkBACZAJAAQQUEhGAIIAAKBULIJYAAABRAKFV4AIWgQAEIYgAAIAAQECAMgBGiCIGiRAEkAABAMAIgEQAAAQAACgIJYAAAEAAAAGAAgtCpFwEAAZRQACAABAICAASiBBFgRhIAkEBMAApJchACQZDAIAAgABIAKQEgKEACGE05FgCAAAgACEAgEAAQoxkUAEAiBAGAAkCFiBoISRFFCBEBMV3gARBgBAosUJBQQAEEDIAUUCBAABAEAhgAEAAAAAAACApACIBBgHKkAWBQAAEAAAAAACDURggAkEEEIlEgIEADQZwAAATC5AQNYxCABABAAAAAAEAlQD0WGD3gAAAIEDKCCAQQMGNIAAQAAAACECCAADAbMAWABABaRAAUFQCgAAAgxJmDAEIAiIZCmIAIAIEgAESCSAjETEQIws2A8AIgAEAAAAAkGkAiEAKDEYEBRGJhFEAIACICAIBKMAGAAAHIAQBqIgAUAECgAAAAhoEER4BASMBBhEIIQGCAFbg8IiBYAgCAQgAgEBwCAAAIAEAQATGAj+QQaAIIQAIAAShAgg2AKQAAAQBkCoASAAAFAAgAYFqAQDCcoOEg0sAIhKAABQAAgpAAghAAIQgIBAkAAQBDA4gRAACAAIgAPBAUgBDARCAggB0GQBaEAg1Mk8CABEAAAQgBBgAECIAvEIhFCRAIBgAAEALyBEQAhACQoIKwAABkBiAVM4QAQlFgBAS4AASAIIkAZEkEgAsBMCABSCAKACAIBMAD4JSLEyAAGQBBqATAUECQUgACQGBGA==</content><md5>f027633a677f42caf1544f6913bc2dab</md5></file>
\ No newline at end of file
+<file><base64>f0VMRgEBAQAAAAAAAAAAAAMAAwABAAAAIPxDADQAAAD0JTMHAAAAADQAIAAHACgAKAAlAAEAAAAAAAAAAAAAAAAAAAAv22gBL9toAQUAAAAAEAAAAQAAAJTbaAGU62gBlOtoAehnBwAwpgcABgAAAAAQAAACAAAAvKBuAbywbgG8sG4BGAEAABgBAAAGAAAABAAAAAQAAAAUAQAAFAEAABQBAAAkAAAAJAAAAAQAAAAEAAAAUOV0ZKyHJwGshycBrIcnAfyBCAD8gQgABAAAAAQAAABR5XRkAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAABAAAAFLldGSU22gBlOtoAZTraAFs5AUAbOQFAAQAAAABAAAABAAAABQAAAADAAAAR05VANMOFlHRDhyfmkw9H3+lYuAncwGhG0AAAAYDAAAAIAAAEgAAABBkRVIkEIgUIwhRukiBHLCOBAAEAgggoSCCg0CkED5YAAAGFAIgABkACJAAiQAwAFCQEwAQIABBAIIFYAIACAASAAZARACAABkTpAQB5EQIYEF0IBIAIgAhciYEoEICZGgAAQAABCAAkBACZAJAAQQUEhGAIIAAKBULIJYAAABRAKFV4AIWgQAEIYgAAIAAQECAMgBGiCIGiRAEkAABAMAIgEQAAAQAACgIJYAAAEAAAAGAAgtCpFwEAAZRQACAABAICAASiBBFgRhIAkEBMAApJchACQZDAIAAgABIAKQEgKEACGE05FgCAAAgACEAgEAAQoxkUAEAiBAGAAkCFiBoISRFFCBEBMV3gARBgBAosUJBQQAEEDIAUUCBAABAEAhgAEAAAAAAACApACIBBgHKkAWBQAAEAAAAAACDURggAkEEEIlEgIEADQZwAAATC5AQNYxCABABAAAAAAEAlQD0WGD3gAAAIEDKCCAQQMGNIAAQAAAACECCAADAbMAWABABaRAAUFQCgAAAgxJmDAEIAiIZCmIAIAIEgAESCSAjETEQIws2A8AIgAEAAAAAkGkAiEAKDEYEBRGJhFEAIACICAIBKMAGAAAHIAQBqIgAUAECgAAAAhoEER4BASMBBhEIIQGCAFbg8IiBYAgCAQgAgEBwCAAAIAEAQATGAj+QQaAIIQAIAAShAgg2AKQAAAQBkCoASAAAFAAgAYFqAQDCcoOEg0sAIhKAABQAAgpAAghAAIQgIBAkAAQBDA4gRAACAAIgAPBAUgBDARCAggB0GQBaEAg1Mk8CABEAAAQgBBgAECIAvEIhFCRAIBgAAEALyBEQAhACQoIKwAABkBiAVM4QAQlFgBAS4AASAIIkAZEkEgAsBMCABSCAKACAIBMAD4JSLEyAAGQBBqATAUECQUgACQGBGA==</base64><hexBinary>7F454C46010101000000000000000000030003000100000020FC430034000000F425330700000000340020000700280028002500010000000000000000000000000000002FDB68012FDB680105000000001000000100000094DB680194EB680194EB6801E867070030A60700060000000010000002000000BCA06E01BCB06E01BCB06E0118010000180100000600000004000000040000001401000014010000140100002400000024000000040000000400000050E57464AC872701AC872701AC872701FC810800FC810800040000000400000051E574640000000000000000000000000000000000000000060000000400000052E5746494DB680194EB680194EB68016CE405006CE405000400000001000000040000001400000003000000474E5500D30E1651D10E1C9F9A4C3D1F7FA562E0277301A11B4000000603000000200000120000001064455224108814230851BA48811CB08E040004020820A120828340A4103E58000006140220001900089000890030005090130010200041008205600200080012000640440080001913A40401E44408604174201200220021722604A0420264680001000004200090100264024001041412118020800028150B20960000005100A155E0021681000421880000800040408032004688220689100490000100C008804400000400002808258000004000000180020B42A45C0400065140008000100808001288104581184802410130002925C84009064300800080004800A40480A100086134E45802000020002100804000428C6450010088100600090216206821244514204404C577800441801028B142414100041032005140810000401008600040000000000020290022010601CA9005814000040000000000835118200241041089448081000D06700000130B9010358C420010010000000001009500F45860F78000002040CA08201040C18D2000100000000840820000C06CC0160010016910005054028000008312660C01080222190A6200200204800112092023113110230B3603C00880010000000090690088400A0C460405118984510020008808020128C006000007200401A88800500102800000021A04111E010123010611082101820056E0F088816008020108008040700800002001004004C6023F9041A0082100080004A102083600A400000401902A0048000014002001816A0100C2728384834B00221280001400020A400208400084202010240004010C0E2044000200022000F04052004301108082007419005A100835324F02001100000420041800102200BC422114244020180000400BC8111002100242820AC0000190188054CE10010945801012E0001200822401912412002C04C0800520802800802013000F82522C4C8000640106A01301410241480009018118</hexBinary></file>

=== modified file 'test/rbkt/Queries/zorba/base64/reuse-stream.xq'
--- test/rbkt/Queries/zorba/base64/reuse-stream.xq	2012-05-08 01:09:52 +0000
+++ test/rbkt/Queries/zorba/base64/reuse-stream.xq	2012-07-20 16:59:28 +0000
@@ -1,16 +1,14 @@
 (: From bug 996084. We need to ensure that a streamable base64 item can be re-used. :)
 
-import module namespace base64="http://www.zorba-xquery.com/modules/converters/base64";;
-import module namespace hash = "http://www.zorba-xquery.com/modules/cryptography/hash";;
 import module namespace file = "http://expath.org/ns/file";;
 
 declare variable $filename as xs:anyURI := resolve-uri("decoded");
 
 let $data as xs:base64Binary := file:read-binary ($filename)
-let $md5 as xs:string := hash:md5(base64:decode($data))
+let $hex as xs:hexBinary := xs:hexBinary($data)
 
 return 
   <file>
-    <content>{$data}</content>
-    <md5>{$md5}</md5>
+    <base64>{$data}</base64>
+    <hexBinary>{$hex}</hexBinary>
   </file>