Update test cases to work with GeoTools 21+

Author: Devon Tucker

geoscript/function.py

@@ -7,8 +7,8 @@
 import java
 import weakref
 import inspect
-from org.geotools.factory import FactoryIteratorProvider, CommonFactoryFinder
-from org.geotools.factory import GeoTools
+from org.geotools.factory import CommonFactoryFinder
+from org.geotools.util.factory import FactoryIteratorProvider, GeoTools
 from org.geotools.filter import FunctionFactory, FunctionExpressionImpl
 
 _factory = CommonFactoryFinder.getFilterFactory(None)

geoscript/geom/circularring.py

@@ -12,7 +12,7 @@ class CircularRing(_CircularRing):
     *coords* is a variable list of ``list``/``tuple`` arguments.
 
     >>> CircularRing([1,1], [5,5], [2,2], [4,5], [1,1])
-    CIRCULARSTRING(1.0 1.0, 5.0 5.0, 2.0 2.0, 4.0 5.0, 1.0 1.0)
+    CIRCULARSTRING (1.0 1.0, 5.0 5.0, 2.0 2.0, 4.0 5.0, 1.0 1.0)
     """
 
     def __init__(self, *coords):

geoscript/geom/circularstring.py

@@ -12,7 +12,7 @@ class CircularString(_CircularString):
     *coords* is a variable list of ``list``/``tuple`` arguments.
 
     >>> CircularString([1,1], [5,5], [2,2])
-    CIRCULARSTRING(1.0 1.0, 5.0 5.0, 2.0 2.0)
+    CIRCULARSTRING (1.0 1.0, 5.0 5.0, 2.0 2.0)
     """
 
     def __init__(self, *coords):

geoscript/geom/compoundcurve.py

@@ -14,7 +14,7 @@ class CompoundCurve(_CompoundCurve):
     *linestrings* is a variable list of ``LineStrings`` or ``CircularStrings`` arguments.
 
     >>> CompoundCurve(CircularString([10.0, 10.0], [0.0, 20.0], [-10.0, 10.0]), LineString([-10.0, 10.0], [-10.0, 0.0], [10.0, 0.0], [5.0, 5.0]))
-    COMPOUNDCURVE(CIRCULARSTRING(10.0 10.0, 0.0 20.0, -10.0 10.0), (-10.0 10.0, -10.0 0.0, 10.0 0.0, 5.0 5.0))
+    COMPOUNDCURVE (CIRCULARSTRING (10.0 10.0, 0.0 20.0, -10.0 10.0), (-10.0 10.0, -10.0 0.0, 10.0 0.0, 5.0 5.0))
     """
 
     def __init__(self, *linestrings):

geoscript/geom/compoundring.py

@@ -14,7 +14,7 @@ class CompoundRing(_CompoundRing):
     *linestrings* is a variable list of ``LineStrings`` or ``CircularStrings`` arguments.
 
     >>> CompoundRing(CircularString([10.0, 10.0], [0.0, 20.0], [-10.0, 10.0]),LineString([-10.0, 10.0], [-10.0, 0.0], [10.0, 0.0], [10.0, 10.0]))
-    COMPOUNDCURVE(CIRCULARSTRING(10.0 10.0, 0.0 20.0, -10.0 10.0), (-10.0 10.0, -10.0 0.0, 10.0 0.0, 10.0 10.0))
+    COMPOUNDCURVE (CIRCULARSTRING (10.0 10.0, 0.0 20.0, -10.0 10.0), (-10.0 10.0, -10.0 0.0, 10.0 0.0, 10.0 10.0))
     """
 
     def __init__(self, *linestrings):

geoscript/geom/io/gml.py

@@ -13,7 +13,7 @@ def writeGML(g, ver=2, format=True, xmldecl=False):
 
   >>> from geoscript.geom import Point 
   >>> writeGML(Point(1,2), format=False)
-  u'<gml:Point xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml"><gml:coord><gml:X>1.0</gml:X><gml:Y>2.0</gml:Y></gml:coord></gml:Point>'
+  u'<gml:Point xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" xmlns:xlink="http://www.w3.org/1999/xlink"><gml:coord><gml:X>1.0</gml:X><gml:Y>2.0</gml:Y></gml:coord></gml:Point>'
   """
   el = g.getGeometryType()
 

geoscript/style/io/sld.py

@@ -1,6 +1,6 @@
 import sys
 from geoscript import util
-from org.geotools.styling import SLDTransformer
+from org.geotools.xml.styling import SLDTransformer
 
 def writeSLD(style, out=sys.stdout, format=True):
   tx = SLDTransformer()

geoscript/workspace/workspace.py

@@ -48,7 +48,7 @@ def layers(self):
     >>> l1 = ws.create('foo')
     >>> l2 = ws.create('bar')
     >>> ws.layers()
-    ['foo', 'bar']
+    ['bar', 'foo']
     """
 
     return [str(tn) for tn in self._store.typeNames]
