Skip to content
This repository was archived by the owner on Sep 3, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ addons:
token:
secure: $SONAR_TOKEN
jdk:
- oraclejdk8
- oraclejdk11
before_install:
- if [ ! -z "$GPG_SECRET_KEYS" ]; then echo $GPG_SECRET_KEYS | base64 --decode | $GPG_EXECUTABLE --import; fi
- if [ ! -z "$GPG_OWNERTRUST" ]; then echo $GPG_OWNERTRUST | base64 --decode | $GPG_EXECUTABLE --import-ownertrust; fi
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<version.commons-lang3>3.3.2</version.commons-lang3>
<version.cucumber>2.4.0</version.cucumber>
<version.junit>4.12</version.junit>
<version.slf4j>1.7.22</version.slf4j>
<version.commons-lang3>3.5</version.commons-lang3>
<version.cucumber>4.3.1</version.cucumber>
<version.junit>4.13.1</version.junit>
<version.slf4j>2.0.7</version.slf4j>
</properties>
<distributionManagement>
<snapshotRepository>
Expand Down Expand Up @@ -85,8 +85,8 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.5</version>
<artifactId>mockito-core</artifactId>
<version>5.3.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
18 changes: 10 additions & 8 deletions src/main/java/ru/sbtqa/tag/qautils/cucumber/CucumberUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@

import cucumber.api.Scenario;
import cucumber.runtime.io.MultiLoader;
import cucumber.runtime.model.CucumberFeature;
import java.util.ArrayList;
import java.util.List;

import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Locale;

import gherkin.AstBuilder;
import gherkin.Parser;
import gherkin.ast.GherkinDocument;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -18,14 +22,12 @@ private CucumberUtils() {
}

public static Locale getLocale(Scenario scenario) {
List<String> scenarioPaths = new ArrayList<>();
scenarioPaths.add(scenario.getUri());

MultiLoader multiLoader = new MultiLoader(ClassLoader.getSystemClassLoader());
String language = DEFAULT_LANGUAGE;
try {
CucumberFeature cucumberFeature = CucumberFeature.load(multiLoader, scenarioPaths).get(0);
language = cucumberFeature.getGherkinFeature().getFeature().getLanguage();
String content = new String(Files.readAllBytes(Paths.get(scenario.getUri())));
GherkinDocument gherkinDocument = new Parser<>(new AstBuilder()).parse(content);
language = gherkinDocument.getFeature().getLanguage();
} catch (Exception e) {
LOG.warn("Error while reading feature with uri {}. Using default language {} as fallback", scenario.getUri(), DEFAULT_LANGUAGE, e);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
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;
Expand All @@ -12,7 +11,7 @@ public class CucumberUtilsTest {

@Test
public void returnCorrectLanguageLocaleTest() {
Scenario scenario = mock(ScenarioImpl.class);
Scenario scenario = mock(Scenario.class);
when(scenario.getUri()).thenReturn("src/test/resources/features/Correct.feature");
Locale expectedLocale = new Locale("ru");

Expand All @@ -23,7 +22,7 @@ public void returnCorrectLanguageLocaleTest() {

@Test
public void fallbackToDefaultLanguageTest() {
Scenario scenario = mock(ScenarioImpl.class);
Scenario scenario = mock(Scenario.class);
when(scenario.getUri()).thenReturn("src/test/resources/features/Incorrect.feature");
Locale expectedLocale = new Locale("en");

Expand Down
3 changes: 1 addition & 2 deletions src/test/java/ru/sbtqa/tag/qautils/i18n/I18NTest.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package ru.sbtqa.tag.qautils.i18n;

import cucumber.api.Scenario;
import cucumber.runtime.ScenarioImpl;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
Expand Down Expand Up @@ -59,7 +58,7 @@ public void getI18nReverseTest() {

@Test
public void getI18nViaScenarioTest() {
Scenario scenario = mock(ScenarioImpl.class);
Scenario scenario = mock(Scenario.class);
when(scenario.getUri()).thenReturn("src/test/resources/features/Correct.feature");

I18N i18n = I18N.getI18n(I18NTest.class, scenario);
Expand Down