From 691f6d292d662e5ca5baa93019c6b714b48c013b Mon Sep 17 00:00:00 2001 From: Konstantin Maltsev Date: Tue, 3 Apr 2018 10:16:07 +0700 Subject: [PATCH 1/4] add cucumberUtils --- pom.xml | 22 ++++++++++++++----- .../tag/qautils/cucumber/CucumberUtils.java | 21 ++++++++++++++++++ 2 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 src/main/java/ru/sbtqa/tag/qautils/cucumber/CucumberUtils.java diff --git a/pom.xml b/pom.xml index e500dc8..5d0eb31 100644 --- a/pom.xml +++ b/pom.xml @@ -37,6 +37,10 @@ UTF-8 1.7 1.7 + 1.7.22 + 3.3.2 + 4.12 + 2.4.0 @@ -49,28 +53,34 @@ + + io.cucumber + cucumber-java + ${cucumber.version} + jar + org.apache.commons commons-lang3 - 3.3.2 + ${commons-lang3.version} jar junit junit - 4.12 + ${junit.version} test org.slf4j slf4j-api - 1.7.22 + ${slf4j.version} jar org.slf4j slf4j-log4j12 - 1.7.22 + ${slf4j.version} jar @@ -118,7 +128,7 @@ - + \ No newline at end of file diff --git a/src/main/java/ru/sbtqa/tag/qautils/cucumber/CucumberUtils.java b/src/main/java/ru/sbtqa/tag/qautils/cucumber/CucumberUtils.java new file mode 100644 index 0000000..e963b29 --- /dev/null +++ b/src/main/java/ru/sbtqa/tag/qautils/cucumber/CucumberUtils.java @@ -0,0 +1,21 @@ +package ru.sbtqa.tag.qautils.cucumber; + +import cucumber.api.Scenario; +import cucumber.runtime.io.MultiLoader; +import cucumber.runtime.model.CucumberFeature; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; + +public class CucumberUtils { + + public static Locale getLocale(Scenario scenario) { + List scenarioPaths = new ArrayList<>(); + scenarioPaths.add(scenario.getUri()); + + CucumberFeature load = CucumberFeature.load(new MultiLoader(ClassLoader.getSystemClassLoader()), scenarioPaths).get(0); + String language = load.getGherkinFeature().getFeature().getLanguage(); + + return new Locale(language); + } +} From efdec81c96ffe7924a224f11e44782682058f6c6 Mon Sep 17 00:00:00 2001 From: Konstantin Maltsev Date: Tue, 3 Apr 2018 10:17:51 +0700 Subject: [PATCH 2/4] add relay race --- src/main/java/ru/sbtqa/tag/qautils/cucumber/CucumberUtils.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/ru/sbtqa/tag/qautils/cucumber/CucumberUtils.java b/src/main/java/ru/sbtqa/tag/qautils/cucumber/CucumberUtils.java index e963b29..3851a89 100644 --- a/src/main/java/ru/sbtqa/tag/qautils/cucumber/CucumberUtils.java +++ b/src/main/java/ru/sbtqa/tag/qautils/cucumber/CucumberUtils.java @@ -13,7 +13,8 @@ public static Locale getLocale(Scenario scenario) { List scenarioPaths = new ArrayList<>(); scenarioPaths.add(scenario.getUri()); - CucumberFeature load = CucumberFeature.load(new MultiLoader(ClassLoader.getSystemClassLoader()), scenarioPaths).get(0); + MultiLoader multiLoader = new MultiLoader(ClassLoader.getSystemClassLoader()); + CucumberFeature load = CucumberFeature.load(multiLoader, scenarioPaths).get(0); String language = load.getGherkinFeature().getFeature().getLanguage(); return new Locale(language); From 69711aaa699f0a2305688e2981c1c0520583a9e7 Mon Sep 17 00:00:00 2001 From: Konstantin Maltsev Date: Tue, 3 Apr 2018 10:46:31 +0700 Subject: [PATCH 3/4] update pom --- pom.xml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 5d0eb31..3f3fdc8 100644 --- a/pom.xml +++ b/pom.xml @@ -37,10 +37,10 @@ UTF-8 1.7 1.7 - 1.7.22 - 3.3.2 - 4.12 - 2.4.0 + 3.3.2 + 2.4.0 + 4.12 + 1.7.22 @@ -54,33 +54,33 @@ - io.cucumber - cucumber-java - ${cucumber.version} + org.apache.commons + commons-lang3 + ${version.commons-lang3} jar - org.apache.commons - commons-lang3 - ${commons-lang3.version} + io.cucumber + cucumber-java + ${version.cucumber} jar junit junit - ${junit.version} + ${version.junit} test org.slf4j slf4j-api - ${slf4j.version} + ${version.slf4j} jar org.slf4j slf4j-log4j12 - ${slf4j.version} + ${version.slf4j} jar @@ -128,7 +128,7 @@ - + \ No newline at end of file From 0aaaff89cbd4c14fc366b40042f72d03ee1be6c0 Mon Sep 17 00:00:00 2001 From: Konstantin Maltsev Date: Tue, 3 Apr 2018 13:44:18 +0700 Subject: [PATCH 4/4] check fail on scenario language get add tests --- pom.xml | 6 ++++ .../tag/qautils/cucumber/CucumberUtils.java | 17 ++++++++-- .../qautils/cucumber/CucumberUtilsTest.java | 34 +++++++++++++++++++ src/test/resources/features/Correct.feature | 5 +++ src/test/resources/features/Empty.feature | 4 +++ 5 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 src/test/java/ru/sbtqa/tag/qautils/cucumber/CucumberUtilsTest.java create mode 100644 src/test/resources/features/Correct.feature create mode 100644 src/test/resources/features/Empty.feature diff --git a/pom.xml b/pom.xml index 3f3fdc8..87f389a 100644 --- a/pom.xml +++ b/pom.xml @@ -83,6 +83,12 @@ ${version.slf4j} jar + + org.mockito + mockito-all + 1.9.5 + test + diff --git a/src/main/java/ru/sbtqa/tag/qautils/cucumber/CucumberUtils.java b/src/main/java/ru/sbtqa/tag/qautils/cucumber/CucumberUtils.java index 3851a89..263c200 100644 --- a/src/main/java/ru/sbtqa/tag/qautils/cucumber/CucumberUtils.java +++ b/src/main/java/ru/sbtqa/tag/qautils/cucumber/CucumberUtils.java @@ -6,16 +6,29 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class CucumberUtils { + private static final Logger LOG = LoggerFactory.getLogger(CucumberUtils.class); + private static final String DEFAULT_LANGUAGE = "en"; + + private CucumberUtils() { + } + public static Locale getLocale(Scenario scenario) { List scenarioPaths = new ArrayList<>(); scenarioPaths.add(scenario.getUri()); MultiLoader multiLoader = new MultiLoader(ClassLoader.getSystemClassLoader()); - CucumberFeature load = CucumberFeature.load(multiLoader, scenarioPaths).get(0); - String language = load.getGherkinFeature().getFeature().getLanguage(); + String language = DEFAULT_LANGUAGE; + try { + CucumberFeature cucumberFeature = CucumberFeature.load(multiLoader, scenarioPaths).get(0); + language = cucumberFeature.getGherkinFeature().getFeature().getLanguage(); + } catch (Exception e) { + LOG.warn("Error while reading feature with uri {}. Using default language {} as fallback", scenario.getUri(), DEFAULT_LANGUAGE, e); + } return new Locale(language); } diff --git a/src/test/java/ru/sbtqa/tag/qautils/cucumber/CucumberUtilsTest.java b/src/test/java/ru/sbtqa/tag/qautils/cucumber/CucumberUtilsTest.java new file mode 100644 index 0000000..27ce16a --- /dev/null +++ b/src/test/java/ru/sbtqa/tag/qautils/cucumber/CucumberUtilsTest.java @@ -0,0 +1,34 @@ +package ru.sbtqa.tag.qautils.cucumber; + +import cucumber.api.Scenario; +import cucumber.runtime.ScenarioImpl; +import java.util.Locale; +import org.junit.Assert; +import org.junit.Test; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +public class CucumberUtilsTest { + + @Test + public void returnCorrectLanguageLocaleTest() { + Scenario scenario = mock(ScenarioImpl.class); + when(scenario.getUri()).thenReturn("src/test/resources/features/Correct.feature"); + Locale expectedLocale = new Locale("ru"); + + Locale actualLocale = CucumberUtils.getLocale(scenario); + + Assert.assertEquals(expectedLocale, actualLocale); + } + + @Test + public void fallbackToDefaultLanguageTest() { + Scenario scenario = mock(ScenarioImpl.class); + when(scenario.getUri()).thenReturn("src/test/resources/features/Empty.feature"); + Locale expectedLocale = new Locale("en"); + + Locale actualLocale = CucumberUtils.getLocale(scenario); + + Assert.assertEquals(expectedLocale, actualLocale); + } +} diff --git a/src/test/resources/features/Correct.feature b/src/test/resources/features/Correct.feature new file mode 100644 index 0000000..3649419 --- /dev/null +++ b/src/test/resources/features/Correct.feature @@ -0,0 +1,5 @@ +#language:ru +Функционал: Тестовая фича + + Сценарий: Тестовый сценарий + * открывается страница "Тестовая страница" \ No newline at end of file diff --git a/src/test/resources/features/Empty.feature b/src/test/resources/features/Empty.feature new file mode 100644 index 0000000..4cef802 --- /dev/null +++ b/src/test/resources/features/Empty.feature @@ -0,0 +1,4 @@ +Функционал: Тестовая фича + + Сценарий: Тестовый сценарий + * открывается страница "Тестовая страница" \ No newline at end of file