8000 Updated tests to new @Rule/@ClassRule scheme · seleniumQuery/seleniumQuery@f5f744f · GitHub
[go: up one dir, main page]
Skip to content

Commit f5f744f

Browse files
ricardocarvalhodsacdcjunior
ricardocarvalhods
authored and
acdcjunior
committed
Updated tests to new @Rule/@ClassRule scheme
1 parent 98e5e75 commit f5f744f

38 files changed

+220
-180
lines changed

‎src/test/java/infrastructure/junitrule/SetUpAndTearDownDriverTest.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package infrastructure.junitrule;
22

3-
import org.junit.ClassRule;
4-
import org.junit.Rule;
5-
import org.junit.Test;
3+
import org.junit.*;
64

75
public class SetUpAndTearDownDriverTest {
86

9-
@ClassRule public static SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver();
10-
@Rule public SetUpAndTearDownDriver setUpAndTearDownDriverRuleInstance = setUpAndTearDownDriverRule;
7+
// @ClassRule public static SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver();
8+
// @Rule public SetUpAndTearDownDriver setUpAndTearDownDriverRuleInstance = setUpAndTearDownDriverRule;
119

1210
@Test @JavaScriptOnly
1311
public void a() throws Exception {

‎src/test/java/integration/functions/ChildrenFunctionTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
import static org.junit.Assert.assertThat;
66
import infrastructure.junitrule.SetUpAndTearDownDriver;
77

8+
import org.junit.ClassRule;
89
import org.junit.Rule;
910
import org.junit.Test;
1011

1112
public class ChildrenFunctionTest {
1213

13-
@Rule
14-
public SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver(getClass());
14+
@ClassRule public static SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver();
15+
@Rule public SetUpAndTearDownDriver setUpAndTearDownDriverRuleInstance = setUpAndTearDownDriverRule;
1516

1617
@Test
1718
public void children_function() {

‎src/test/java/integration/functions/EqFunctionTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import infrastructure.junitrule.SetUpAndTearDownDriver;
44
import org.junit.ClassRule;
5+
import org.junit.Rule;
56
import org.junit.Test;
67

78
import static io.github.seleniumquery.SeleniumQuery.$;
@@ -10,8 +11,8 @@
1011

1112
public class EqFunctionTest {
1213

13-
@ClassRule
14-
public static SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver(EqFunctionTest.class);
14+
@ClassRule public static SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver();
15+
@Rule public SetUpAndTearDownDriver setUpAndTearDownDriverRuleInstance = setUpAndTearDownDriverRule;
1516

1617
@Test
1718
public void eq_function_with_tag_div() {

‎src/test/java/integration/functions/GetFunctionTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22 E377

33
import infrastructure.junitrule.SetUpAndTearDownDriver;
44
import org.junit.ClassRule;
5+
import org.junit.Rule;
56
import org.junit.Test;
67
import org.openqa.selenium.WebElement;
78

@@ -12,9 +13,9 @@
1213
import static org.junit.Assert.assertThat;
1314

1415
public class GetFunctionTest {
15-
16-
@ClassRule
17-
public static SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver(GetFunctionTest.class);
16+
17+
@ClassRule public static SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver();
18+
@Rule public SetUpAndTearDownDriver setUpAndTearDownDriverRuleInstance = setUpAndTearDownDriverRule;
1819

1920
@Test
2021
public void get_function__with_index_arg() throws Exception {

‎src/test/java/integration/functions/IsFunctionTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@
22

33
import infrastructure.junitrule.SetUpAndTearDownDriver;
44
import org.junit.ClassRule;
5+
import org.junit.Rule;
56
import org.junit.Test;
67

78
import static io.github.seleniumquery.SeleniumQuery.$;
89
import static org.hamcrest.Matchers.is;
910
import static org.junit.Assert.assertThat;
1011

1112
public class IsFunctionTest {
12-
13-
@ClassRule
14-
public static SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver(IsFunctionTest.class);
13+
14+
@ClassRule public static SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver();
15+
@Rule public SetUpAndTearDownDriver setUpAndTearDownDriverRuleInstance = setUpAndTearDownDriverRule;
1516

1617
@Test
1718
public void is_function() {

‎src/test/java/integration/functions/jquery/attributes/AttrFunctionTest.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,22 @@
44
import static org.hamcrest.Matchers.is;
55
import static org.hamcrest.Matchers.nullValue;
66
import static org.junit.Assert.assertThat;
7+
8+
import infrastructure.junitrule.JavaScriptOnly;
79
import infrastructure.junitrule.SetUpAndTearDownDriver;
810

11+
import org.junit.ClassRule;
912
import org.junit.Rule;
1013
import org.junit.Test;
1114
import org.openqa.selenium.htmlunit.HtmlUnitDriver;
1215

1316
public class AttrFunctionTest {
14-
15-
@Rule
16-
public SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver(getClass());
17-
17+
18+
@ClassRule public static SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver();
19+
@Rule public SetUpAndTearDownDriver setUpAndTearDownDriverRuleInstance = setUpAndTearDownDriverRule;
20+
1821
// http://jsbin.com/pupoj/5/edit
19-
@Test
22+
@Test @JavaScriptOnly
2023
public void attr_function__getting_and_setting_whatever_to_CHECKED_is_like_setting_to_CHECKED_string() {
2124
// whatever value checked is, if it exists, attr returns "checked"
2225
assertThat($("#x1").attr("checked"), is("checked"));
@@ -55,7 +58,7 @@ public void attr_function__getting_and_setting_whatever_to_CHECKED_is_like_setti
5558
assertThat($("#n1").attr("checked"), is("checked"));
5659
}
5760

58-
@Test
61+
@Test @JavaScriptOnly
5962
public void attr_function__does_the_same_CHECKED_stuff_to_SELECTED_no_matter_what_tag() {
6063
// no matter what tag, the "checked" policy remains!
6164
$("#d1").attr("checked", "");
@@ -70,7 +73,7 @@ public void attr_function__does_the_same_CHECKED_stuff_to_SELECTED_no_matter_wha
7073
assertThat($("#d1").attr("selected"), is("selected"));
7174
}
7275

73-
@Test
76+
@Test @JavaScriptOnly
7477
public void attr_function__getting_and_setting() {
7578
assertThat($("#chk1").attr("checked"), is("checked"));
7679
assertThat($("#chk1").<Boolean>prop("checked"), is(true));

‎src/test/java/integration/functions/jquery/attributes/HasClassFunctionTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
import static org.junit.Assert.assertThat;
66
import infrastructure.junitrule.SetUpAndTearDownDriver;
77

8+
import org.junit.ClassRule;
89
import org.junit.Rule;
910
import org.junit.Test;
1011

1112
public class HasClassFunctionTest {
12-
13-
@Rule
14-
public SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver(getClass());
13+
14+
@ClassRule public static SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver();
15+
@Rule public SetUpAndTearDownDriver setUpAndTearDownDriverRuleInstance = setUpAndTearDownDriverRule;
1516

1617
@Test
1718
public void hasClass_function() {

‎src/test/java/integration/functions/jquery/forms/FocusFunctionTest.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@
33
import static io.github.seleniumquery.SeleniumQuery.$;
44
import static org.hamcrest.Matchers.is;
55
import static org.junit.Assert.assertThat;
6+
7+
import infrastructure.junitrule.JavaScriptOnly;
68
import infrastructure.junitrule.SetUpAndTearDownDriver;
79
import io.github.seleniumquery.by.css.pseudoclasses.UnsupportedXPathPseudoClassException;
810

11+
import org.junit.ClassRule;
912
import org.junit.Rule;
1013
import org.junit.Test;
1114
import org.openqa.selenium.JavascriptExecutor;
@@ -15,11 +18,11 @@
1518
import org.openqa.selenium.ie.InternetExplorerDriver;
1619

1720
public class FocusFunctionTest {
18-
19-
@Rule
20-
public SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver(getClass());
2121

22-
@Test
22+
@ClassRule public static SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver();
23+
@Rule public SetUpAndTearDownDriver setUpAndTearDownDriverRuleInstance = setUpAndTearDownDriverRule;
24+
25+
@Test @JavaScriptOnly
2326
public void focus_function() {
2427
$("#i1").focus();
2528
assertThat($("#i1").is(":focus"), is(true));
@@ -53,7 +56,7 @@ public void focus_function() {
5356
}
5457

5558

56-
@Test
59+
@Test @JavaScriptOnly
5760
public void focus_function__should_make_sure_the_elements_are_just_focused_and_NOT_clicked() {
5861
removeStartingFocusDivCreatedByIE();
5962

‎src/test/java/integration/functions/jquery/manipulation/HtmlFunctionTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.hamcrest.Description;
66
import org.hamcrest.Matcher;
77
import org.junit.ClassRule;
8+
import org.junit.Rule;
89
import org.junit.Test;
910

1011
import static io.github.seleniumquery.SeleniumQuery.$;
@@ -13,9 +14,9 @@
1314
import static org.junit.Assert.assertThat;
1415

1516
public class HtmlFunctionTest {
16-
17-
@ClassRule
18-
public static SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver(HtmlFunctionTest.class);
17+
18+
@ClassRule public static SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver();
19+
@Rule public SetUpAndTearDownDriver setUpAndTearDownDriverRuleInstance = setUpAndTearDownDriverRule;
1920

2021
@Test
2122
public void html_function__simple_element() {

‎src/test/java/integration/selectors/mixed/MixedSelectorsTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import infrastructure.junitrule.SetUpAndTearDownDriver;
44
import org.junit.ClassRule;
5+
import org.junit.Rule;
56
import org.junit.Test;
67
import org.openqa.selenium.WebElement;
78

@@ -12,9 +13,9 @@
1213
import static org.junit.Assert.assertThat;
1314

1415
public class MixedSelectorsTest {
15-
16-
@ClassRule
17-
public static SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver(MixedSelectorsTest.class);
16+
17+
@ClassRule public static SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver();
18+
@Rule public SetUpAndTearDownDriver setUpAndTearDownDriverRuleInstance = setUpAndTearDownDriverRule;
1819

1920
@Test
2021
public void id() {

‎src/test/java/integration/selectors/pseudoclasses/HeaderPseudoClassTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
import static org.junit.Assert.assertThat;
66
import infrastructure.junitrule.SetUpAndTearDownDriver;
77

8+
import org.junit.ClassRule;
89
import org.junit.Rule;
910
import org.junit.Test;
1011

1112
public class HeaderPseudoClassTest {
12-
13-
@Rule
14-
public SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver(getClass());
13+
14+
@ClassRule public static SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver();
15+
@Rule public SetUpAndTearDownDriver setUpAndTearDownDriverRuleInstance = setUpAndTearDownDriverRule;
1516

1617
// http://jsbin.com/bemufole/1/edit
1718
@Test

‎src/test/java/integration/selectors/pseudoclasses/NotSelectorTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
import static org.junit.Assert.assertThat;
66
import infrastructure.junitrule.SetUpAndTearDownDriver;
77

8+
import org.junit.ClassRule;
89
import org.junit.Rule;
910
import org.junit.Test;
1011

1112
public class NotSelectorTest {
12-
13-
@Rule
14-
public SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver(getClass());
13+
14+
@ClassRule public static SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver();
15+
@Rule public SetUpAndTearDownDriver setUpAndTearDownDriverRuleInstance = setUpAndTearDownDriverRule;
1516

1617
@Test
1718
public void notPseudoClass() throws Exception {

‎src/test/java/integration/selectors/pseudoclasses/PresentSelectorTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package integration.selectors.pseudoclasses;
22

3+
import infrastructure.junitrule.JavaScriptOnly;
34
import infrastructure.junitrule.SetUpAndTearDownDriver;
45
import io.github.seleniumquery.SeleniumQueryObject;
56
import org.junit.ClassRule;
@@ -11,9 +12,9 @@
1112
import static org.junit.Assert.assertThat;
1213

1314
public class PresentSelectorTest {
14-
15-
@Rule
16-
public SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver(PresentSelectorTest.class);
15+
16+
@ClassRule public static SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver();
17+
@Rule public SetUpAndTearDownDriver setUpAndTearDownDriverRuleInstance = setUpAndTearDownDriverRule;
1718

1819
@Test
1920
public void presentPseudoClass() {
@@ -29,7 +30,7 @@ public void presentPseudoClass() {
2930
assertThat($("#bozo").is(":not(:present)"), is(true));
3031
}
3132

32-
@Test
33+
@Test @JavaScriptOnly
3334
public void presentPseudoClass_while_removing_element_from_DOM() {
3435
SeleniumQueryObject $presentDiv = $("#presentDiv");
3536
SeleniumQueryObject $otherPresentDiv = $("#otherPresentDiv");

‎src/test/java/integration/selectors/pseudoclasses/PseudoClassEvaluatorTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,17 @@
99
import java.util.List;
1010

1111
import org.junit.Before;
12+
import org.junit.ClassRule;
1213
import org.junit.Rule;
1314
import org.junit.Test;
1415
import org.openqa.selenium.By;
1516
import org.openqa.selenium.WebDriver;
1617
import org.openqa.selenium.WebElement;
1718

1819
public class PseudoClassEvaluatorTest {
19-
20-
@Rule
21-
public SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver(PseudoClassEvaluatorTest.class);
20+
21+
@ClassRule public static SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver();
22+
@Rule public SetUpAndTearDownDriver setUpAndTearDownDriverRuleInstance = setUpAndTearDownDriverRule;
2223

2324
WebDriver driver;
2425

‎src/test/java/integration/selectors/pseudoclasses/content/ContainsPseudoClass2Test.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@
22

33
import infrastructure.junitrule.SetUpAndTearDownDriver;
44
import org.junit.ClassRule;
5+
import org.junit.Rule;
56
import org.junit.Test;
67

78
import static io.github.seleniumquery.SeleniumQuery.$;
89
import static org.hamcrest.Matchers.is;
910
import static org.junit.Assert.assertThat;
1011

1112
public class ContainsPseudoClass2Test {
12-
13-
@ClassRule
14-
public static SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver(ContainsPseudoClass2Test.class);
13+
14+
@ClassRule public static SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver();
15+
@Rule public SetUpAndTearDownDriver setUpAndTearDownDriverRuleInstance = setUpAndTearDownDriverRule;
1516

1617
// http://jsbin.com/tapol/6/edit
1718
@Test

‎src/test/java/integration/selectors/pseudoclasses/content/ContainsPseudoClassTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55
import static org.junit.Assert.assertThat;
66
import infrastructure.junitrule.SetUpAndTearDownDriver;
77

8+
import org.junit.ClassRule;
89
import org.junit.Rule;
910
import org.junit.Test;
1011

1112
public class ContainsPseudoClassTest {
12-
13-
@Rule
14-
public SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver(getClass());
15-
13+
14+
@ClassRule public static SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver();
15+
@Rule public SetUpAndTearDownDriver setUpAndTearDownDriverRuleInstance = setUpAndTearDownDriverRule;
16+
1617
// http://jsbin.com/siwapeqe/1/edit
1718
@Test
1819
public void contains_pseudo_with_tag() {

‎src/test/java/integration/selectors/pseudoclasses/content/ContainsSelectorTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import infrastructure.junitrule.SetUpAndTearDownDriver;
44
import org.junit.ClassRule;
5+
import org.junit.Rule;
56
import org.junit.Test;
67

78
import static io.github.seleniumquery.SeleniumQuery.$;
@@ -10,8 +11,8 @@
1011

1112
public class ContainsSelectorTest {
1213

13-
@ClassRule
14-
public static SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver(ContainsSelectorTest.class);
14+
@ClassRule public static SetUpAndTearDownDriver setUpAndTearDownDriverRule = new SetUpAndTearDownDriver();
15+
@Rule public SetUpAndTearDownDriver setUpAndTearDownDriverRuleInstance = setUpAndTearDownDriverRule;
1516

1617
// http://jsbin.com/siwapeqe/1/edit
1718
@Test

0 commit comments

Comments
 (0)
0