Modernize test code with expects() syntax and fix chained method calls

Co-authored-by: kawax <[email protected]>

Author: Copilot

tests/SheetsDriveTest.php

@@ -43,7 +43,7 @@ public function test_list()
             $file,
         ];
 
-        $this->files->shouldReceive('listFiles->getFiles')->once()->andReturn($files);
+        $this->files->expects('listFiles->getFiles')->once()->andReturn($files);
 
         $list = Sheets::spreadsheetList();
 
@@ -52,7 +52,7 @@ public function test_list()
 
     public function test_null()
     {
-        Google::shouldReceive('make')->andReturn($this->service);
+        Google::expects('make')->andReturn($this->service);
 
         $drive = Sheets::setDriveService(null)->getDriveService();
 

tests/SheetsMockTest.php

@@ -55,7 +55,7 @@ public function test_sheets_all()
         $valueRange->setValues([['test1' => '1'], ['test2' => '2']]);
         $response->setValueRanges([$valueRange]);
 
-        $this->values->shouldReceive('batchGet')->with(m::any(), m::any())->once()->andReturn($response);
+        $this->values->expects('batchGet')->with(m::any(), m::any())->once()->andReturn($response);
 
         $values = $this->sheet->spreadsheet('test')
             ->sheet('test')
@@ -75,7 +75,7 @@ public function test_sheets_empty()
         $valueRange->setValues(null);
         $response->setValueRanges([$valueRange]);
 
-        $this->values->shouldReceive('batchGet')->with(m::any(), m::any())->once()->andReturn($response);
+        $this->values->expects('batchGet')->with(m::any(), m::any())->once()->andReturn($response);
 
         $values = $this->sheet->all();
 
@@ -89,7 +89,7 @@ public function test_sheets_get()
         $valueRange->setValues([['test1' => '1'], ['test2' => '2']]);
         $response->setValueRanges([$valueRange]);
 
-        $this->values->shouldReceive('batchGet')->with(m::any(), m::any())->once()->andReturn($response);
+        $this->values->expects('batchGet')->with(m::any(), m::any())->once()->andReturn($response);
 
         $values = $this->sheet->get();
 
@@ -101,7 +101,7 @@ public function test_sheets_update()
     {
         $response = new BatchUpdateValuesResponse;
 
-        $this->values->shouldReceive('batchUpdate')->once()->andReturn($response);
+        $this->values->expects('batchUpdate')->once()->andReturn($response);
 
         $values = $this->sheet->sheet('test')->range('A1')->update([['test']]);
 
@@ -116,7 +116,7 @@ public function test_sheets_first()
         $valueRange->setValues([['test1' => '1'], ['test2' => '2']]);
         $response->setValueRanges([$valueRange]);
 
-        $this->values->shouldReceive('batchGet')->with(m::any(), m::any())->once()->andReturn($response);
+        $this->values->expects('batchGet')->with(m::any(), m::any())->once()->andReturn($response);
 
         $value = $this->sheet->first();
 
@@ -130,7 +130,7 @@ public function test_sheets_first_empty()
         $valueRange->setValues(null);
         $response->setValueRanges([$valueRange]);
 
-        $this->values->shouldReceive('batchGet')->with(m::any(), m::any())->once()->andReturn($response);
+        $this->values->expects('batchGet')->with(m::any(), m::any())->once()->andReturn($response);
 
         $value = $this->sheet->first();
 
@@ -139,7 +139,7 @@ public function test_sheets_first_empty()
 
     public function test_sheets_clear()
     {
-        $this->values->shouldReceive('clear')->once();
+        $this->values->expects('clear')->once();
 
         $value = $this->sheet->clear();
 
@@ -154,7 +154,7 @@ public function test_sheets_append()
         $valueRange->setValues([['test1' => '1'], ['test2' => '2']]);
         $response->setUpdates($updates);
 
-        $this->values->shouldReceive('append')->once()->andReturn($response);
+        $this->values->expects('append')->once()->andReturn($response);
 
         $value = $this->sheet->append([[]]);
 
@@ -168,7 +168,7 @@ public function test_sheets_append_with_keys()
         $valueRange->setValues([['header1', 'header2'], ['value1', 'value2']]);
         $response->setValueRanges([$valueRange]);
 
-        $this->values->shouldReceive('batchGet')
+        $this->values->expects('batchGet')
             ->with(m::any(), m::any())
             ->andReturn($response);
 
@@ -178,7 +178,7 @@ public function test_sheets_append_with_keys()
 
     public function test_spreadsheet_properties()
     {
-        $this->spreadsheets->shouldReceive('get->getProperties->toSimpleObject')->once()->andReturn(new \stdClass);
+        $this->spreadsheets->expects('get->getProperties->toSimpleObject')->once()->andReturn(new \stdClass);
 
         $properties = $this->sheet->spreadsheetProperties();
 
@@ -188,9 +188,9 @@ public function test_spreadsheet_properties()
     public function test_sheet_properties()
     {
         $sheet = m::mock(Spreadsheet::class);
-        $sheet->shouldReceive('getProperties->toSimpleObject')->once()->andReturn(new \stdClass);
+        $sheet->expects('getProperties->toSimpleObject')->once()->andReturn(new \stdClass);
 
-        $this->spreadsheets->shouldReceive('get->getSheets')->once()->andReturn([$sheet]);
+        $this->spreadsheets->expects('get->getSheets')->once()->andReturn([$sheet]);
 
         $properties = $this->sheet->sheetProperties();
 
@@ -213,7 +213,7 @@ public function test_sheets_list()
             ],
         ]);
 
-        $this->spreadsheets->shouldReceive('get->getSheets')->andReturn([$sheets]);
+        $this->spreadsheets->expects('get->getSheets')->andReturn([$sheets]);
         $values = $this->sheet->sheetList();
 
         $this->assertSame(['sheetId' => 'title'], $values);
@@ -230,7 +230,7 @@ public function test_sheet_by_id()
 
         $sheet = m::mock(SheetsClient::class)->makePartial();
 
-        $sheet->shouldReceive('sheetList')->andReturn([$sheets]);
+        $sheet->expects('sheetList')->andReturn([$sheets]);
 
         $sheet->sheetById('sheetId');
 
@@ -245,7 +245,7 @@ public function test_spreadsheet_by_title()
 
         $sheet = m::mock(SheetsClient::class)->makePartial();
 
-        $sheet->shouldReceive('spreadsheetList')->andReturn($list);
+        $sheet->expects('spreadsheetList')->andReturn($list);
 
         $sheet->spreadsheetByTitle('title');
 
@@ -278,7 +278,7 @@ public function test_get_client()
     public function test_add_sheet()
     {
         $this->spreadsheets
-            ->shouldReceive('batchUpdate')
+            ->expects('batchUpdate')
             ->andReturn(new BatchUpdateSpreadsheetResponse);
 
         $response = $this->sheet->addSheet('new sheet');
@@ -294,20 +294,19 @@ public function test_delete_sheet()
             ],
         ]);
 
