From fbb9e024ed1bde8616977d07a09ef1cde95a5cea Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sun, 8 Jan 2017 17:57:54 +0300 Subject: [PATCH] =?UTF-8?q?test:=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3?= =?UTF-8?q?=D1=83=D1=80=D0=B0=D1=86=D0=B8=D1=8F=20=D1=82=D0=B5=D1=81=D1=82?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/core/TestBrowser.java | 10 +--------- src/test/java/core/warez/TestOnlinelife.java | 12 ++---------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/src/test/java/core/TestBrowser.java b/src/test/java/core/TestBrowser.java index 9a4f069..0112be8 100644 --- a/src/test/java/core/TestBrowser.java +++ b/src/test/java/core/TestBrowser.java @@ -4,12 +4,10 @@ import com.google.gson.Gson; import com.google.gson.JsonObject; import kinosearch.core.SpringConfig; import kinosearch.core.browser.Browser; -import kinosearch.core.browser.ApacheHttpBrowser; import static org.junit.Assert.*; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -22,11 +20,7 @@ public class TestBrowser { private final String data = "login=123&password=456"; private final String header_name = "Mytestheader"; @Autowired - private ApplicationContext context; - - private Browser getBrowser() { - return context.getBean(Browser.class); - } + private Browser browser; private void setup_headers(Browser browser) { browser.setHeader(header_name, "true"); @@ -39,7 +33,6 @@ public class TestBrowser { @Test public void testGet() throws IOException { - Browser browser = getBrowser(); setup_headers(browser); String result = browser.get("https://httpbin.org/get?" + data); @@ -56,7 +49,6 @@ public class TestBrowser { @Test public void testPost() throws IOException { - Browser browser = getBrowser(); setup_headers(browser); String result = browser.post("https://httpbin.org/post", data); diff --git a/src/test/java/core/warez/TestOnlinelife.java b/src/test/java/core/warez/TestOnlinelife.java index f58c26c..182ee2b 100644 --- a/src/test/java/core/warez/TestOnlinelife.java +++ b/src/test/java/core/warez/TestOnlinelife.java @@ -3,16 +3,13 @@ package core.warez; import kinosearch.core.Kino; import kinosearch.core.SpringConfig; import kinosearch.core.warez.KinoWarez; -import kinosearch.core.warez.Onlinelife; -import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import java.util.ArrayList; import java.util.List; import static org.junit.Assert.*; @@ -21,14 +18,9 @@ import static org.junit.Assert.*; @ContextConfiguration(classes = {SpringConfig.class}) public class TestOnlinelife { @Autowired - private ApplicationContext context; + @Qualifier("onlinelife") private KinoWarez kinoWarez; - @Before - public void setup() { - this.kinoWarez = context.getBean(Onlinelife.class); - } - @Test public void testNormal() { search(false);