From 0f92e3171cfaf9c2c92fe5764d22401efb87d2eb Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sun, 24 Dec 2017 18:27:23 +0300 Subject: [PATCH] =?UTF-8?q?fix:Seasonvar:=20=D0=BE=D0=BF=D1=80=D0=B5=D0=B4?= =?UTF-8?q?=D0=B5=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81=D0=B5=D1=80=D0=B8?= =?UTF-8?q?=D0=B0=D0=BB=D0=BE=D0=B2=20=D0=B2=20=D0=B2=D1=8B=D0=B4=D0=B0?= =?UTF-8?q?=D1=87=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit resolve #36 --- src/main/java/kinosearch/core/warez/Seasonvar.java | 13 ++++++++----- .../kinosearch/core/warez/KinoWarezTestCase.java | 7 ++++++- .../java/kinosearch/core/warez/TestSeasonvar.java | 1 + 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/main/java/kinosearch/core/warez/Seasonvar.java b/src/main/java/kinosearch/core/warez/Seasonvar.java index c634a81..34004eb 100644 --- a/src/main/java/kinosearch/core/warez/Seasonvar.java +++ b/src/main/java/kinosearch/core/warez/Seasonvar.java @@ -59,11 +59,14 @@ public class Seasonvar implements KinoWarez { List outList = new ArrayList<>(); for (int i = 0; i < suggestions.size(); i++) { - outList.add(new Kino( - suggestions.get(i).getAsString(), - "/" + data.get(i).getAsString(), - this - )); + if (!data.get(i).getAsString().isEmpty() + || data.get(i).getAsString().startsWith("serial-")) { + outList.add(new Kino( + suggestions.get(i).getAsString(), + "/" + data.get(i).getAsString(), + this + )); + } } return outList; diff --git a/src/test/java/kinosearch/core/warez/KinoWarezTestCase.java b/src/test/java/kinosearch/core/warez/KinoWarezTestCase.java index c66a7af..35ab915 100644 --- a/src/test/java/kinosearch/core/warez/KinoWarezTestCase.java +++ b/src/test/java/kinosearch/core/warez/KinoWarezTestCase.java @@ -29,7 +29,12 @@ abstract class KinoWarezTestCase { assertNotNull(kinoList); assertFalse(kinoList.isEmpty()); - kinoList.forEach(kino -> assertTrue(String.format("'%s' != '%s'", kino.getName(), title), kino.getName().toLowerCase().contains(title))); + kinoList.forEach(kino -> { + assertTrue(String.format("'%s' != '%s'", kino.getName(), title), + kino.getName().toLowerCase().contains(title)); + assertFalse("Detect \"/\"", + kino.getUrl().equals("/")); + }); } void oneFilm(final String page, KinoWarez kinoWarez) { diff --git a/src/test/java/kinosearch/core/warez/TestSeasonvar.java b/src/test/java/kinosearch/core/warez/TestSeasonvar.java index 3f3453a..809f468 100644 --- a/src/test/java/kinosearch/core/warez/TestSeasonvar.java +++ b/src/test/java/kinosearch/core/warez/TestSeasonvar.java @@ -29,6 +29,7 @@ public class TestSeasonvar extends KinoWarezTestCase { @Override public void testFound() { found("рик и морти", kinoWarez); + found("звездные войны", kinoWarez); } @Override