PR #1429 Review Comments

locationtech · May 10, 2016 · b6fbc65 · b6fbc65
1 parent 6137620
commit b6fbc65
Show file tree

Hide file tree

Showing 22 changed files with 35 additions and 30 deletions.
diff --git a/accumulo/src/test/scala/geotrellis/spark/io/accumulo/AccumuloSpaceTimeSpec.scala b/accumulo/src/test/scala/geotrellis/spark/io/accumulo/AccumuloSpaceTimeSpec.scala
@@ -15,8 +15,8 @@ class AccumuloSpaceTimeSpec
     with TestEnvironment
     with AccumuloTestEnvironment
     with TestFiles
-    with CoordinateSpaceTimeTests
-    with LayerUpdateSpaceTimeTileTests {
+    with CoordinateSpaceTimeSpec
+    with LayerUpdateSpaceTimeTileSpec {
   implicit lazy val instance = MockAccumuloInstance()
 
   lazy val reader    = AccumuloLayerReader(instance)

diff --git a/accumulo/src/test/scala/geotrellis/spark/io/accumulo/AccumuloSpatialSpec.scala b/accumulo/src/test/scala/geotrellis/spark/io/accumulo/AccumuloSpatialSpec.scala
@@ -12,7 +12,7 @@ class AccumuloSpatialSpec
     with TestEnvironment
     with AccumuloTestEnvironment
     with TestFiles
-    with AllOnesTestTileTests {
+    with AllOnesTestTileSpec {
 
   implicit lazy val instance = MockAccumuloInstance()
 

diff --git a/accumulo/src/test/scala/geotrellis/spark/io/accumulo/AccumuloTileFeatureSpaceTimeSpec.scala b/accumulo/src/test/scala/geotrellis/spark/io/accumulo/AccumuloTileFeatureSpaceTimeSpec.scala
@@ -16,8 +16,8 @@ class AccumuloTileFeatureSpaceTimeSpec
     with TestEnvironment
     with AccumuloTestEnvironment
     with TestTileFeatureFiles
-    with CoordinateSpaceTimeTileFeatureTests
-    with LayerUpdateSpaceTimeTileFeatureTests {
+    with CoordinateSpaceTimeTileFeatureSpec
+    with LayerUpdateSpaceTimeTileFeatureSpec {
   implicit lazy val instance = MockAccumuloInstance()
 
   lazy val reader    = AccumuloLayerReader(instance)

diff --git a/accumulo/src/test/scala/geotrellis/spark/io/accumulo/AccumuloTileFeatureSpatialSpec.scala b/accumulo/src/test/scala/geotrellis/spark/io/accumulo/AccumuloTileFeatureSpatialSpec.scala
@@ -13,7 +13,7 @@ class AccumuloTileFeatureSpatialSpec
     with TestEnvironment
     with AccumuloTestEnvironment
     with TestTileFeatureFiles
-    with AllOnesTestTileFeatureTests {
+    with AllOnesTestTileFeatureSpec {
 
   implicit lazy val instance = MockAccumuloInstance()
 

diff --git a/s3/src/test/scala/geotrellis/spark/io/s3/S3SpaceTimeSpec.scala b/s3/src/test/scala/geotrellis/spark/io/s3/S3SpaceTimeSpec.scala
@@ -16,8 +16,8 @@ class S3SpaceTimeSpec
     with SpaceTimeKeyIndexMethods
     with TestEnvironment
     with TestFiles
-    with CoordinateSpaceTimeTests
-    with LayerUpdateSpaceTimeTileTests
+    with CoordinateSpaceTimeSpec
+    with LayerUpdateSpaceTimeTileSpec
     with BeforeAndAfterAll {
 
   registerAfterAll { () =>

diff --git a/s3/src/test/scala/geotrellis/spark/io/s3/S3SpatialSpec.scala b/s3/src/test/scala/geotrellis/spark/io/s3/S3SpatialSpec.scala
@@ -12,7 +12,7 @@ class S3SpatialSpec
   extends PersistenceSpec[SpatialKey, Tile, TileLayerMetadata[SpatialKey]]
     with SpatialKeyIndexMethods
     with TestEnvironment with TestFiles
-    with AllOnesTestTileTests {
+    with AllOnesTestTileSpec {
 
   lazy val bucket = "mock-bucket"
   lazy val prefix = "catalog"

diff --git a/s3/src/test/scala/geotrellis/spark/io/s3/S3TileFeatureSpaceTimeSpec.scala b/s3/src/test/scala/geotrellis/spark/io/s3/S3TileFeatureSpaceTimeSpec.scala
@@ -16,8 +16,8 @@ class S3TileFeatureSpaceTimeSpec
     with SpaceTimeKeyIndexMethods
     with TestEnvironment
     with TestTileFeatureFiles
-    with CoordinateSpaceTimeTileFeatureTests
-    with LayerUpdateSpaceTimeTileFeatureTests
+    with CoordinateSpaceTimeTileFeatureSpec
+    with LayerUpdateSpaceTimeTileFeatureSpec
     with BeforeAndAfterAll {
 
   registerAfterAll { () =>

diff --git a/s3/src/test/scala/geotrellis/spark/io/s3/S3TileFeatureSpatialSpec.scala b/s3/src/test/scala/geotrellis/spark/io/s3/S3TileFeatureSpatialSpec.scala
@@ -14,7 +14,7 @@ class S3TileFeatureSpatialSpec
     with SpatialKeyIndexMethods
     with TestEnvironment
     with TestTileFeatureFiles
-    with AllOnesTestTileFeatureTests {
+    with AllOnesTestTileFeatureSpec {
 
   lazy val bucket = "mock-bucket"
   lazy val prefix = "catalog"

diff --git a/...park/io/AllOnesTestTileFeatureTests.scala → ...spark/io/AllOnesTestTileFeatureSpec.scala b/...park/io/AllOnesTestTileFeatureTests.scala → ...spark/io/AllOnesTestTileFeatureSpec.scala
@@ -7,7 +7,7 @@ import geotrellis.spark.io.json._
 import geotrellis.vector.Extent
 
 
-trait AllOnesTestTileFeatureTests { self: PersistenceSpec[SpatialKey, TileFeature[Tile, Tile], TileLayerMetadata[SpatialKey]] =>
+trait AllOnesTestTileFeatureSpec { self: PersistenceSpec[SpatialKey, TileFeature[Tile, Tile], TileLayerMetadata[SpatialKey]] =>
 
   val bounds1 = GridBounds(1,1,3,3)
   val bounds2 = GridBounds(4,5,6,6)

diff --git a/...ellis/spark/io/AllOnesTestTileTests.scala → ...rellis/spark/io/AllOnesTestTileSpec.scala b/...ellis/spark/io/AllOnesTestTileTests.scala → ...rellis/spark/io/AllOnesTestTileSpec.scala
@@ -6,7 +6,8 @@ import geotrellis.spark.io.avro.codecs._
 import geotrellis.spark.io.json._
 import geotrellis.vector.Extent
 
-trait AllOnesTestTileTests { self: PersistenceSpec[SpatialKey, Tile, TileLayerMetadata[SpatialKey]] =>
+
+trait AllOnesTestTileSpec { self: PersistenceSpec[SpatialKey, Tile, TileLayerMetadata[SpatialKey]] =>
 
   val bounds1 = GridBounds(1,1,3,3)
   val bounds2 = GridBounds(4,5,6,6)

diff --git a/...s/spark/io/CoordinateSpaceTimeTests.scala → ...is/spark/io/CoordinateSpaceTimeSpec.scala b/...s/spark/io/CoordinateSpaceTimeTests.scala → ...is/spark/io/CoordinateSpaceTimeSpec.scala
@@ -7,7 +7,7 @@ import geotrellis.spark.io.avro.codecs._
 import geotrellis.spark.io.json._
 import org.joda.time.DateTime
 
-trait CoordinateSpaceTimeTests { self: PersistenceSpec[SpaceTimeKey, Tile, TileLayerMetadata[SpaceTimeKey]] =>
+trait CoordinateSpaceTimeSpec { self: PersistenceSpec[SpaceTimeKey, Tile, TileLayerMetadata[SpaceTimeKey]] =>
   val dates = Vector( // all the dates in the layer
     new DateTime(2010,1,1,0,0,0, DateTimeZone.UTC),
     new DateTime(2011,1,1,0,0,0, DateTimeZone.UTC),

diff --git a/...CoordinateSpaceTimeTileFeatureTests.scala → .../CoordinateSpaceTimeTileFeatureSpec.scala b/...CoordinateSpaceTimeTileFeatureTests.scala → .../CoordinateSpaceTimeTileFeatureSpec.scala
@@ -8,7 +8,7 @@ import geotrellis.spark.io.json._
 import org.joda.time.DateTime
 
 
-trait CoordinateSpaceTimeTileFeatureTests { self: PersistenceSpec[SpaceTimeKey, TileFeature[Tile, Tile], TileLayerMetadata[SpaceTimeKey]] =>
+trait CoordinateSpaceTimeTileFeatureSpec { self: PersistenceSpec[SpaceTimeKey, TileFeature[Tile, Tile], TileLayerMetadata[SpaceTimeKey]] =>
   val dates = Vector( // all the dates in the layer
     new DateTime(2010,1,1,0,0,0, DateTimeZone.UTC),
     new DateTime(2011,1,1,0,0,0, DateTimeZone.UTC),

diff --git a/...ayerUpdateSpaceTimeTileFeatureTests.scala → ...LayerUpdateSpaceTimeTileFeatureSpec.scala b/...ayerUpdateSpaceTimeTileFeatureTests.scala → ...LayerUpdateSpaceTimeTileFeatureSpec.scala
@@ -15,7 +15,7 @@ import geotrellis.vector._
 import org.apache.spark.rdd._
 import org.joda.time.DateTime
 
-trait LayerUpdateSpaceTimeTileFeatureTests
+trait LayerUpdateSpaceTimeTileFeatureSpec
     extends TileLayerRDDBuilders
     with TileBuilders { self: PersistenceSpec[SpaceTimeKey, TileFeature[Tile, Tile], TileLayerMetadata[SpaceTimeKey]] with TestEnvironment =>
 

diff --git a/...rk/io/LayerUpdateSpaceTimeTileTests.scala → ...ark/io/LayerUpdateSpaceTimeTileSpec.scala b/...rk/io/LayerUpdateSpaceTimeTileTests.scala → ...ark/io/LayerUpdateSpaceTimeTileSpec.scala
@@ -15,7 +15,9 @@ import geotrellis.vector._
 import org.apache.spark.rdd._
 import org.joda.time.DateTime
 
-trait LayerUpdateSpaceTimeTileTests extends TileLayerRDDBuilders with TileBuilders { self: PersistenceSpec[SpaceTimeKey, Tile, TileLayerMetadata[SpaceTimeKey]] with TestEnvironment =>
+trait LayerUpdateSpaceTimeTileSpec
+    extends TileLayerRDDBuilders
+    with TileBuilders { self: PersistenceSpec[SpaceTimeKey, Tile, TileLayerMetadata[SpaceTimeKey]] with TestEnvironment =>
 
   def dummyTileLayerMetadata =
     TileLayerMetadata(

diff --git a/spark/src/test/scala/geotrellis/spark/io/file/FileSpaceTimeSpec.scala b/spark/src/test/scala/geotrellis/spark/io/file/FileSpaceTimeSpec.scala
@@ -13,8 +13,8 @@ class FileSpaceTimeSpec
     with SpaceTimeKeyIndexMethods
     with TestEnvironment
     with TestFiles
-//    with CoordinateSpaceTimeTests
-    with LayerUpdateSpaceTimeTileTests {
+    with CoordinateSpaceTimeSpec
+    with LayerUpdateSpaceTimeTileSpec {
   lazy val reader = FileLayerReader(outputLocalPath)
   lazy val writer = FileLayerWriter(outputLocalPath)
   lazy val deleter = FileLayerDeleter(outputLocalPath)

diff --git a/spark/src/test/scala/geotrellis/spark/io/file/FileSpatialSpec.scala b/spark/src/test/scala/geotrellis/spark/io/file/FileSpatialSpec.scala
@@ -6,12 +6,13 @@ import geotrellis.spark.io._
 import geotrellis.spark.io.index._
 import geotrellis.spark.testfiles.TestFiles
 
+
 class FileSpatialSpec
     extends PersistenceSpec[SpatialKey, Tile, TileLayerMetadata[SpatialKey]]
     with SpatialKeyIndexMethods
     with TestEnvironment
     with TestFiles
-    with AllOnesTestTileTests {
+    with AllOnesTestTileSpec {
   lazy val reader = FileLayerReader(outputLocalPath)
   lazy val writer = FileLayerWriter(outputLocalPath)
   lazy val deleter = FileLayerDeleter(outputLocalPath)

diff --git a/spark/src/test/scala/geotrellis/spark/io/file/FileTileFeatureSpaceTimeSpec.scala b/spark/src/test/scala/geotrellis/spark/io/file/FileTileFeatureSpaceTimeSpec.scala
@@ -14,8 +14,8 @@ class FileTileFeatureSpaceTimeSpec
     with SpaceTimeKeyIndexMethods
     with TestEnvironment
     with TestTileFeatureFiles
-//    with CoordinateSpaceTimeTests
-    with LayerUpdateSpaceTimeTileFeatureTests {
+    with CoordinateSpaceTimeTileFeatureSpec
+    with LayerUpdateSpaceTimeTileFeatureSpec {
   lazy val reader = FileLayerReader(outputLocalPath)
   lazy val writer = FileLayerWriter(outputLocalPath)
   lazy val deleter = FileLayerDeleter(outputLocalPath)

diff --git a/spark/src/test/scala/geotrellis/spark/io/file/FileTileFeatureSpatialSpec.scala b/spark/src/test/scala/geotrellis/spark/io/file/FileTileFeatureSpatialSpec.scala
@@ -14,7 +14,7 @@ class FileTileFeatureSpatialSpec
     with SpatialKeyIndexMethods
     with TestEnvironment
     with TestTileFeatureFiles
-    with AllOnesTestTileFeatureTests {
+    with AllOnesTestTileFeatureSpec {
   lazy val reader = FileLayerReader(outputLocalPath)
   lazy val writer = FileLayerWriter(outputLocalPath)
   lazy val deleter = FileLayerDeleter(outputLocalPath)

diff --git a/spark/src/test/scala/geotrellis/spark/io/hadoop/HadoopSpaceTimeSpec.scala b/spark/src/test/scala/geotrellis/spark/io/hadoop/HadoopSpaceTimeSpec.scala
@@ -14,8 +14,8 @@ class HadoopSpaceTimeSpec
     with SpaceTimeKeyIndexMethods
     with TestEnvironment
     with TestFiles
-    with CoordinateSpaceTimeTests
-    with LayerUpdateSpaceTimeTileTests {
+    with CoordinateSpaceTimeSpec
+    with LayerUpdateSpaceTimeTileSpec {
   lazy val reader = HadoopLayerReader(outputLocal)
   lazy val writer = HadoopLayerWriter(outputLocal)
   lazy val deleter = HadoopLayerDeleter(outputLocal)

diff --git a/spark/src/test/scala/geotrellis/spark/io/hadoop/HadoopSpatialSpec.scala b/spark/src/test/scala/geotrellis/spark/io/hadoop/HadoopSpatialSpec.scala
@@ -6,12 +6,13 @@ import geotrellis.spark.io._
 import geotrellis.spark.io.index._
 import geotrellis.spark.testfiles.TestFiles
 
+
 class HadoopSpatialSpec
   extends PersistenceSpec[SpatialKey, Tile, TileLayerMetadata[SpatialKey]]
     with SpatialKeyIndexMethods
     with TestEnvironment
     with TestFiles
-    with AllOnesTestTileTests {
+    with AllOnesTestTileSpec {
 
   lazy val reader = HadoopLayerReader(outputLocal)
   lazy val writer = HadoopLayerWriter(outputLocal)

diff --git a/spark/src/test/scala/geotrellis/spark/io/hadoop/HadoopTileFeatureSpaceTimeSpec.scala b/spark/src/test/scala/geotrellis/spark/io/hadoop/HadoopTileFeatureSpaceTimeSpec.scala
@@ -15,8 +15,8 @@ class HadoopTileFeatureSpaceTimeSpec
     with SpaceTimeKeyIndexMethods
     with TestEnvironment
     with TestTileFeatureFiles
-    with CoordinateSpaceTimeTileFeatureTests
-    with LayerUpdateSpaceTimeTileFeatureTests {
+    with CoordinateSpaceTimeTileFeatureSpec
+    with LayerUpdateSpaceTimeTileFeatureSpec {
   lazy val reader = HadoopLayerReader(outputLocal)
   lazy val writer = HadoopLayerWriter(outputLocal)
   lazy val deleter = HadoopLayerDeleter(outputLocal)

diff --git a/spark/src/test/scala/geotrellis/spark/io/hadoop/HadoopTileFeatureSpatialSpec.scala b/spark/src/test/scala/geotrellis/spark/io/hadoop/HadoopTileFeatureSpatialSpec.scala
@@ -12,7 +12,7 @@ class HadoopTileFeatureSpatialSpec
     with SpatialKeyIndexMethods
     with TestEnvironment
     with TestTileFeatureFiles
-    with AllOnesTestTileFeatureTests {
+    with AllOnesTestTileFeatureSpec {
 
   lazy val reader = HadoopLayerReader(outputLocal)
   lazy val writer = HadoopLayerWriter(outputLocal)