Fix bug with Schema ignorning namespace URI.

jericks · jericks · commit b1c8f3e111f2 · 2012-11-28T19:00:13.000-08:00
diff --git a/src/main/groovy/geoscript/feature/Schema.groovy b/src/main/groovy/geoscript/feature/Schema.groovy
@@ -74,7 +74,7 @@ class Schema {
      * @param uri The namespace uri
      */
     Schema(String name, def fields, String uri = "http://geoscript.org/feature") {
-        this(buildFeatureType(name, fields))
+        this(buildFeatureType(name, fields, uri))
     }
 
     /**
diff --git a/src/test/groovy/geoscript/feature/SchemaTestCase.groovy b/src/test/groovy/geoscript/feature/SchemaTestCase.groovy
@@ -32,7 +32,7 @@ class SchemaTestCase {
 
         Schema s6 = new Schema("widgets", [new Field("geom","Point"), new Field("name","string"), new Field("price","float")], "http://geotools.org/feature")
         assertEquals "widgets geom: Point, name: String, price: Float", s6.toString()
-        assertEquals "http://geoscript.org/feature", s6.uri
+        assertEquals "http://geotools.org/feature", s6.uri
     }
 
     @Test void getName() {

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ class Schema {`
`74`	`74`	`* @param uri The namespace uri`
`75`	`75`	`*/`
`76`	`76`	`Schema(String name, def fields, String uri = "http://geoscript.org/feature") {`
`77`		`- this(buildFeatureType(name, fields))`
	`77`	`+ this(buildFeatureType(name, fields, uri))`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class SchemaTestCase {`
`32`	`32`
`33`	`33`	`Schema s6 = new Schema("widgets", [new Field("geom","Point"), new Field("name","string"), new Field("price","float")], "http://geotools.org/feature")`
`34`	`34`	`assertEquals "widgets geom: Point, name: String, price: Float", s6.toString()`
`35`		`- assertEquals "http://geoscript.org/feature", s6.uri`
	`35`	`+ assertEquals "http://geotools.org/feature", s6.uri`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`@Test void getName() {`