Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make canopy not crash horribly on mono 64 bit. #333

Merged
merged 2 commits into from
Jan 18, 2017
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
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ exit_code=$?
if [ $exit_code -ne 0 ]; then
exit $exit_code
fi

#workaround assembly resolution issues in build.fsx
export FSHARPI=`which fsharpi`
cat - > fsharpi <<"EOF"
Expand All @@ -20,5 +20,5 @@ libdir=$PWD/packages/FAKE/tools/
$FSHARPI --lib:$libdir $@
EOF
chmod +x fsharpi
mono packages/FAKE/tools/FAKE.exe build.fsx $@
mono packages/FAKE/tools/FAKE.exe Build.fsx $@
rm fsharpi
20 changes: 10 additions & 10 deletions src/canopy/canopy.fs
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,10 @@ let private saveScreenshot directory filename pic =

let private takeScreenShotIfAlertUp () =
try
let bitmap = new Bitmap(width= System.Windows.Forms.Screen.PrimaryScreen.Bounds.Width, height= System.Windows.Forms.Screen.PrimaryScreen.Bounds.Height, format=PixelFormat.Format32bppArgb);
let screenBounds = canopy.screen.getPrimaryScreenBounds ()
let bitmap = new Bitmap(width= screenBounds.width, height= screenBounds.height, format=PixelFormat.Format32bppArgb);
use graphics = Graphics.FromImage(bitmap)
graphics.CopyFromScreen(System.Windows.Forms.Screen.PrimaryScreen.Bounds.X, System.Windows.Forms.Screen.PrimaryScreen.Bounds.Y, 0, 0, System.Windows.Forms.Screen.PrimaryScreen.Bounds.Size, CopyPixelOperation.SourceCopy);
graphics.CopyFromScreen(screenBounds.x, screenBounds.y, 0, 0, screenBounds.size, CopyPixelOperation.SourceCopy);
use stream = new MemoryStream()
bitmap.Save(stream, ImageFormat.Png)
stream.Close()
Expand Down Expand Up @@ -98,7 +99,7 @@ let private pngToJpg pngArray =

pngStream.Write(pngArray, 0, pngArray.Length)
let img = Image.FromStream(pngStream)

img.Save(jpgStream, ImageFormat.Jpeg)
jpgStream.ToArray()

Expand Down Expand Up @@ -756,20 +757,19 @@ let drag cssSelectorA cssSelectorB = cssSelectorA --> cssSelectorB
//browser related
(* documented/actions *)
let pin direction =
let h = System.Windows.Forms.Screen.PrimaryScreen.WorkingArea.Height
let w = System.Windows.Forms.Screen.PrimaryScreen.WorkingArea.Width
let (w, h) = canopy.screen.getPrimaryScreenResolution ()
let maxWidth = w / 2
browser.Manage().Window.Size <- new System.Drawing.Size(maxWidth,h)
browser.Manage().Window.Size <- new System.Drawing.Size(maxWidth, h)
match direction with
| Left -> browser.Manage().Window.Position <- new System.Drawing.Point((maxWidth * 0),0)
| Right -> browser.Manage().Window.Position <- new System.Drawing.Point((maxWidth * 1),0)
| Left -> browser.Manage().Window.Position <- new System.Drawing.Point((maxWidth * 0), 0)
| Right -> browser.Manage().Window.Position <- new System.Drawing.Point((maxWidth * 1), 0)
| FullScreen -> browser.Manage().Window.Maximize()

