fix: Fix fluent setter in ExtractJobConfiguration (#2328)

* fix: Fix fluent setter in ExtractJobConfiguration * separate setters from assertion * remove extra lines
googleapis · Sep 16, 2019 · 29e58d4 · 29e58d4
1 parent 3453a5a
commit 29e58d4
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/BigQuery/src/ExtractJobConfiguration.php b/BigQuery/src/ExtractJobConfiguration.php
@@ -184,5 +184,7 @@ public function sourceTable(Table $sourceTable)
     public function useAvroLogicalTypes($useAvroLogicalTypes)
     {
         $this->config['configuration']['extract']['useAvroLogicalTypes'] = $useAvroLogicalTypes;
+
+        return $this;
     }
 }
diff --git a/BigQuery/tests/Unit/CopyJobConfigurationTest.php b/BigQuery/tests/Unit/CopyJobConfigurationTest.php
@@ -77,13 +77,15 @@ public function testFluentSetters()
         ];
         $this->expectedConfig['configuration']['copy'] = $copy
             + $this->expectedConfig['configuration']['copy'];
-        $this->config
+
+        $config = $this->config
             ->createDisposition($copy['createDisposition'])
             ->destinationEncryptionConfiguration($copy['destinationEncryptionConfiguration'])
             ->destinationTable($destinationTable->reveal())
             ->sourceTable($sourceTable->reveal())
             ->writeDisposition($copy['writeDisposition']);
 
+        $this->assertInstanceOf(CopyJobConfiguration::class, $config);
         $this->assertEquals(
             $this->expectedConfig,
             $this->config->toArray()

diff --git a/BigQuery/tests/Unit/ExtractJobConfigurationTest.php b/BigQuery/tests/Unit/ExtractJobConfigurationTest.php
@@ -74,7 +74,8 @@ public function testFluentSetters()
         ];
         $this->expectedConfig['configuration']['extract'] = $extract
             + $this->expectedConfig['configuration']['extract'];
-        $this->config
+
+        $config = $this->config
             ->compression($extract['compression'])
             ->destinationFormat($extract['destinationFormat'])
             ->destinationUris($extract['destinationUris'])
@@ -83,6 +84,7 @@ public function testFluentSetters()
             ->sourceTable($sourceTable->reveal())
             ->useAvroLogicalTypes($extract['useAvroLogicalTypes']);
 
+        $this->assertInstanceOf(ExtractJobConfiguration::class, $config);
         $this->assertEquals(
             $this->expectedConfig,
             $this->config->toArray()

diff --git a/BigQuery/tests/Unit/LoadJobConfigurationTest.php b/BigQuery/tests/Unit/LoadJobConfigurationTest.php
@@ -96,7 +96,8 @@ public function testFluentSetters()
         ];
         $this->expectedConfig['configuration']['load'] = $load
             + $this->expectedConfig['configuration']['load'];
-        $this->config
+
+        $config = $this->config
             ->allowJaggedRows($load['allowJaggedRows'])
             ->allowQuotedNewlines($load['allowQuotedNewlines'])
             ->autodetect($load['autodetect'])
@@ -121,6 +122,7 @@ public function testFluentSetters()
             ->writeDisposition($load['writeDisposition'])
             ->useAvroLogicalTypes($load['useAvroLogicalTypes']);
 
+        $this->assertInstanceOf(LoadJobConfiguration::class, $config);
         $this->assertEquals(
             $this->expectedConfig + ['data' => $data],
             $this->config->toArray()

diff --git a/BigQuery/tests/Unit/QueryJobConfigurationTest.php b/BigQuery/tests/Unit/QueryJobConfigurationTest.php
@@ -110,7 +110,8 @@ public function testFluentSetters()
         ];
         $this->expectedConfig['configuration']['query'] = $query
             + $this->expectedConfig['configuration']['query'];
-        $this->config
+
+        $config = $this->config
             ->allowLargeResults($query['allowLargeResults'])
             ->clustering($query['clustering'])
             ->createDisposition($query['createDisposition'])
@@ -130,6 +131,7 @@ public function testFluentSetters()
             ->userDefinedFunctionResources($query['userDefinedFunctionResources'])
             ->writeDisposition($query['writeDisposition']);
 
+        $this->assertInstanceOf(QueryJobConfiguration::class, $config);
         $this->assertEquals($this->expectedConfig, $this->config->toArray());
     }