From 8a0793ea64428004ce5ff301108b8bcee50ac572 Mon Sep 17 00:00:00 2001
From: taizan-hokuto <55448286+taizan-hokuto@users.noreply.github.com>
Date: Mon, 11 Nov 2019 23:04:07 +0900
Subject: [PATCH] Fix test

---
 tests/test_arcparam.py             |  4 ++--
 tests/test_compatible_processor.py | 10 ++++++----
 tests/test_livechat.py             |  4 ++--
 tests/test_liveparam.py            |  3 ---
 tests/test_parser.py               |  8 ++++----
 5 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/tests/test_arcparam.py b/tests/test_arcparam.py
index 04e911b..926dd59 100644
--- a/tests/test_arcparam.py
+++ b/tests/test_arcparam.py
@@ -1,5 +1,5 @@
 import pytest
-from pytchat.core_multithread.parser import Parser
+from pytchat.parser.replay import Parser
 import pytchat.config as config
 import requests, json
 from pytchat.paramgen import arcparam
@@ -20,7 +20,7 @@ def test_arcparam_2(mocker):
     jsn = json.loads(resp.text)
     parser = Parser()
     _ , chatdata = parser.parse(jsn)
-    test_id = chatdata[0]["replayChatItemAction"]["actions"][0]["addChatItemAction"]["item"]["liveChatTextMessageRenderer"]["id"]
+    test_id = chatdata[0]["addChatItemAction"]["item"]["liveChatTextMessageRenderer"]["id"]
     print(test_id)
     assert "CjoKGkNMYXBzZTdudHVVQ0Zjc0IxZ0FkTnFnQjVREhxDSnlBNHV2bnR1VUNGV0dnd2dvZDd3NE5aZy0w" == test_id
     
\ No newline at end of file
diff --git a/tests/test_compatible_processor.py b/tests/test_compatible_processor.py
index c4daa56..fc3051a 100644
--- a/tests/test_compatible_processor.py
+++ b/tests/test_compatible_processor.py
@@ -1,7 +1,7 @@
 import json
 import pytest
 import asyncio,aiohttp
-from pytchat.core_async.parser import Parser
+from pytchat.parser.live import Parser
 from pytchat.processors.compatible.processor import CompatibleProcessor
 from pytchat.exceptions import (
     NoLivechatRendererException,NoYtinitialdataException,
@@ -12,13 +12,15 @@ from pytchat.processors.compatible.renderer.paidmessage import LiveChatPaidMessa
 from pytchat.processors.compatible.renderer.paidsticker import LiveChatPaidStickerRenderer
 from pytchat.processors.compatible.renderer.legacypaid import LiveChatLegacyPaidMessageRenderer
 
+parser = Parser()
+
 def test_textmessage(mocker):
     '''api互換processorのテスト：通常テキストメッセージ'''
     processor = CompatibleProcessor()
 
     _json = _open_file("tests/testdata/compatible/textmessage.json")
 
-    _, chatdata = Parser.parse(json.loads(_json))
+    _, chatdata = parser.parse(json.loads(_json))
     data = {
         "video_id" : "",
         "timeout" : 7,
@@ -55,7 +57,7 @@ def test_newsponcer(mocker):
 
     _json = _open_file("tests/testdata/compatible/newSponsor.json")
 
-    _, chatdata = Parser.parse(json.loads(_json))
+    _, chatdata = parser.parse(json.loads(_json))
     data = {
         "video_id" : "",
         "timeout" : 7,
@@ -91,7 +93,7 @@ def test_superchat(mocker):
 
     _json = _open_file("tests/testdata/compatible/superchat.json")
 
-    _, chatdata = Parser.parse(json.loads(_json))
+    _, chatdata = parser.parse(json.loads(_json))
     data = {
         "video_id" : "",
         "timeout" : 7,
diff --git a/tests/test_livechat.py b/tests/test_livechat.py
index daa69e0..475f26c 100644
--- a/tests/test_livechat.py
+++ b/tests/test_livechat.py
@@ -1,6 +1,6 @@
 import pytest
-from pytchat.core_async.parser import Parser as AsyncParser
-from pytchat.core_multithread.parser import Parser as ThreadParser
+from pytchat.parser.live import Parser
+
 import json
 import asyncio,aiohttp
 
diff --git a/tests/test_liveparam.py b/tests/test_liveparam.py
index ccdb46c..320a15f 100644
--- a/tests/test_liveparam.py
+++ b/tests/test_liveparam.py
@@ -1,7 +1,4 @@
 import pytest
-from pytchat.core_multithread.parser import Parser
-import pytchat.config as config
-import requests, json
 from pytchat.paramgen import liveparam
 
 def test_liveparam_0(mocker):
diff --git a/tests/test_parser.py b/tests/test_parser.py
index 31ed8c3..b338908 100644
--- a/tests/test_parser.py
+++ b/tests/test_parser.py
@@ -1,5 +1,5 @@
 import pytest
-from pytchat.core_async.parser import Parser
+from pytchat.parser.live import Parser
 import json
 import asyncio,aiohttp
 from aioresponses import aioresponses
@@ -11,7 +11,7 @@ from pytchat.exceptions import (
 def _open_file(path):
     with open(path,mode ='r',encoding = 'utf-8') as f:
         return f.read()
-
+parser = Parser()
 
 @aioresponses()
 def test_finishedlive(*mock):
@@ -21,7 +21,7 @@ def test_finishedlive(*mock):
     _text = json.loads(_text)
 
     try:    
-        Parser.parse(_text)
+        parser.parse(_text)
         assert False
     except NoContentsException:
         assert True
@@ -34,7 +34,7 @@ def test_parsejson(*mock):
     _text = json.loads(_text)
 
     try:    
-        Parser.parse(_text)
+        parser.parse(_text)
         jsn = _text
         timeout = jsn["response"]["continuationContents"]["liveChatContinuation"]["continuations"][0]["timedContinuationData"]["timeoutMs"]
         continuation = jsn["response"]["continuationContents"]["liveChatContinuation"]["continuations"][0]["timedContinuationData"]["continuation"]