Test minor refactoring

Author: pditommaso

modules/nf-google/src/main/nextflow/cloud/google/util/GsPathFactory.groovy

@@ -22,6 +22,7 @@ import com.google.cloud.storage.contrib.nio.CloudStorageConfiguration
 import com.google.cloud.storage.contrib.nio.CloudStorageFileSystem
 import groovy.transform.CompileStatic
 import nextflow.Global
+import nextflow.Session
 import nextflow.cloud.google.lifesciences.GoogleLifeSciencesConfig
 import nextflow.file.FileSystemPathFactory
 
@@ -39,7 +40,7 @@ class GsPathFactory extends FileSystemPathFactory {
     } ()
 
     static private CloudStorageConfiguration getCloudStorageConfig() {
-        def session = Global.getSession() as nextflow.Session
+        final session = (Session) Global.getSession()
         if (!session)
             new IllegalStateException("Cannot initialize GsPathFactory: missing session")
 

modules/nf-google/src/test/nextflow/cloud/google/util/GsPathPathFactoryTest.groovy renamed to modules/nf-google/src/test/nextflow/cloud/google/util/GsPathFactoryTest.groovy

@@ -16,27 +16,21 @@
 
 package nextflow.cloud.google.util
 
-
-import spock.lang.Specification
-
-import com.google.cloud.storage.contrib.nio.CloudStorageConfiguration
-import com.google.cloud.storage.contrib.nio.CloudStorageFileSystem
 import nextflow.Global
 import nextflow.Session
-import nextflow.cloud.google.lifesciences.GoogleLifeSciencesConfig
-import nextflow.config.ConfigBuilder
-
+import spock.lang.Specification
 /**
  *
  * @author Paolo Di Tommaso <[email protected]>
  */
-class GsPathPathFactoryTest extends Specification {
+class GsPathFactoryTest extends Specification {
 
     def 'should create gs path' () {
         given:
-        def sess = new Session()
-        sess.config = [google:[project:'foo', region:'x']]
-        Global.session = sess
+        Global.session = Mock(Session) {
+            getConfig() >> [google:[project:'foo', region:'x']]
+        }
+        and:
         def factory = new GsPathFactory()
 
         expect:
@@ -53,9 +47,9 @@ class GsPathPathFactoryTest extends Specification {
 
     def 'should use requester pays' () {
         given:
-        def sess = new Session()
-        sess.config = [google:[project:'foo', region:'x', enableRequesterPaysBuckets:true]]
-        Global.session = sess
+        Global.session = Mock(Session) {
+            getConfig() >> [google:[project:'foo', region:'x', enableRequesterPaysBuckets:true]]
+        }
 
         when:
         def storageConfig = GsPathFactory.getCloudStorageConfig()

modules/nf-google/src/test/nextflow/extension/FilesExTest2.groovy

@@ -33,11 +33,12 @@ class FilesExTest2 extends Specification {
 
     @Unroll
     def 'should return uri string for #PATH' () {
+        given:
+        Global.session = Mock(Session) {
+            getConfig() >> [google:[project:'foo', region:'x']]
+        }
 
         when:
-        def sess = new Session()
-        sess.config = [google:[project:'foo', region:'x']]
-        Global.session = sess
         def path = PATH as Path
         then:
         path instanceof CloudStoragePath

modules/nf-google/src/test/nextflow/file/FileHelperGsTest.groovy

@@ -34,9 +34,9 @@ class FileHelperGsTest extends Specification {
     def 'should parse google storage path' () {
 
         given:
-        def sess = new Session()
-        sess.config = [google:[project:'foo', region:'x']]
-        Global.session = sess
+        Global.session = Mock(Session) {
+            getConfig() >> [google:[project:'foo', region:'x']]
+        }
 
         expect:
         FileHelper.asPath('file.txt') ==
@@ -65,9 +65,7 @@ class FileHelperGsTest extends Specification {
 
     def 'should strip ending slash' () {
         given:
-        def sess = new Session()
-        sess.config = [google:[project:'foo', region:'x']]
-        Global.session = sess
+        Global.session = Mock(Session) { getConfig() >> [google:[project:'foo', region:'x']] }
         def nxFolder = Paths.get('/my-bucket/foo')
         def nxNested = Paths.get('/my-bucket/foo/bar/')
         and: