From e4890f65ae17dc211ff5ed476268a829b11673b5 Mon Sep 17 00:00:00 2001
From: shibafu <shibafu528@gmail.com>
Date: Mon, 16 Sep 2019 09:55:29 +0900
Subject: [PATCH] =?UTF-8?q?=E9=A0=BB=E7=B9=81=E3=81=AB=E5=A4=89=E6=9B=B4?=
 =?UTF-8?q?=E3=81=95=E3=82=8C=E3=82=8B=E9=83=A8=E5=88=86=E3=82=92=E5=AE=8C?=
 =?UTF-8?q?=E5=85=A8=E4=B8=80=E8=87=B4=E5=88=A4=E5=AE=9A=E3=81=97=E3=81=A6?=
 =?UTF-8?q?=E3=82=82=E3=81=8D=E3=82=8A=E3=81=8C=E3=81=AA=E3=81=84=E3=81=AE?=
 =?UTF-8?q?=E3=81=A7=E3=80=81=E3=83=AD=E3=83=83=E3=82=AF=E3=81=95=E3=82=8C?=
 =?UTF-8?q?=E3=81=A6=E3=81=84=E3=82=8B=E3=82=BF=E3=82=B0=E3=81=AE=E3=81=BF?=
 =?UTF-8?q?=E3=82=92=E6=A4=9C=E8=A8=BC=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/MyAsserts.php                             | 17 +++++++++++++++++
 .../MetadataResolver/NicoSeigaResolverTest.php  |  7 ++++---
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 tests/MyAsserts.php

diff --git a/tests/MyAsserts.php b/tests/MyAsserts.php
new file mode 100644
index 0000000..c8019d8
--- /dev/null
+++ b/tests/MyAsserts.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Tests;
+
+trait MyAsserts
+{
+    /**
+     * assertArraySubset()がdeprecatedって本当ですか？ 配列の中に所定の値が全て含まれていることを検証します。
+     * @param array $expected
+     * @param array $actual
+     * @param string $message
+     */
+    public function assertArrayContains(array $expected, array $actual, string $message = '')
+    {
+        $this->assertSame($expected, array_intersect($actual, $expected), $message);
+    }
+}
diff --git a/tests/Unit/MetadataResolver/NicoSeigaResolverTest.php b/tests/Unit/MetadataResolver/NicoSeigaResolverTest.php
index 0c1c0bd..a96a35f 100644
--- a/tests/Unit/MetadataResolver/NicoSeigaResolverTest.php
+++ b/tests/Unit/MetadataResolver/NicoSeigaResolverTest.php
@@ -3,11 +3,12 @@
 namespace Tests\Unit\MetadataResolver;
 
 use App\MetadataResolver\NicoSeigaResolver;
+use Tests\MyAsserts;
 use Tests\TestCase;
 
 class NicoSeigaResolverTest extends TestCase
 {
-    use CreateMockedResolver;
+    use CreateMockedResolver, MyAsserts;
 
     public function setUp()
     {
@@ -28,7 +29,7 @@ class NicoSeigaResolverTest extends TestCase
         $this->assertSame('シャミ子 / まとけち さんのイラスト', $metadata->title);
         $this->assertSame('シャミ子が悪いんだよ・・・', $metadata->description);
         $this->assertSame('https://lohas.nicoseiga.jp/thumb/9623750l?', $metadata->image);
-        $this->assertSame(['アニメ', 'まちカドまぞく', 'シャミ子', 'シャドウミストレス優子', '吉田優子', '危機管理フォーム', 'シャミ子が悪いんだよ', '赤面', 'シャミ子は悪くないよ'], $metadata->tags);
+        $this->assertArrayContains(['アニメ', 'まちカドまぞく', 'シャミ子', 'シャドウミストレス優子', '吉田優子', '危機管理フォーム'], $metadata->tags);
         if ($this->shouldUseMock()) {
             $this->assertSame('https://seiga.nicovideo.jp/seiga/im9623750', (string) $this->handler->getLastRequest()->getUri());
         }
@@ -44,7 +45,7 @@ class NicoSeigaResolverTest extends TestCase
         $this->assertSame('ベッドのゆかりさん / せゆーら/Se-U-Ra さんのイラスト', $metadata->title);
         $this->assertSame('待つ側の方がつよいってスマブラが伝えてきたので', $metadata->description);
         $this->assertSame('https://lohas.nicoseiga.jp/thumb/9232798l?', $metadata->image);
-        $this->assertSame(['結月ゆかり', 'VOICEROID', '裸パーカー', '謎の光'], $metadata->tags);
+        $this->assertArrayContains(['結月ゆかり', 'VOICEROID'], $metadata->tags);
         if ($this->shouldUseMock()) {
             $this->assertSame('https://seiga.nicovideo.jp/seiga/im9232798', (string) $this->handler->getLastRequest()->getUri());
         }