Skip to content
This repository was archived by the owner on May 7, 2018. It is now read-only.

Commit 221dd70

Browse files
author
tfreitasleal
committed
Update to NuGet 1.0.8
1 parent 9a942ed commit 221dd70

14 files changed

+123
-148
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
WebDriver testing support for qooxdoo desktop and mobile applications.
44

5-
Version 1.0.7 is available on [NuGet](https://www.nuget.org/packages/Qooxdoo-WebDriver/) as __Qooxdoo-WebDriver__. This release is NET 4.5 only.
5+
Version 1.0.8 is available on [NuGet](https://www.nuget.org/packages/Qooxdoo-WebDriver/) as __Qooxdoo-WebDriver__. This release is NET 4.5 only.
66

77
The SimpleDemo sample uses Chrome, Edge, Firefox and Opera (Internet Explorer isn't planned). It includes test projects for NUnit and MSTest. It also includes an "How to run.txt" to make your life easier.
88

‎Samples/SimpleDemo/SimpleDemo.Tests/ApiViewerTests.cs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@ namespace SimpleDemo.Tests
77
{
88
public static class ApiViewerTests
99
{
10-
public static void A01_ClickSearch(QxWebDriver driver)
10+
public static QxWebDriver Driver;
11+
12+
public static void A01_ClickSearch()
1113
{
1214
// Find the 'Search' button in the tool bar
1315
// @label is the button text
1416
OpenQA.Selenium.By buttonByLabel = By.Qxh("apiviewer.Viewer/*/[@label=Search]");
15-
IWidget buttonWidget = driver.FindWidget(buttonByLabel);
17+
IWidget buttonWidget = Driver.FindWidget(buttonByLabel);
1618

1719
// Click the button if it's not already selected
1820
if (!buttonWidget.Selected)
@@ -21,33 +23,33 @@ public static void A01_ClickSearch(QxWebDriver driver)
2123
}
2224
}
2325

24-
public static void A02_ClickLegend(QxWebDriver driver)
26+
public static void A02_ClickLegend()
2527
{
2628
// Now click the 'Legend' button
2729
OpenQA.Selenium.By buttonByLabel = By.Qxh("apiviewer.Viewer/*/[@label=Legend]");
28-
IWidget buttonWidget = driver.FindWidget(buttonByLabel);
30+
IWidget buttonWidget = Driver.FindWidget(buttonByLabel);
2931
if (!buttonWidget.Selected)
3032
{
3133
buttonWidget.Click();
3234
}
3335
}
3436

35-
public static void A03_ClickContent(QxWebDriver driver)
37+
public static void A03_ClickContent()
3638
{
3739
// Now click the 'Content' button
3840
OpenQA.Selenium.By buttonByLabel = By.Qxh("apiviewer.Viewer/*/[@label=Content]");
39-
IWidget buttonWidget = driver.FindWidget(buttonByLabel);
41+
IWidget buttonWidget = Driver.FindWidget(buttonByLabel);
4042
if (!buttonWidget.Selected)
4143
{
4244
buttonWidget.Click();
4345
}
4446
}
4547

46-
public static void A04_ClickTreeItem(QxWebDriver driver)
48+
public static void A04_ClickTreeItem()
4749
{
4850
// Select the "data" item from the package tree
4951
OpenQA.Selenium.By tree = By.Qxh("apiviewer.Viewer/*/apiviewer.ui.PackageTree");
50-
ISelectable packageTree = (ISelectable) driver.FindWidget(tree);
52+
ISelectable packageTree = (ISelectable) Driver.FindWidget(tree);
5153
packageTree.SelectItem("data");
5254

5355
Thread.Sleep(Wait.Duration);

‎Samples/SimpleDemo/SimpleDemo.Tests/ChromeApiViewer.cs

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
using NUnit.Framework;
2-
using OpenQA.Selenium;
3-
using OpenQA.Selenium.Chrome;
42
using Qooxdoo.WebDriver;
53

64
namespace SimpleDemo.Tests
@@ -9,16 +7,14 @@ namespace SimpleDemo.Tests
97
[Parallelizable(ParallelScope.None)]
108
public class ChromeApiViewer
119
{
12-
private static IWebDriver _internalWebDriver;
13-
1410
public static QxWebDriver Driver;
1511

1612
[OneTimeSetUp]
1713
public void Setup()
1814
{
19-
_internalWebDriver = new ChromeDriver();
20-
_internalWebDriver.Manage().Window.Maximize();
21-
Driver = new QxWebDriver(_internalWebDriver);
15+
Driver = new QxWebDriver(Browser.Chrome);
16+
Driver.Manage().Window.Maximize();
17+
ApiViewerTests.Driver = Driver;
2218
Driver.Url = "http://www.qooxdoo.org/current/api/index.html";
2319
}
2420

@@ -33,28 +29,28 @@ public void TearDown()
3329
[Order(1010)]
3430
public void A01_ClickSearch()
3531
{
36-
ApiViewerTests.A01_ClickSearch(Driver);
32+
ApiViewerTests.A01_ClickSearch();
3733
}
3834

3935
[Test]
4036
[Order(1020)]
4137
public void A02_ClickLegend()
4238
{
43-
ApiViewerTests.A02_ClickLegend(Driver);
39+
ApiViewerTests.A02_ClickLegend();
4440
}
4541

4642
[Test]
4743
[Order(1030)]
4844
public void A03_ClickContent()
4945
{
50-
ApiViewerTests.A03_ClickContent(Driver);
46+
ApiViewerTests.A03_ClickContent();
5147
}
5248

5349
[Test]
5450
[Order(1040)]
5551
public void A04_ClickTreeItem()
5652
{
57-
ApiViewerTests.A04_ClickTreeItem(Driver);
53+
ApiViewerTests.A04_ClickTreeItem();
5854
}
5955
}
6056
}

‎Samples/SimpleDemo/SimpleDemo.Tests/ChromeWisej.cs

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
using NUnit.Framework;
2-
using OpenQA.Selenium;
3-
using OpenQA.Selenium.Chrome;
42
using OpenQA.Selenium.Support.UI;
53
using Qooxdoo.WebDriver;
64

@@ -10,17 +8,15 @@ namespace SimpleDemo.Tests
108
[Parallelizable(ParallelScope.None)]
119
public class ChromeWisej
1210
{
13-
private static IWebDriver _internalWebDriver;
14-
1511
public static QxWebDriver Driver;
1612

1713
[OneTimeSetUp]
1814
public void Setup()
1915
{
20-
_internalWebDriver = new ChromeDriver();
21-
_internalWebDriver.Manage().Window.Maximize();
22-
Driver = new QxWebDriver(_internalWebDriver);
16+
Driver = new QxWebDriver(Browser.Chrome);
17+
Driver.Manage().Window.Maximize();
2318
Cache.Clear();
19+
WisejTests.Driver = Driver;
2420
#if !DEBUGJS
2521
Driver.Url = "http://localhost:16461/Default.html";
2622
#else
@@ -33,77 +29,78 @@ public void TearDown()
3329
{
3430
Driver.Quit();
3531
Driver.Dispose();
32+
Driver = null;
3633
}
3734

3835
[Test]
3936
[Order(1050)]
4037
public void W01_AskQuitNo()
4138
{
4239
ExpectedConditions.TitleIs("Main Page");
43-
WisejTests.W01_AskQuitNo(Driver);
40+
WisejTests.W01_AskQuitNo();
4441
}
4542

4643
[Test]
4744
[Order(1060)]
4845
public void W02_MainPage_customerEditor_Click()
4946
{
50-
WisejTests.W02_MainPage_customerEditor_Click(Driver);
47+
WisejTests.W02_MainPage_customerEditor_Click();
5148
}
5249

5350
[Test]
5451
[Order(1070)]
5552
public void W03_ButtonsWindow_customerEditor_Click()
5653
{
57-
WisejTests.W03_ButtonsWindow_customerEditor_Click(Driver);
54+
WisejTests.W03_ButtonsWindow_customerEditor_Click();
5855
}
5956

6057
[Test]
6158
[Order(1080)]
6259
public void W04_CustomerEditor_customerEditor_LabelContents()
6360
{
64-
WisejTests.W04_CustomerEditor_customerEditor_LabelContents(Driver);
61+
WisejTests.W04_CustomerEditor_customerEditor_LabelContents();
6562
}
6663

6764
[Test]
6865
[Order(1090)]
6966
public void W05_CloseWindow()
7067
{
71-
WisejTests.W05_CloseWindow(Driver);
68+
WisejTests.W05_CloseWindow();
7269
}
7370

7471
[Test]
7572
[Order(1100)]
7673
public void W06_MainPage_customerEditor_Click()
7774
{
78-
WisejTests.W06_MainPage_customerEditor_Click(Driver);
75+
WisejTests.W06_MainPage_customerEditor_Click();
7976
}
8077

8178
[Test]
8279
[Order(1110)]
8380
public void W07_ButtonsWindow_supplierEditor_Click()
8481
{
85-
WisejTests.W07_ButtonsWindow_supplierEditor_Click(Driver);
82+
WisejTests.W07_ButtonsWindow_supplierEditor_Click();
8683
}
8784

8885
[Test]
8986
[Order(1120)]
9087
public void W08_CustomerEditor_customerEditor_LabelContents()
9188
{
92-
WisejTests.W08_CustomerEditor_customerEditor_LabelContents(Driver);
89+
WisejTests.W08_CustomerEditor_customerEditor_LabelContents();
9390
}
9491

9592
[Test]
9693
[Order(1130)]
9794
public void W09_CloseWindow()
9895
{
99-
WisejTests.W09_CloseWindow(Driver);
96+
WisejTests.W09_CloseWindow();
10097
}
10198

10299
[Test]
103100
[Order(1140)]
104101
public void W10_AskQuitYes()
105102
{
106-
WisejTests.W10_AskQuitYes(Driver);
103+
WisejTests.W10_AskQuitYes();
107104
}
108105
}
109106
}

‎Samples/SimpleDemo/SimpleDemo.Tests/EdgeApiViewer.cs

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
using NUnit.Framework;
2-
using OpenQA.Selenium;
3-
using OpenQA.Selenium.Edge;
42
using Qooxdoo.WebDriver;
53

64
namespace SimpleDemo.Tests
@@ -9,16 +7,14 @@ namespace SimpleDemo.Tests
97
[Parallelizable(ParallelScope.None)]
108
public class EdgeApiViewer
119
{
12-
private static IWebDriver _internalWebDriver;
13-
1410
public static QxWebDriver Driver;
1511

1612
[OneTimeSetUp]
1713
public void Setup()
1814
{
19-
_internalWebDriver = new EdgeDriver();
20-
_internalWebDriver.Manage().Window.Maximize();
21-
Driver = new QxWebDriver(_internalWebDriver);
15+
Driver = new QxWebDriver(Browser.Edge);
16+
Driver.Manage().Window.Maximize();
17+
ApiViewerTests.Driver = Driver;
2218
Driver.Url = "http://www.qooxdoo.org/current/api/index.html";
2319
}
2420

@@ -33,28 +29,28 @@ public void TearDown()
3329
[Order(2010)]
3430
public void A01_ClickSearch()
3531
{
36-
ApiViewerTests.A01_ClickSearch(Driver);
32+
ApiViewerTests.A01_ClickSearch();
3733
}
3834

3935
[Test]
4036
[Order(2020)]
4137
public void A02_ClickLegend()
4238
{
43-
ApiViewerTests.A02_ClickLegend(Driver);
39+
ApiViewerTests.A02_ClickLegend();
4440
}
4541

4642
[Test]
4743
[Order(2030)]
4844
public void A03_ClickContent()
4945
{
50-
ApiViewerTests.A03_ClickContent(Driver);
46+
ApiViewerTests.A03_ClickContent();
5147
}
5248

5349
[Test]
5450
[Order(2040)]
5551
public void A04_ClickTreeItem()
5652
{
57-
ApiViewerTests.A04_ClickTreeItem(Driver);
53+
ApiViewerTests.A04_ClickTreeItem();
5854
}
5955
}
6056
}

0 commit comments

Comments
 (0)