diff options
| author | Tharre <tharre3@gmail.com> | 2018-05-04 15:14:56 +0200 |
|---|---|---|
| committer | Tharre <tharre3@gmail.com> | 2018-05-04 15:14:56 +0200 |
| commit | 7e113639279dff8d39e45cae44d4c2dcbc7614b6 (patch) | |
| tree | f5d5c1779e73a577e1dbe30658aec6cf38e1e6b6 /pom.xml | |
| parent | 7077b817bff797c769191046f0019508ddb20eba (diff) | |
| parent | 2a57412e33ecb3d87a0181b0c6b3b57f6ef10c83 (diff) | |
| download | sepm-groupproject-7e113639279dff8d39e45cae44d4c2dcbc7614b6.tar.gz sepm-groupproject-7e113639279dff8d39e45cae44d4c2dcbc7614b6.tar.xz sepm-groupproject-7e113639279dff8d39e45cae44d4c2dcbc7614b6.zip | |
Merge branch 'review_create_new_employee' into develop
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 17 |
1 files changed, 15 insertions, 2 deletions
@@ -25,6 +25,7 @@ <junit.version>4.12</junit.version> <mockito.version>2.18.0</mockito.version> <google-java-format.version>1.5</google-java-format.version> + <testfx.version>4.0.13-alpha</testfx.version> <!-- plugins --> <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version> <maven-shade-plugin.version>3.1.1</maven-shade-plugin.version> @@ -102,6 +103,18 @@ <artifactId>google-java-format</artifactId> <version>${google-java-format.version}</version> </dependency> + <dependency> + <groupId>org.testfx</groupId> + <artifactId>testfx-core</artifactId> + <version>${testfx.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.testfx</groupId> + <artifactId>testfx-junit</artifactId> + <version>${testfx.version}</version> + <scope>test</scope> + </dependency> </dependencies> <build> @@ -112,8 +125,8 @@ <version>${maven-surefire-plugin.version}</version> <configuration> <!-- enable parallel test runs --> - <parallel>methods</parallel> - <threadCount>10</threadCount> + <!--parallel>methods</parallel--> + <!--threadCount>10</threadCount--> <!-- discover all *.java files --> <includes> <include>*.java</include> |