From: <svn...@os...> - 2012-03-01 14:15:23
|
Author: jive Date: 2012-03-01 06:15:12 -0800 (Thu, 01 Mar 2012) New Revision: 38592 Modified: trunk/modules/unsupported/process-feature/src/main/java/org/geotools/process/feature/gs/ReShapeProcess.java trunk/modules/unsupported/process-feature/src/test/java/org/geotools/process/feature/gs/AggregateProcessTest.java trunk/modules/unsupported/process-feature/src/test/java/org/geotools/process/feature/gs/BufferFeatureCollectionTest.java trunk/modules/unsupported/process-feature/src/test/java/org/geotools/process/feature/gs/FeatureGSProcessFactoryFactoryTest.java trunk/modules/unsupported/process-feature/src/test/java/org/geotools/process/feature/gs/FeatureProcessTest.java trunk/modules/unsupported/process-feature/src/test/java/org/geotools/process/feature/gs/InclusionFeatureCollectionTest.java trunk/modules/unsupported/process-feature/src/test/java/org/geotools/process/feature/gs/IntersectionFeatureCollectionTest.java trunk/modules/unsupported/process-feature/src/test/java/org/geotools/process/feature/gs/UnionFeatureCollectionTest.java Log: Add a test case to confirm expected schema generated by ReShapeOperation; also added a couple of headers to the various test cases Modified: trunk/modules/unsupported/process-feature/src/main/java/org/geotools/process/feature/gs/ReShapeProcess.java =================================================================== --- trunk/modules/unsupported/process-feature/src/main/java/org/geotools/process/feature/gs/ReShapeProcess.java 2012-03-01 14:14:53 UTC (rev 38591) +++ trunk/modules/unsupported/process-feature/src/main/java/org/geotools/process/feature/gs/ReShapeProcess.java 2012-03-01 14:15:12 UTC (rev 38592) @@ -245,8 +245,12 @@ this.definition = definition; this.schema = toReShapeFeatureType( delegate, definition ); } - @Override + public SimpleFeatureType getSchema() { + return schema; + } + + @Override public SimpleFeatureIterator features() { return new ReshapeFeatureIterator(delegate.features(), definition, schema); } @@ -282,6 +286,7 @@ fb = new SimpleFeatureBuilder(schema); } + public void close() { delegate.close(); } Modified: trunk/modules/unsupported/process-feature/src/test/java/org/geotools/process/feature/gs/AggregateProcessTest.java =================================================================== --- trunk/modules/unsupported/process-feature/src/test/java/org/geotools/process/feature/gs/AggregateProcessTest.java 2012-03-01 14:14:53 UTC (rev 38591) +++ trunk/modules/unsupported/process-feature/src/test/java/org/geotools/process/feature/gs/AggregateProcessTest.java 2012-03-01 14:15:12 UTC (rev 38592) @@ -1,6 +1,22 @@ +/* + * GeoTools - The Open Source Java GIS Toolkit + * http://geotools.org + * + * (C) 2011, Open Source Geospatial Foundation (OSGeo) + * (C) 2001-2007 TOPP - www.openplans.org. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + */ package org.geotools.process.feature.gs; - import static org.junit.Assert.assertTrue; import java.io.File; Modified: trunk/modules/unsupported/process-feature/src/test/java/org/geotools/process/feature/gs/BufferFeatureCollectionTest.java =================================================================== --- trunk/modules/unsupported/process-feature/src/test/java/org/geotools/process/feature/gs/BufferFeatureCollectionTest.java 2012-03-01 14:14:53 UTC (rev 38591) +++ trunk/modules/unsupported/process-feature/src/test/java/org/geotools/process/feature/gs/BufferFeatureCollectionTest.java 2012-03-01 14:15:12 UTC (rev 38592) @@ -1,3 +1,20 @@ +/* + * GeoTools - The Open Source Java GIS Toolkit + * http://geotools.org + * + * (C) 2011, Open Source Geospatial Foundation (OSGeo) + * (C) 2001-2007 TOPP - www.openplans.org. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + */ package org.geotools.process.feature.gs; import junit.framework.TestCase; Modified: trunk/modules/unsupported/process-feature/src/test/java/org/geotools/process/feature/gs/FeatureGSProcessFactoryFactoryTest.java =================================================================== --- trunk/modules/unsupported/process-feature/src/test/java/org/geotools/process/feature/gs/FeatureGSProcessFactoryFactoryTest.java 2012-03-01 14:14:53 UTC (rev 38591) +++ trunk/modules/unsupported/process-feature/src/test/java/org/geotools/process/feature/gs/FeatureGSProcessFactoryFactoryTest.java 2012-03-01 14:15:12 UTC (rev 38592) @@ -1,3 +1,20 @@ +/* + * GeoTools - The Open Source Java GIS Toolkit + * http://geotools.org + * + * (C) 2011, Open Source Geospatial Foundation (OSGeo) + * (C) 2001-2007 TOPP - www.openplans.org. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + */ package org.geotools.process.feature.gs; import static org.junit.Assert.*; Modified: trunk/modules/unsupported/process-feature/src/test/java/org/geotools/process/feature/gs/FeatureProcessTest.java =================================================================== --- trunk/modules/unsupported/process-feature/src/test/java/org/geotools/process/feature/gs/FeatureProcessTest.java 2012-03-01 14:14:53 UTC (rev 38591) +++ trunk/modules/unsupported/process-feature/src/test/java/org/geotools/process/feature/gs/FeatureProcessTest.java 2012-03-01 14:15:12 UTC (rev 38592) @@ -1,3 +1,20 @@ +/* + * GeoTools - The Open Source Java GIS Toolkit + * http://geotools.org + * + * (C) 2011, Open Source Geospatial Foundation (OSGeo) + * (C) 2001-2007 TOPP - www.openplans.org. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + */ package org.geotools.process.feature.gs; import static org.junit.Assert.*; Modified: trunk/modules/unsupported/process-feature/src/test/java/org/geotools/process/feature/gs/InclusionFeatureCollectionTest.java =================================================================== --- trunk/modules/unsupported/process-feature/src/test/java/org/geotools/process/feature/gs/InclusionFeatureCollectionTest.java 2012-03-01 14:14:53 UTC (rev 38591) +++ trunk/modules/unsupported/process-feature/src/test/java/org/geotools/process/feature/gs/InclusionFeatureCollectionTest.java 2012-03-01 14:15:12 UTC (rev 38592) @@ -1,3 +1,20 @@ +/* + * GeoTools - The Open Source Java GIS Toolkit + * http://geotools.org + * + * (C) 2011, Open Source Geospatial Foundation (OSGeo) + * (C) 2001-2007 TOPP - www.openplans.org. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + */ package org.geotools.process.feature.gs; import static org.junit.Assert.assertEquals; Modified: trunk/modules/unsupported/process-feature/src/test/java/org/geotools/process/feature/gs/IntersectionFeatureCollectionTest.java =================================================================== --- trunk/modules/unsupported/process-feature/src/test/java/org/geotools/process/feature/gs/IntersectionFeatureCollectionTest.java 2012-03-01 14:14:53 UTC (rev 38591) +++ trunk/modules/unsupported/process-feature/src/test/java/org/geotools/process/feature/gs/IntersectionFeatureCollectionTest.java 2012-03-01 14:15:12 UTC (rev 38592) @@ -1,3 +1,20 @@ +/* + * GeoTools - The Open Source Java GIS Toolkit + * http://geotools.org + * + * (C) 2011, Open Source Geospatial Foundation (OSGeo) + * (C) 2001-2007 TOPP - www.openplans.org. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + */ package org.geotools.process.feature.gs; import java.util.List; Modified: trunk/modules/unsupported/process-feature/src/test/java/org/geotools/process/feature/gs/UnionFeatureCollectionTest.java =================================================================== --- trunk/modules/unsupported/process-feature/src/test/java/org/geotools/process/feature/gs/UnionFeatureCollectionTest.java 2012-03-01 14:14:53 UTC (rev 38591) +++ trunk/modules/unsupported/process-feature/src/test/java/org/geotools/process/feature/gs/UnionFeatureCollectionTest.java 2012-03-01 14:15:12 UTC (rev 38592) @@ -1,3 +1,20 @@ +/* + * GeoTools - The Open Source Java GIS Toolkit + * http://geotools.org + * + * (C) 2011, Open Source Geospatial Foundation (OSGeo) + * (C) 2001-2007 TOPP - www.openplans.org. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + */ package org.geotools.process.feature.gs; import static org.junit.Assert.*; |