(* documented/actions *)
let pinToMonitor n =
let n' = if n < 1 then 1 else n
if System.Windows.Forms.SystemInformation.MonitorCount >= n' then
let workingArea = System.Windows.Forms.Screen.AllScreens.[n'-1].WorkingArea
if canopy.screen.monitorCount >= n' then
let workingArea = canopy.screen.allScreensWorkingArea.[n'-1]
browser.Manage().Window.Position <- new System.Drawing.Point(workingArea.X, 0)
browser.Manage().Window.Maximize()
else
Expand Down
1 change: 1 addition & 0 deletions src/canopy/canopy.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
<Compile Include="AssemblyInfo.fs" />
<Compile Include="types.fs" />
<Compile Include="wait.fs" />
<Compile Include="screen.fs" />
<Compile Include="reporters.fs" />
<Compile Include="finders.fs" />
<Compile Include="configuration.fs" />
Expand Down
13 changes: 6 additions & 7 deletions src/canopy/reporters.fs
Original file line number Diff line number Diff line change
Expand Up @@ -221,11 +221,10 @@ type LiveHtmlReporter(browser : BrowserStartMode, driverPath : string, ?pinBrows
| Remote(_,_) -> raise(System.Exception("Sorry Remote can't be used for LiveHtmlReporter"))

let pin () =
let h = System.Windows.Forms.Screen.PrimaryScreen.WorkingArea.Height;
let w = System.Windows.Forms.Screen.PrimaryScreen.WorkingArea.Width;
let (w, h) = canopy.screen.getPrimaryScreenResolution ()
let maxWidth = w / 2
_browser.Manage().Window.Size <- new System.Drawing.Size(maxWidth,h);
_browser.Manage().Window.Position <- new System.Drawing.Point((maxWidth * 0),0);
_browser.Manage().Window.Size <- new System.Drawing.Size(maxWidth,h)
_browser.Manage().Window.Position <- new System.Drawing.Point((maxWidth * 0),0)

let tryPin() =
if pinBrowserRight then do pin()
Expand Down Expand Up @@ -399,11 +398,11 @@ type LiveHtmlReporter(browser : BrowserStartMode, driverPath : string, ?pinBrows
type JUnitReporter(resultFilePath:string) =

let consoleReporter : IReporter = new ConsoleReporter() :> IReporter

let testStopWatch = System.Diagnostics.Stopwatch()
let testTimes = ResizeArray<string * float>()
let passedTests = ResizeArray<string>()
let failedTests = ResizeArray<Exception * string>()
let failedTests = ResizeArray<Exception * string>()

interface IReporter with

Expand Down Expand Up @@ -438,7 +437,7 @@ type JUnitReporter(resultFilePath:string) =
let testTimeSum = testTimes |> Seq.sumBy snd
let allTestsXml = String.Join(String.Empty, Seq.concat [passedTestsXml; failedTestsXml])
let xml =
sprintf "<testsuite tests=\"%i\" time=\"%.3f\">%s</testsuite>" testCount testTimeSum allTestsXml
sprintf "<testsuite tests=\"%i\" time=\"%.3f\">%s</testsuite>" testCount testTimeSum allTestsXml
let resultFile = System.IO.FileInfo(resultFilePath)
resultFile.Directory.Create()
consoleReporter.write <| sprintf "Saving results to %s" resultFilePath
Expand Down
76 changes: 76 additions & 0 deletions src/canopy/screen.fs
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
namespace canopy
module screen =

open System

type ScreenBoundary =
{ width : int
height: int
x: int
y: int
size: Drawing.Size
}

module microsoftDotNet =
let getPrimaryScreenResolution () =
let h = System.Windows.Forms.Screen.PrimaryScreen.WorkingArea.Height
let w = System.Windows.Forms.Screen.PrimaryScreen.WorkingArea.Width
(w, h)

let getPrimaryScreenBounds () =
{ width = System.Windows.Forms.Screen.PrimaryScreen.Bounds.Width
height = System.Windows.Forms.Screen.PrimaryScreen.Bounds.Height
x = System.Windows.Forms.Screen.PrimaryScreen.Bounds.X
y = System.Windows.Forms.Screen.PrimaryScreen.Bounds.Y
size = System.Windows.Forms.Screen.PrimaryScreen.Bounds.Size
}

let monitorCount () =
System.Windows.Forms.SystemInformation.MonitorCount

let allScreensWorkingArea () =
System.Windows.Forms.Screen.AllScreens
|> Array.map(fun x -> x.WorkingArea)


module mono =
let mutable screenWidth = 1280
let mutable screenHeight = 800

let getPrimaryScreenResolution () =
(screenWidth, screenHeight)

let getPrimaryScreenBounds () =
{ width = screenWidth
height = screenHeight
x = 0
y = 0
size = Drawing.Size(screenWidth, screenHeight)
}

let monitorCount () =
1

let allScreensWorkingArea () =
[| Drawing.Rectangle(0, 0, screenWidth, screenHeight)
|]


let private is64BitMono =
Environment.Is64BitProcess && Type.GetType("Mono.Runtime") <> null

let getPrimaryScreenResolution () =
if is64BitMono then mono.getPrimaryScreenResolution ()
else microsoftDotNet.getPrimaryScreenResolution ()

let getPrimaryScreenBounds () =
if is64BitMono then mono.getPrimaryScreenBounds ()
else microsoftDotNet.getPrimaryScreenBounds ()

let monitorCount =
if is64BitMono then mono.monitorCount ()
else microsoftDotNet.monitorCount ()

let allScreensWorkingArea =
if is64BitMono then mono.allScreensWorkingArea ()
else microsoftDotNet.allScreensWorkingArea ()