Adjust tests

Author: pomadchin

store/src/main/scala/geotrellis/store/GeoTrellisPath.scala

@@ -55,9 +55,9 @@ object GeoTrellisPath {
   implicit def toGeoTrellisDataPath(path: String): GeoTrellisPath = parse(path)
 
   def parseOption(path: String): Option[GeoTrellisPath] = {
-    val layerNameParam: String = "layer"
-    val zoomLevelParam: String = "zoom"
-    val bandCountParam: String = "band_count"
+    val layerNameParam = "layer"
+    val zoomLevelParam = "zoom"
+    val bandCountParam = "band_count"
 
     val uri = UrlWithAuthority.parseOption(path).fold(Url.parse(path))(identity)
     val queryString = uri.query
@@ -70,18 +70,18 @@ object GeoTrellisPath {
           case _ => ""
         }
 
-      val queryStringClean = {
+      val queryStringFiltered = {
         val filtered = queryString.removeAll(layerNameParam, zoomLevelParam, bandCountParam)
         if(filtered.isEmpty) "" else s"?${filtered.toString()}"
       }
 
-      s"${scheme.split("\\+").last}://$authority${uri.path}$queryStringClean".trim.some
+      s"${scheme.split("\\+").last}://$authority${uri.path}$queryStringFiltered".trim.some
     }
 
     catalogPath.fold(Option.empty[GeoTrellisPath]) { catalogPath =>
-      val maybeLayerName: Option[String] = queryString.param(layerNameParam)
-      val maybeZoomLevel: Option[Int] = queryString.param(zoomLevelParam).map(_.toInt)
-      val bandCount: Option[Int] = queryString.param(bandCountParam).map(_.toInt)
+      val maybeLayerName = queryString.param(layerNameParam)
+      val maybeZoomLevel = queryString.param(zoomLevelParam).map(_.toInt)
+      val bandCount = queryString.param(bandCountParam).map(_.toInt)
 
       (maybeLayerName, maybeZoomLevel) match {
         case (Some(layerName), Some(zoomLevel)) =>

store/src/test/scala/geotrellis/store/GeoTrellisPathSpec.scala

@@ -106,9 +106,9 @@ class GeoTrellisPathSpec extends AnyFunSpec {
       assert(path.layerName == "foo")
     }
 
-    it("should ignore invalid parameters") {
+    it("should not ignore invalid parameters") {
       val path = GeoTrellisPath.parse("file:///foo/bar?layer=baz&zoom=1&invalid=not&nope=1")
-      assert(path == GeoTrellisPath("file:///foo/bar", "baz", 1, None))
+      assert(path == GeoTrellisPath("file:///foo/bar?invalid=not&nope=1", "baz", 1, None))
     }
   }
 }