Remove deprecated at matcher from tests/lib

Only 15 warnings left in there

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

1 files changed, 65 insertions, 51 deletions

diff --git a/tests/lib/Template/JSCombinerTest.php b/tests/lib/Template/JSCombinerTest.php
index 5c678840c63..2c98d33d543 100644
--- a/tests/lib/Template/JSCombinerTest.php
+++ b/tests/lib/Template/JSCombinerTest.php
@@ -59,7 +59,7 @@ class JSCombinerTest extends \Test\TestCase {
 		$this->config = $this->createMock(SystemConfig::class);
 		$this->cacheFactory = $this->createMock(ICacheFactory::class);
 		$this->depsCache = $this->createMock(ICache::class);
-		$this->cacheFactory->expects($this->at(0))
+		$this->cacheFactory->expects($this->atLeastOnce())
 			->method('createDistributed')
 			->willReturn($this->depsCache);
 		$this->logger = $this->createMock(LoggerInterface::class);
@@ -85,15 +85,16 @@ class JSCombinerTest extends \Test\TestCase {
 
 	public function testProcessNotInstalled() {
 		$this->config
-			->expects($this->at(0))
+			->expects($this->exactly(2))
 			->method('getValue')
-			->with('debug')
-			->willReturn(false);
-		$this->config
-			->expects($this->at(1))
-			->method('getValue')
-			->with('installed')
-			->willReturn(false);
+			->withConsecutive(
+				['debug'],
+				['installed']
+			)
+			->willReturnOnConsecutiveCalls(
+				false,
+				false
+			);
 
 		$actual = $this->jsCombiner->process(__DIR__, '/data/combine.json', 'awesomeapp');
 		$this->assertFalse($actual);
@@ -101,15 +102,16 @@ class JSCombinerTest extends \Test\TestCase {
 
 	public function testProcessUncachedFileNoAppDataFolder() {
 		$this->config
-			->expects($this->at(0))
-			->method('getValue')
-			->with('debug')
-			->willReturn(false);
-		$this->config
-			->expects($this->at(1))
+			->expects($this->exactly(2))
 			->method('getValue')
-			->with('installed')
-			->willReturn(true);
+			->withConsecutive(
+				['debug'],
+				['installed']
+			)
+			->willReturnOnConsecutiveCalls(
+				false,
+				true
+			);
 		$folder = $this->createMock(ISimpleFolder::class);
 		$this->appData->expects($this->once())->method('getFolder')->with('awesomeapp')->willThrowException(new NotFoundException());
 		$this->appData->expects($this->once())->method('newFolder')->with('awesomeapp')->willReturn($folder);
@@ -140,15 +142,16 @@ class JSCombinerTest extends \Test\TestCase {
 
 	public function testProcessUncachedFile() {
 		$this->config
-			->expects($this->at(0))
-			->method('getValue')
-			->with('debug')
-			->willReturn(false);
-		$this->config
-			->expects($this->at(1))
+			->expects($this->exactly(2))
 			->method('getValue')
-			->with('installed')
-			->willReturn(true);
+			->withConsecutive(
+				['debug'],
+				['installed']
+			)
+			->willReturnOnConsecutiveCalls(
+				false,
+				true
+			);
 		$folder = $this->createMock(ISimpleFolder::class);
 		$this->appData->expects($this->once())->method('getFolder')->with('awesomeapp')->willReturn($folder);
 		$file = $this->createMock(ISimpleFile::class);
@@ -177,15 +180,16 @@ class JSCombinerTest extends \Test\TestCase {
 
 	public function testProcessCachedFile() {
 		$this->config
-			->expects($this->at(0))
+			->expects($this->exactly(2))
 			->method('getValue')
-			->with('debug')
-			->willReturn(false);
-		$this->config
-			->expects($this->at(1))
-			->method('getValue')
-			->with('installed')
-			->willReturn(true);
+			->withConsecutive(
+				['debug'],
+				['installed']
+			)
+			->willReturnOnConsecutiveCalls(
+				false,
+				true
+			);
 		$folder = $this->createMock(ISimpleFolder::class);
 		$this->appData->expects($this->once())->method('getFolder')->with('awesomeapp')->willReturn($folder);
 		$file = $this->createMock(ISimpleFile::class);
@@ -217,15 +221,16 @@ class JSCombinerTest extends \Test\TestCase {
 
 	public function testProcessCachedFileMemcache() {
 		$this->config
-			->expects($this->at(0))
-			->method('getValue')
-			->with('debug')
-			->willReturn(false);
-		$this->config
-			->expects($this->at(1))
+			->expects($this->exactly(2))
 			->method('getValue')
-			->with('installed')
-			->willReturn(true);
+			->withConsecutive(
+				['debug'],
+				['installed']
+			)
+			->willReturnOnConsecutiveCalls(
+				false,
+				true
+			);
 		$folder = $this->createMock(ISimpleFolder::class);
 		$this->appData->expects($this->once())
 			->method('getFolder')
@@ -401,13 +406,23 @@ class JSCombinerTest extends \Test\TestCase {
 		$folder = $this->createMock(ISimpleFolder::class);
 		$file = $this->createMock(ISimpleFile::class);
 		$depsFile = $this->createMock(ISimpleFile::class);
+		$gzFile = $this->createMock(ISimpleFile::class);
 
 		$path = __DIR__ . '/data/';
 
-		$folder->expects($this->at(0))->method('getFile')->with($fileName)->willReturn($file);
-		$folder->expects($this->at(1))->method('getFile')->with($fileName . '.deps')->willReturn($depsFile);
+		$folder->expects($this->exactly(3))
+			->method('getFile')
+			->withConsecutive(
+				[$fileName],
+				[$fileName . '.deps'],
+				[$fileName . '.gzip']
+			)->willReturnOnConsecutiveCalls(
+				$file,
+				$depsFile,
+				$gzFile
+			);
 
-		$file->expects($this->at(0))
+		$file->expects($this->once())
 			->method('putContent')
 			->with('var a = \'hello\';
 
@@ -417,7 +432,7 @@ var b = \'world\';
 
 ');
 		$depsFile
-			->expects($this->at(0))
+			->expects($this->once())
 			->method('putContent')
 			->with($this->callback(
 			function ($content) {
@@ -455,7 +470,7 @@ var b = \'world\';
 			}
 		);
 
-		$file->expects($this->at(0))
+		$file->expects($this->once())
 			->method('putContent')
 			->with('var a = \'hello\';
 
@@ -464,13 +479,13 @@ var b = \'world\';
 
 
 ');
-		$depsFile->expects($this->at(0))->method('putContent')->with($this->callback(
+		$depsFile->expects($this->once())->method('putContent')->with($this->callback(
 			function ($content) {
 				$deps = json_decode($content, true);
 				return array_key_exists(__DIR__ . '/data//1.js', $deps)
 					&& array_key_exists(__DIR__ . '/data//2.js', $deps);
 			}));
-		$gzFile->expects($this->at(0))->method('putContent')->with($this->callback(
+		$gzFile->expects($this->once())->method('putContent')->with($this->callback(
 			function ($content) {
 				return gzdecode($content) === 'var a = \'hello\';
 
@@ -550,9 +565,8 @@ var b = \'world\';
 		$this->cacheFactory->expects($this->once())
 			->method('createDistributed')
 			->willReturn($cache);
-		$cache->expects($this->once())
-			->method('clear')
-			->with('');
+		$cache->expects($this->never())
+			->method('clear');
 		$this->appData->expects($this->once())
 			->method('getDirectoryListing')
 			->willReturn([$folder]);