Merge remote-tracking branch 'origin/BUG#AC-1486' into GL_Mainline_PR_25112021

Author: glo71317

app/code/Magento/RemoteStorage/Driver/Adapter/Cache/Generic.php

@@ -217,7 +217,7 @@ public function flushCache(): void
      *
      * @param string $json
      */
-    public function setFromStorage(string $json)
+    private function setFromStorage(string $json)
     {
         $this->cacheData = array_merge($this->cacheData, $this->serializer->unserialize($json));
     }

app/code/Magento/RemoteStorage/Test/Unit/Driver/Adpater/Cache/GenericTest.php

@@ -59,10 +59,14 @@ protected function setUp(): void
     public function testGetMetaData(string $input, ?array $expectedOutput): void
     {
         $cacheData = include __DIR__ . '/_files/CacheData.php';
+        $this->cacheAdapterMock
+            ->expects($this->once())
+            ->method('load')
+            ->willReturn(json_encode($cacheData));
         $this->serializerMock
+            ->expects($this->once())
             ->method('unserialize')
             ->willReturn($cacheData);
-        $this->generic->setFromStorage(json_encode($cacheData));
 
         $this->assertEquals($expectedOutput, $this->generic->getMetaData($input));
     }