add colibri start names

alfa-laboratory · Jun 5, 2017 · 080608f · 080608f
1 parent 5fa41d4
commit 080608f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/main/java/ru/colibri/ui/core/names/ColibriStartFlags.java b/src/main/java/ru/colibri/ui/core/names/ColibriStartFlags.java
@@ -0,0 +1,8 @@
+package ru.colibri.ui.core.names;
+
+public class ColibriStartFlags {
+    public static final String PLATFORM = "platform";
+    public static final String USER = "user";
+    public static final String TEST_TYPE = "testType";
+    public static final String BUILD_VERSION = "buildVersion";
+}
diff --git a/src/main/java/ru/colibri/ui/core/reporters/AllureReporter.java b/src/main/java/ru/colibri/ui/core/reporters/AllureReporter.java
@@ -1,7 +1,6 @@
 package ru.colibri.ui.core.reporters;
 
 import io.appium.java_client.AppiumDriver;
-import org.apache.commons.lang3.NotImplementedException;
 import org.jbehave.core.model.*;
 import org.jbehave.core.reporters.StoryReporter;
 import org.openqa.selenium.OutputType;
@@ -24,7 +23,7 @@
 public class AllureReporter extends AllureRunListener implements StoryReporter {
     private final Map<String, String> suites = new HashMap<>();
     @Autowired
-    ApplicationContext applicationContext;
+    private ApplicationContext applicationContext;
     private Allure allure = Allure.LIFECYCLE;
     private String uid;
 
@@ -148,7 +147,7 @@ public void afterExamples() {
 
     @Override
     public void failedOutcomes(String step, OutcomesTable table) {
-        throw new NotImplementedException("Method not use. Allure doesn't support this");
+//        throw new NotImplementedException("Method not use. Allure doesn't support this");
     }
 
     @Override

diff --git a/src/main/java/ru/colibri/ui/settings/general/PropertyUtils.java b/src/main/java/ru/colibri/ui/settings/general/PropertyUtils.java
@@ -3,6 +3,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import ru.colibri.ui.core.names.ColibriStartFlags;
 import ru.colibri.ui.core.settings.AppSettings;
 
 import java.io.FileInputStream;
@@ -45,7 +46,7 @@ public String injectProperties(String text) {
         String propertyKey = matcher.group(2);
         String propertyValue = userProfile.get(propertyKey);
         if (propertyValue == null) {
-            log.error("Couldn't find property {} for user {}", propertyKey, System.getProperty("user", "user not defined"));
+            log.error("Couldn't find property {} for user {}", propertyKey, System.getProperty(ColibriStartFlags.USER, "user not defined"));
             return text;
         }
         return matcher.replaceAll(propertyValue);