@@ -99,7 +99,7 @@ def create(self, name=None, fields=[('geom', geom.Geometry,'epsg:4326')], schema
      >>> from geoscript.feature import Schema
      >>> l2 = ws.create(schema=Schema('bar', [('geom', geom.Point)]))
      >>> ws.layers()
-     ['foo', 'bar']
+     ['bar', 'foo']
      """
 
      if not name:

tests/test_feature.py

@@ -7,7 +7,7 @@
 except ImportError:
   import simplejson as json
 
-class Feature_Test:
+class Feature_Test(unittest.TestCase):
 
   @classmethod
   def setUpClass(cls):
@@ -197,7 +197,7 @@ def testWriteGML3(self):
     assert u'1' in xp.findvalues('//gsf:x', doc) 
     assert u'1.1' in xp.findvalues('//gsf:y', doc) 
     assert u'one' in xp.findvalues('//gsf:z', doc) 
-    assert u'-125.0 50.0' in xp.findvalues('//gsf:geom/gml:Point/gml:pos', doc)
+    self.assertIn(u'-125 50', xp.findvalues('//gsf:geom/gml:Point/gml:pos', doc))
 
   def testWriteGML32(self):
     g = geom.Point(-125, 50)
@@ -211,5 +211,5 @@ def testWriteGML32(self):
     assert u'1' in xp.findvalues('//gsf:x', doc) 
     assert u'1.1' in xp.findvalues('//gsf:y', doc) 
     assert u'one' in xp.findvalues('//gsf:z', doc) 
-    assert u'-125.0 50.0' in xp.findvalues('//gsf:geom/gml:Point/gml:pos', doc)
+    self.assertIn(u'-125 50', xp.findvalues('//gsf:geom/gml:Point/gml:pos', doc))
 

tests/test_geom.py

@@ -58,25 +58,25 @@ def testMultiPolygon(self):
 
   def testCircularString(self):
     cs = geom.CircularString([6.12, 10.0],[7.07, 7.07],[10.0, 0.0])
-    self.assertEqual('CIRCULARSTRING(6.12 10.0, 7.07 7.07, 10.0 0.0)', str(cs))
+    self.assertEqual('CIRCULARSTRING (6.12 10.0, 7.07 7.07, 10.0 0.0)', str(cs))
 
   def testCircularRing(self):
     cr = geom.CircularRing( [2.0, 1.0], [1.0, 2.0], [0.0, 1.0], [1.0, 0.0], [2.0, 1.0])
-    self.assertEqual('CIRCULARSTRING(2.0 1.0, 1.0 2.0, 0.0 1.0, 1.0 0.0, 2.0 1.0)', str(cr))
+    self.assertEqual('CIRCULARSTRING (2.0 1.0, 1.0 2.0, 0.0 1.0, 1.0 0.0, 2.0 1.0)', str(cr))
 
   def testCompoundCurve(self):
     cc = geom.CompoundCurve(
         geom.CircularString([10.0, 10.0], [0.0, 20.0], [-10.0, 10.0]),
         geom.LineString([-10.0, 10.0], [-10.0, 0.0], [10.0, 0.0], [5.0, 5.0])
     )
-    self.assertEqual('COMPOUNDCURVE(CIRCULARSTRING(10.0 10.0, 0.0 20.0, -10.0 10.0), (-10.0 10.0, -10.0 0.0, 10.0 0.0, 5.0 5.0))', str(cc))
+    self.assertEqual('COMPOUNDCURVE (CIRCULARSTRING (10.0 10.0, 0.0 20.0, -10.0 10.0), (-10.0 10.0, -10.0 0.0, 10.0 0.0, 5.0 5.0))', str(cc))
 
   def testCompoundRing(self):
     cc = geom.CompoundRing(
         geom.CircularString([10.0, 10.0], [0.0, 20.0], [-10.0, 10.0]),
         geom.LineString([-10.0, 10.0], [-10.0, 0.0], [10.0, 0.0], [10.0, 10.0])
     )
-    self.assertEqual('COMPOUNDCURVE(CIRCULARSTRING(10.0 10.0, 0.0 20.0, -10.0 10.0), (-10.0 10.0, -10.0 0.0, 10.0 0.0, 10.0 10.0))', str(cc))
+    self.assertEqual('COMPOUNDCURVE (CIRCULARSTRING (10.0 10.0, 0.0 20.0, -10.0 10.0), (-10.0 10.0, -10.0 0.0, 10.0 0.0, 10.0 10.0))', str(cc))
 
   def testBounds(self):
     b = geom.Bounds(1.0, 2.0, 3.0, 4.0)