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

Commit c0ff5cc

Browse files
svenruppertsvenruppert
committed
small cleanings
1 parent fbac470 commit c0ff5cc

File tree

48 files changed

+240
-358
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+240
-358
lines changed

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
.idea/*
22
*.iml
33
/modules/m001/_data/webdrivers/
4+
config.properties
45

56
# Created by .ignore support plugin (hsz.mobi)
67
### Eclipse template
@@ -161,7 +162,6 @@ dist/
161162
nbdist/
162163
.nb-gradle/
163164

164-
.gitignore
165165
chromedriver-mac-64bit
166166
chromedriver-mac-64bit.version
167167
geckodriver-mac-64bit

‎modules/demos/demo01/src/main/java/org/rapidpm/vaadin/CustomerService.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
public class CustomerService implements HasLogger {
99

10-
private static CustomerService instance;
11-
private final Map<Long, Customer> contacts = new HashMap<>();
12-
private long nextId = 0;
10+
private static CustomerService instance;
11+
private final Map<Long, Customer> contacts = new HashMap<>();
12+
private long nextId = 0;
1313

1414
private CustomerService() {
1515
}

‎modules/demos/demo02/pom.xml

+8
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,12 @@
1919
<module>ui</module>
2020
</modules>
2121

22+
23+
<dependencies>
24+
<dependency>
25+
<groupId>org.rapidpm</groupId>
26+
<artifactId>rapidpm-dependencies-core-logger</artifactId>
27+
</dependency>
28+
</dependencies>
29+
2230
</project>

‎modules/demos/demo03/pom.xml

+7
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,11 @@
1919
<module>ui-components</module>
2020
<module>ui</module>
2121
</modules>
22+
23+
<dependencies>
24+
<dependency>
25+
<groupId>org.rapidpm</groupId>
26+
<artifactId>rapidpm-dependencies-core-logger</artifactId>
27+
</dependency>
28+
</dependencies>
2229
</project>

‎modules/demos/demo03/ui/src/main/java/org/rapidpm/vaadin/ui/app/MyUI.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class MyUI extends UI implements HasLogger {
3939
private final TextField filterText = new TextField();
4040
private final CustomerForm customerForm = new CustomerForm();
4141
private final Button clearFilterTextBtn = new Button(FontAwesome.TIMES);
42-
private final Button addCustomerBtn = new Button(NEW_CUSTOMER_BTN_CAPTION);
42+
private final Button addCustomerBtn = new Button();
4343

4444
// @Inject private PropertyService propertyService;
4545
private final PropertyService propertyService = DI.activateDI(PropertyService.class);
@@ -66,6 +66,7 @@ protected void init(VaadinRequest vaadinRequest) {
6666
filtering.setStyleName(ValoTheme.LAYOUT_COMPONENT_GROUP);
6767

6868
addCustomerBtn.setId(NEW_CUSTOMER_BTN_ID);
69+
addCustomerBtn.setCaption(resolve(NEW_CUSTOMER_BTN_CAPTION));
6970
addCustomerBtn.addClickListener(e -> {
7071
grid.asSingleSelect().clear();
7172
customerForm.setCustomer(new Customer());

‎modules/junit4/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<dependency>
2222
<groupId>junit</groupId>
2323
<artifactId>junit</artifactId>
24+
<version>4.12</version>
2425
<scope>test</scope>
2526
</dependency>
2627
</dependencies>

‎modules/junit5/m001/pom.xml

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
<modelVersion>4.0.0</modelVersion>
1111

1212
<artifactId>tb-jumpstart-m-junit5-m001</artifactId>
13+
14+
1315
<packaging>pom</packaging>
1416
<modules>
1517
<module>srv</module>

‎modules/junit5/m001/srv/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<parent>
6-
<artifactId>tb-jumpstart-m-junit5-m001</artifactId>
76
<groupId>org.rapidpm.vaadin</groupId>
7+
<artifactId>tb-jumpstart-m-junit5-m001</artifactId>
88
<version>1.0.0-SNAPSHOT</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>

‎modules/junit5/m001/srv/src/test/java/junit/org/rapidpm/vaadin/srv/CustomerServiceTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package junit.org.rapidpm.vaadin.srv;
22

3-
import org.junit.Assert;
3+
import org.junit.jupiter.api.Assertions;
44
import org.junit.jupiter.api.Test;
55
import org.rapidpm.vaadin.shared.Customer;
66
import org.rapidpm.vaadin.srv.CustomerService;
@@ -20,7 +20,7 @@ void test001() {
2020
final CustomerService instance = CustomerServiceImpl.getInstance();
2121
final List<Customer> all = instance.findAll();
2222

23-
Assert.assertEquals(30, all.size());
23+
Assertions.assertEquals(30, all.size());
2424
//how to test this ?
2525

2626
}

‎modules/junit5/m001/ui-components/pom.xml

+1-11
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,6 @@
1111

1212
<artifactId>tb-jumpstart-m-junit5-m001-ui-components</artifactId>
1313

14-
15-
<!--Mutation Testing scope-->
16-
<!--<properties>-->
17-
<!--<pitest-prod-classes>org.rapidpm.vaadin.ui.components.*</pitest-prod-classes>-->
18-
<!--<pitest-test-classes>junit.org.rapidpm.*</pitest-test-classes>-->
19-
<!--</properties>-->
20-
21-
2214
<dependencies>
2315
<dependency>
2416
<groupId>org.rapidpm.vaadin</groupId>
@@ -85,9 +77,7 @@
8577
<driver>
8678
<name>geckodriver</name>
8779
</driver>
88-
<driver>
89-
<name>phantomjs</name>
90-
</driver>
80+
9181
</drivers>
9282
</configuration>
9383
</plugin>

‎modules/junit5/m001/ui-components/src/test/java/junit/org/rapidpm/vaadin/ui/components/BaseVaadinTestClass.java

+8-5
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.junit.jupiter.api.AfterEach;
66
import org.junit.jupiter.api.BeforeEach;
77
import org.openqa.selenium.WebDriver;
8+
import org.openqa.selenium.chrome.ChromeDriver;
89
import org.openqa.selenium.remote.DesiredCapabilities;
910
import org.openqa.selenium.remote.RemoteWebDriver;
1011
import org.rapidpm.ddi.DI;
@@ -15,6 +16,7 @@
1516
import org.rapidpm.microservice.Main;
1617
import org.rapidpm.microservice.MainUndertow;
1718

19+
import java.io.File;
1820
import java.net.Inet4Address;
1921
import java.net.InetAddress;
2022
import java.net.NetworkInterface;
@@ -72,12 +74,13 @@ public void setUp()
7274
Main.deploy();
7375

7476

75-
final URL hubURL = new URL("http://" + ipSupplierLocalIP.get() + ":4444/wd/hub");
76-
final RemoteWebDriver remoteWebDriver = new RemoteWebDriver(hubURL, DesiredCapabilities.chrome());
77-
final WebDriver webDriver = TestBench.createDriver(remoteWebDriver);
77+
// final URL hubURL = new URL("http://" + ipSupplierLocalIP.get() + ":4444/wd/hub");
78+
// final RemoteWebDriver remoteWebDriver = new RemoteWebDriver(hubURL, DesiredCapabilities.chrome());
79+
// final WebDriver webDriver = TestBench.createDriver(remoteWebDriver);
7880

79-
setDriver(webDriver);
80-
// setDriver(new ChromeDriver());
81+
// setDriver(webDriver);
82+
System.setProperty("webdriver.chrome.driver", "./_data/webdrivers/chromedriver-mac-64bit");
83+
setDriver(new ChromeDriver());
8184
// setDriver(new FirefoxDriver());
8285
// setDriver(new SafariDriver());
8386
// setDriver(new OperaDriver());

‎modules/junit5/m001/ui/pom.xml

-3
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,6 @@
7575
<driver>
7676
<name>geckodriver</name>
7777
</driver>
78-
<driver>
79-
<name>phantomjs</name>
80-
</driver>
8178
</drivers>
8279
</configuration>
8380
</plugin>

‎modules/junit5/m001/ui/src/test/java/junit/org/rapidpm/vaadin/ui/app/BaseVaadinTestClass.java

+8-6
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.junit.jupiter.api.AfterEach;
66
import org.junit.jupiter.api.BeforeEach;
77
import org.openqa.selenium.WebDriver;
8+
import org.openqa.selenium.chrome.ChromeDriver;
89
import org.openqa.selenium.remote.DesiredCapabilities;
910
import org.openqa.selenium.remote.RemoteWebDriver;
1011
import org.rapidpm.ddi.DI;
@@ -72,12 +73,13 @@ public void setUp()
7273
Main.deploy();
7374

7475

75-
final URL url = new URL("http://" + ipSupplierLocalIP.get() + ":4444/wd/hub");
76-
final RemoteWebDriver remoteWebDriver = new RemoteWebDriver(url, DesiredCapabilities.chrome());
77-
final WebDriver webDriver = TestBench.createDriver(remoteWebDriver);
78-
79-
setDriver(webDriver);
80-
76+
// final URL url = new URL("http://" + ipSupplierLocalIP.get() + ":4444/wd/hub");
77+
// final RemoteWebDriver remoteWebDriver = new RemoteWebDriver(url, DesiredCapabilities.chrome());
78+
// final WebDriver webDriver = TestBench.createDriver(remoteWebDriver);
79+
//
80+
// setDriver(webDriver);
81+
System.setProperty("webdriver.chrome.driver", "./_data/webdrivers/chromedriver-mac-64bit");
82+
setDriver(new ChromeDriver());
8183
//data init -> depending on the Singleton
8284
((CustomerServiceImpl) CustomerServiceImpl.getInstance()).resetData();
8385
}

‎modules/junit5/m002/srv/src/test/java/junit/org/rapidpm/vaadin/srv/CustomerServiceTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package junit.org.rapidpm.vaadin.srv;
22

3-
import org.junit.Assert;
3+
import org.junit.jupiter.api.Assertions;
44
import org.junit.jupiter.api.Test;
55
import org.rapidpm.vaadin.shared.Customer;
66
import org.rapidpm.vaadin.srv.CustomerService;
@@ -20,7 +20,7 @@ void test001() {
2020
final CustomerService instance = CustomerServiceImpl.getInstance();
2121
final List<Customer> all = instance.findAll();
2222

23-
Assert.assertEquals(30, all.size());
23+
Assertions.assertEquals(30, all.size());
2424
//how to test this ?
2525

2626
}

‎modules/junit5/m002/ui-components/.testbenchextensions/config-drone.properties

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
unittesting.target=selenoid.rapidpm.org
2+
3+
compattesting.grid.selenoid.target=selenoid.rapidpm.org

‎modules/junit5/m002/ui-components/config/template_browser_combinations.json

-18
This file was deleted.

‎modules/junit5/m002/ui-components/config/template_selenium-grids.properties

-26
This file was deleted.

‎modules/junit5/m002/ui-components/config/template_testbench.properties

-6
This file was deleted.

‎modules/junit5/m002/ui-components/pom.xml

+25-3
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,36 @@
5757

5858

5959
<!--Testbench Add Ons-->
60-
60+
<dependency>
61+
<groupId>org.rapidpm</groupId>
62+
<artifactId>rapidpm-vaadin-addons-modules-junit5</artifactId>
63+
<scope>test</scope>
64+
</dependency>
65+
<dependency>
66+
<groupId>org.rapidpm</groupId>
67+
<artifactId>rapidpm-vaadin-addons-modules-framework</artifactId>
68+
<scope>test</scope>
69+
</dependency>
70+
<dependency>
71+
<groupId>org.rapidpm</groupId>
72+
<artifactId>rapidpm-vaadin-addons-modules-di-ddi</artifactId>
73+
<scope>test</scope>
74+
</dependency>
6175
<dependency>
6276
<groupId>org.rapidpm</groupId>
6377
<artifactId>rapidpm-vaadin-addons-modules-testbench</artifactId>
6478
<scope>test</scope>
6579
</dependency>
66-
67-
80+
<dependency>
81+
<groupId>org.rapidpm</groupId>
82+
<artifactId>rapidpm-vaadin-addons-modules-container-initializer</artifactId>
83+
<scope>test</scope>
84+
</dependency>
85+
<dependency>
86+
<groupId>org.rapidpm</groupId>
87+
<artifactId>rapidpm-vaadin-addons-modules-container-initializer-rapidpm</artifactId>
88+
<scope>test</scope>
89+
</dependency>
6890

6991
</dependencies>
7092

‎modules/junit5/m002/ui-components/src/test/java/junit/org/rapidpm/vaadin/ui/components/CustomerForm01Test.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import org.junit.Assert;
55
import org.junit.jupiter.api.Test;
66
import org.rapidpm.vaadin.addons.testbench.junit5.extensions.unittest.VaadinUnitTest;
7-
import org.rapidpm.vaadin.addons.testbench.junit5.pageobject.PageObject;
87

98
/**
109
*
@@ -16,7 +15,7 @@ public class CustomerForm01Test {
1615
public static final String LAST_NAME_TWO = "BBBB";
1716

1817
@Test
19-
public void test001(@PageObject CustomerFormPageObject pageObject) {
18+
public void test001(CustomerFormPageObject pageObject) {
2019
pageObject.loadPage();
2120

2221
pageObject.setLastName(LAST_NAME_ONE);
@@ -39,7 +38,7 @@ public void test001(@PageObject CustomerFormPageObject pageObject) {
3938
}
4039

4140
@Test
42-
public void test002(@PageObject CustomerFormPageObject pageObject) {
41+
public void test002(CustomerFormPageObject pageObject) {
4342
pageObject.loadPage();
4443
pageObject.saveEntry();
4544

‎modules/junit5/m002/ui-components/src/test/java/junit/org/rapidpm/vaadin/ui/components/CustomerForm02Test.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import org.junit.jupiter.api.Test;
77
import org.openqa.selenium.By;
88
import org.rapidpm.vaadin.addons.testbench.junit5.extensions.unittest.VaadinUnitTest;
9-
import org.rapidpm.vaadin.addons.testbench.junit5.pageobject.PageObject;
109

1110
/**
1211
*
@@ -15,7 +14,7 @@
1514
public class CustomerForm02Test {
1615

1716
@Test
18-
public void test001(@PageObject CustomerFormPageObject pageObject) {
17+
public void test001(CustomerFormPageObject pageObject) {
1918
pageObject.loadPage();
2019
final FormLayoutElement customerForm = pageObject.$(FormLayoutElement.class).id(TestUI.CUSTOMER_FORM);
2120
Assert.assertTrue(customerForm.isDisplayed());
@@ -28,7 +27,7 @@ public void test001(@PageObject CustomerFormPageObject pageObject) {
2827

2928

3029
@Test
31-
public void test002(@PageObject CustomerFormPageObject pageObject) {
30+
public void test002(CustomerFormPageObject pageObject) {
3231
pageObject.loadPage();
3332
final FormLayoutElement customerForm = pageObject.$(FormLayoutElement.class).id(TestUI.CUSTOMER_FORM);
3433
Assert.assertTrue(customerForm.isDisplayed());

0 commit comments

Comments
 (0)