Fix attribute verifiers

Author: simonoakesepimorphics

binary-array-ld-netcdf/src/test/kotlin/net/bald/netcdf/AttributeSourceVerifier.kt

@@ -16,11 +16,10 @@ class AttributeSourceVerifier(
      * Begin verifying attributes on the attribute source.
      * Attributes are supplied in the order that they are declared.
      * Also verify that the number of attributes verified is equal to the total number of attributes available.
-     * @param prefix The prefix mapping to apply.
      * @param verify A function to perform against the [AttributesVerifier] for the resource.
      */
-    fun attributes(prefix: PrefixMapping, verify: AttributesVerifier.() -> Unit) {
-        val attrs = source.attributes(prefix)
+    fun attributes(verify: AttributesVerifier.() -> Unit) {
+        val attrs = source.attributes()
         val attrIt = attrs.iterator()
         AttributesVerifier(source, attrIt).verify()
         if (attrIt.hasNext()) {

binary-array-ld-netcdf/src/test/kotlin/net/bald/netcdf/AttributesVerifier.kt

@@ -13,22 +13,20 @@ class AttributesVerifier(
      * Verify that the next attribute has the given properties.
      * Begin verifying values on the attribute.
      * @param uri The expected attribute URI.
-     * @param name The expected attribute name.
      * @param verify A function to perform against the [AttributeValuesVerifier] for the attribute.
      */
-    fun attribute(uri: String?, name: String, verify: AttributeValuesVerifier.() -> Unit = {}) {
+    fun attribute(uri: String, verify: AttributeValuesVerifier.() -> Unit = {}) {
         if (attrIt.hasNext()) {
             val attr = attrIt.next()
             assertEquals(uri, attr.uri, "Wrong URI on attribute $attr.")
-            assertEquals(name, attr.name, "Wrong name on attribute $attr.")
 
             val valueIt = attr.values.iterator()
             AttributeValuesVerifier(attr, valueIt).verify()
             if (valueIt.hasNext()) {
                 fail("Unexpected value on attribute $attr: ${valueIt.next()}")
             }
         } else {
-            fail("Expected attribute with name $name on $source, but no more attributes were found.")
+            fail("Expected attribute with URI $uri on $source, but no more attributes were found.")
         }
     }
 }