-        $this->spreadsheets->shouldReceive('get->getSheets')->andReturn([$sheets]);
+        $this->spreadsheets->expects('get->getSheets')->andReturn([$sheets]);
         $this->spreadsheets
-            ->shouldReceive('batchUpdate')
+            ->expects('batchUpdate')
             ->andReturn(new BatchUpdateSpreadsheetResponse);
 
-        $this->sheet->shouldReceive('sheetList')->andReturn([$sheets]);
         $response = $this->sheet->deleteSheet('title');
         $this->assertNotNull($response);
     }
 
     public function test_get_proper_ranges()
     {
         $this->values
-            ->shouldReceive('batchUpdate')
+            ->expects('batchUpdate')
             ->times(3)
             ->andReturn(new BatchUpdateValuesResponse);
 

tests/SheetsTest.php

@@ -31,7 +31,7 @@ protected function tearDown(): void
 
     public function test_service()
     {
-        $this->google->shouldReceive('make')->once()->andReturns(m::mock(\Google\Service\Sheets::class));
+        $this->google->expects('make')->once()->andReturns(m::mock(\Google\Service\Sheets::class));
 
         //        Sheets::setService($this->google->make('Sheets'));
 
@@ -40,12 +40,11 @@ public function test_service()
 
     public function test_set_access_token()
     {
-        $this->google->shouldReceive('getCache')->once()->andReturn(m::self());
-        $this->google->shouldReceive('clear')->once();
-        $this->google->shouldReceive('setAccessToken')->once();
-        $this->google->shouldReceive('isAccessTokenExpired')->once()->andReturns(true);
-        $this->google->shouldReceive('fetchAccessTokenWithRefreshToken')->once();
-        $this->google->shouldReceive('make')->times(2)->andReturns(
+        $this->google->expects('getCache->clear')->once();
+        $this->google->expects('setAccessToken')->once();
+        $this->google->expects('isAccessTokenExpired')->once()->andReturns(true);
+        $this->google->expects('fetchAccessTokenWithRefreshToken')->once();
+        $this->google->expects('make')->times(2)->andReturns(
             m::mock(\Google\Service\Sheets::class),
             m::mock(\Google\Service\Drive::class)
         );
@@ -61,7 +60,7 @@ public function test_set_access_token()
 
     public function test_trait()
     {
-        Sheets::shouldReceive('setAccessToken')->with('test')->once()->andReturn(m::self());
+        Sheets::expects('setAccessToken')->with('test')->once()->andReturn(m::self());
 
         $sheets = (new User)->sheets();