Extracted Default ScreenGrabber

getgauge · Mar 18, 2016 · 77d16bc · 77d16bc
1 parent a35e780
commit 77d16bc
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 36 deletions.
diff --git a/Runner/DefaultScreenGrabber.cs b/Runner/DefaultScreenGrabber.cs
@@ -0,0 +1,28 @@
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.IO;
+using System.Windows.Forms;
+using Gauge.CSharp.Lib;
+using Google.ProtocolBuffers;
+
+namespace Gauge.CSharp.Runner
+{
+    public class DefaultScreenGrabber : IScreenGrabber
+    {
+        public byte[] TakeScreenShot()
+        {
+            var bounds = Screen.GetBounds(Point.Empty);
+            using (var bitmap = new Bitmap(bounds.Width, bounds.Height))
+            {
+                using (var g = Graphics.FromImage(bitmap))
+                {
+                    g.CopyFromScreen(Point.Empty, Point.Empty, bounds.Size);
+                }
+                var memoryStream = new MemoryStream();
+                bitmap.Save(memoryStream, ImageFormat.Png);
+                var takeScreenshot = ByteString.CopyFrom(memoryStream.ToArray());
+                return takeScreenshot.ToByteArray();
+            }
+        }
+    }
+}
diff --git a/Runner/Gauge.CSharp.Runner.csproj b/Runner/Gauge.CSharp.Runner.csproj
@@ -113,6 +113,7 @@
     <Compile Include="AssemblyWrapper.cs" />
     <Compile Include="ClassInstanceManager.cs" />
     <Compile Include="Converters\IParamConverter.cs" />
+    <Compile Include="DefaultScreenGrabber.cs" />
     <Compile Include="ErrorCodeAggregator.cs" />
     <Compile Include="Exceptions\NotAValidGaugeProjectException.cs" />
     <Compile Include="ExecutionResult.cs" />

diff --git a/Runner/MethodExecutor.cs b/Runner/MethodExecutor.cs
@@ -18,11 +18,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
 using System.Reflection;
-using System.Windows.Forms;
 using Gauge.CSharp.Runner.Converters;
 using Gauge.Messages;
 using Google.ProtocolBuffers;
@@ -80,29 +76,8 @@ public IEnumerable<string> GetAllPendingMessages()
 
         private ByteString TakeScreenshot()
         {
-            try
-            {
-                byte[] screenShotBytes;
-                if (_sandbox.TryScreenCapture(out screenShotBytes))
-                    return ByteString.CopyFrom(screenShotBytes);
-
-                var bounds = Screen.GetBounds(Point.Empty);
-                using (var bitmap = new Bitmap(bounds.Width, bounds.Height))
-                {
-                    using (var g = Graphics.FromImage(bitmap))
-                    {
-                        g.CopyFromScreen(Point.Empty, Point.Empty, bounds.Size);
-                    }
-                    var memoryStream = new MemoryStream();
-                    bitmap.Save(memoryStream, ImageFormat.Png);
-                    var takeScreenshot = ByteString.CopyFrom(memoryStream.ToArray());
-                    return takeScreenshot;
-                }
-            }
-            catch
-            {
-                return ByteString.Empty;
-            }
+            byte[] screenShotBytes;
+            return _sandbox.TryScreenCapture(out screenShotBytes) ? ByteString.CopyFrom(screenShotBytes) : ByteString.Empty;
         }
 
         [DebuggerHidden]

diff --git a/Runner/Sandbox.cs b/Runner/Sandbox.cs
@@ -102,15 +102,12 @@ public IEnumerable<string> GetStepTexts(MethodInfo stepMethod)
 
         public bool TryScreenCapture(out byte[] screenShotBytes)
         {
-            if (ScreenGrabberType != null)
+            var screenCaptureMethod = ScreenGrabberType.GetMethod("TakeScreenShot");
+            var instance = Activator.CreateInstance(ScreenGrabberType);
+            if (instance != null)
             {
-                var screenCaptureMethod = ScreenGrabberType.GetMethod("TakeScreenShot");
-                var instance = Activator.CreateInstance(ScreenGrabberType);
-                if (instance != null)
-                {
-                    screenShotBytes = screenCaptureMethod.Invoke(instance, null) as byte[];
-                    return true;
-                }
+                screenShotBytes = screenCaptureMethod.Invoke(instance, null) as byte[];
+                return true;
             }
             screenShotBytes = null;
             return false;
@@ -149,7 +146,8 @@ private void ScanCustomScreenGrabber()
             }
             else
             {
-                Logger.Debug("No implementation of IScreenGrabber found.");
+                Logger.Debug("No implementation of IScreenGrabber found. Using DefaultScreenGrabber");
+                ScreenGrabberType = typeof (DefaultScreenGrabber);
             }
         }