minor refactor: refactor some test code that caused codenarc errors

Author: paulk-asert

gradle/verification-keyring.keys

@@ -6417,3 +6417,38 @@ EH9cr8h7bCqJx8IBANNQ0LNEFDElV9ZQc90TARZQnQE+7+hFMGq61qe8jqbgAP0W
 9DRN1vgGMDZnJ+VSDS2qT/wi1hTdidK4ahmSm7jqAQ==
 =Ed3J
 -----END PGP PUBLIC KEY BLOCK-----
+
+pub    38362FD5CFA2668B
+uid    Chris Mair (Sourceforge key) <chrismair@earthlink.net>
+
+sub    2C0B3D02E001AE5D
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFBGqekBCACwDdsq/u2M74jtk7vhvPv0j0+MO2XB9yEihE5cZsu7cFBSoVns
+8aUUJSDimEN3CxNSh4tIl4NeJMxGvUs14hUwV2qKshL42yaSQlBvZrGsxUXQQGZ4
+liU4c4+R6O1iwwKDDOQrDjxWjjt0A5XyvogasUvJBnL9a1fr6WNfLlbjECxee3DB
+5b4l0kz0XHHaGDUXhTLjR1s0gaXpFEETVLZne8x+CM1gGDliwQmv+mQ6DaqrPpLy
+rx4UYaHE5YxlsMvhcxkikF5wEfjOIgDqrvXiBz0YeabQVBA3h6IRekzpzu5R0FiA
+Q4gRc7nXHSuT0zy1m0wEfswKLqua25b5DPZLABEBAAG0NkNocmlzIE1haXIgKFNv
+dXJjZWZvcmdlIGtleSkgPGNocmlzbWFpckBlYXJ0aGxpbmsubmV0PokBOAQTAQIA
+IgUCUEap6QIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQODYv1c+iZouv
+LAf+Juc4mE1UMlShzNfebTCOY8k64zs0bN9QTGdujTvRIIRc3MvxermOP4Oyh0gr
+N1I0pM7wLqhOeQBo8lDzhVm2OIBQABT5vVoN+XnvHIF7ZXf1+1Vg/AbD9mySfAAO
+3FUmb1fzjxECw2Uivhj87Nos0kE9iLZfjR4/A7eF8MnmJSaEK7PE6Z+/+rwvtfSY
+YaIILJpKTsPuwNo+qXGcsoYHbyaGfnThIcI83eko3r3EhujafFfyVoma+kmn260u
+sRe0hkUs2VF3QOoE6hIWgnE/OPCrTMO+rXvvdyJNrv81P/Vog2gjNQb2+DxkGRsU
+QR9YsxOvGLNx4YYp9nEMFPbdLbkBDQRQRqnpAQgAriNjusauJjiY1Xk7mDcQptsd
+rkhd+8MXKKQKlPbsNnKMcYI8+nGk7Ns2JxiGEltqi0fuswUbPKTl7Wq3fKIGXCwg
+WOSOz5uInme50D0puNhW57cIjQsk5vVGklPr8egc0JGyUQhx3s1ZBVzUQdYiTgpb
+r5P0wRjM8xBOleasuG/i3kK2xoGr5130F9MNa8W3y5ua8Lg4VkrGxT0Hk7i3Urs2
+JqFHUjPn/x4ATN5H/jLD3V2I8yMllEapLjVFp5rKmMAzuEZ6E0eotXpMmvIsRtks
+Ikd+pyCNkhI4p6+aaqdrnDcfqv9rmIj0t7go+yOVBnt+4HGXeE1bPdKjCYORXwAR
+AQABiQEfBBgBAgAJBQJQRqnpAhsMAAoJEDg2L9XPomaLfwgIAJCLCPoBuekwB5PY
+IEM1VLTEdsKb1ikHxwGdSKDXV9BM3bahXM2bLzHrlz2HqsoUHelE+NXByQxGO+/Z
+tJNWbVJBjasZLL+WeFMR5fpgNYXJFpIA2b1k3/zGUvZMGa/D6jZr3Pm4unaT8bd2
+Vghsp3Co+D0255V/TJ8sm8EdEvq5Gux97Xtpy/DsKnMTl7arF5i3yP6Eu57NLpuH
+bxeuFCfKmWP/IU544uI2fBp1FfiWb9FnFZyOp9PEHqZt3gC56zOTS+qVu1zjv9EK
+2nAkRuJm1a3o0Hh0m6dP56ACtNikn/YsWuQuSZzPcpLjYYx2N/4N3+JCMYgQjxT9
+4JUCvTY=
+=GUoQ
+-----END PGP PUBLIC KEY BLOCK-----

gradle/verification-metadata.xml

@@ -75,7 +75,6 @@
          <ignored-key id="2E2A3AECF13B25AC" reason="Key couldn't be downloaded from any key server"/>
          <ignored-key id="2F732027B9B0B96C" reason="Key couldn't be downloaded from any key server"/>
          <ignored-key id="3684155E9365C30E" reason="Key couldn't be downloaded from any key server"/>
-         <ignored-key id="38362FD5CFA2668B" reason="Key couldn't be downloaded from any key server"/>
          <ignored-key id="385EF0846E5CF3F3" reason="Key couldn't be downloaded from any key server"/>
          <ignored-key id="38EE757D69184620" reason="Key couldn't be downloaded from any key server"/>
          <ignored-key id="39B48E1BADDB933F" reason="Key couldn't be downloaded from any key server"/>

subprojects/groovy-xml/src/test/groovy/groovy/xml/StreamingMarkupWriterTest.groovy

@@ -86,6 +86,6 @@ class StreamingMarkupWriterTest {
     @Test
     void loneHighSurrogateIsRejected() {
         def w = new StreamingMarkupWriter(new StringWriter())
-        assertThrows(IOException) { w.write('\uD835' + 'A') }
+        assertThrows(IOException) { w.write('\uD835A') }
     }
 }