From d0caf862ddbef5afe2df6d4f46f6746fd9d79dca Mon Sep 17 00:00:00 2001
From: Viktor Sidochenko <viktor.sidochenko@gmail.com>
Date: Mon, 20 Feb 2017 14:46:34 +0700
Subject: [PATCH] Move videoRecorder into @After step

---
 .../tag/pagefactory/stepdefs/SetupStepDefs.java     | 13 +++++++++++--
 .../tag/pagefactory/support/OnFailureScheduler.java | 13 +------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/main/java/ru/sbtqa/tag/pagefactory/stepdefs/SetupStepDefs.java b/src/main/java/ru/sbtqa/tag/pagefactory/stepdefs/SetupStepDefs.java
index d570f54..a5472ba 100644
--- a/src/main/java/ru/sbtqa/tag/pagefactory/stepdefs/SetupStepDefs.java
+++ b/src/main/java/ru/sbtqa/tag/pagefactory/stepdefs/SetupStepDefs.java
@@ -15,6 +15,7 @@
 import org.reflections.Reflections;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import ru.sbtqa.tag.allurehelper.ParamsHelper;
 import ru.sbtqa.tag.pagefactory.Page;
 import ru.sbtqa.tag.pagefactory.PageFactory;
 import ru.sbtqa.tag.pagefactory.annotations.ElementTitle;
@@ -23,6 +24,7 @@
 import ru.sbtqa.tag.qautils.properties.Props;
 import ru.sbtqa.tag.qautils.reflect.ClassUtilsExt;
 import ru.sbtqa.tag.qautils.reflect.FieldUtilsExt;
+import ru.sbtqa.tag.videorecorder.VideoRecorder;
 import ru.yandex.qatools.allure.cucumberjvm.AllureReporter;
 import ru.yandex.qatools.htmlelements.element.HtmlElement;
 
@@ -32,10 +34,10 @@ public class SetupStepDefs {
 
     @Before()
     public void setUp() {
-        
+
         //Apply failure callback
         AllureReporter.applyFailureCallback(OnFailureScheduler.class);
-        
+
         //try to connect logger property file if exists
         String path = "src/test/resources/config/log4j.properties";
         if (new File(path).exists()) {
@@ -103,6 +105,13 @@ public void setUp() {
 
     @After
     public void tearDown() {
+        if (VideoRecorder.getInstance().isVideoStarted()) {
+            String videoPath = VideoRecorder.getInstance().stopRecording();
+            if (videoPath != null) {
+                ParamsHelper.addVideoParameter(VideoRecorder.getInstance().getVideoPath());
+                VideoRecorder.getInstance().resetVideoRecorder();
+            }
+        }
         PageFactory.dispose();
     }
 }
diff --git a/src/main/java/ru/sbtqa/tag/pagefactory/support/OnFailureScheduler.java b/src/main/java/ru/sbtqa/tag/pagefactory/support/OnFailureScheduler.java
index bf643c9..ad4cd5b 100644
--- a/src/main/java/ru/sbtqa/tag/pagefactory/support/OnFailureScheduler.java
+++ b/src/main/java/ru/sbtqa/tag/pagefactory/support/OnFailureScheduler.java
@@ -7,10 +7,6 @@
 
 public class OnFailureScheduler implements OnFailureCallback {
 
-    private void addVideoParameter(String videoPath) {
-        ParamsHelper.addParam("Video url", videoPath);
-    }
-
     private void takeScreenshot() {
         String screenshotStrategy = Props.get("screenshot.strategy", "raw");
 
@@ -26,14 +22,7 @@ private void takeScreenshot() {
     }
 
     @Override
-    public Object call() {
-        if (VideoRecorder.getInstance().isVideoStarted()) {
-            String videoPath = VideoRecorder.getInstance().stopRecording();
-            if (videoPath != null) {
-                addVideoParameter(VideoRecorder.getInstance().getVideoPath());
-                VideoRecorder.getInstance().resetVideoRecorder();
-            }
-        }
+    public Object call() {   
         takeScreenshot();
         return null;
     }