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.

Sign up for GitHub

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

Jump to bottom

Updated libraries #73

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated libraries #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 taf-base-junit4-extensions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
</dependency>
<dependency>
<groupId>com.baloise.testing.framework</groupId>
Expand All @@ -35,7 +35,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.26</version>
<version>2.0.7</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions taf-base-junit5-extensions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.7.2</version>
<version>5.9.3</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -34,7 +34,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.26</version>
<version>2.0.7</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
12 changes: 6 additions & 6 deletions taf-base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<name>Test Automation Framework - Base</name>
<properties>
<apache.poi.version>4.1.1</apache.poi.version>
<apache.poi.version>5.2.3</apache.poi.version>
</properties>

<build>
Expand All @@ -33,13 +33,13 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
<version>1.6</version>
<version>1.10.0</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
Expand All @@ -59,18 +59,18 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.26</version>
<version>2.0.7</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.26</version>
<version>1.7.33</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.14.0</version>
<version>2.15.2</version>
</dependency>
</dependencies>
</project>
12 changes: 6 additions & 6 deletions taf-base/src/main/java/com/baloise/testautomation/taf/base/excel/ExcelDataImporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ private IType get(Cell cell) {
if (cell == null) {
return TafString.nullString();
}
if (cell.getCellTypeEnum() == CellType.FORMULA) {
if (cell.getCellType() == CellType.FORMULA) {
FormulaEvaluator evaluator = workBook.getCreationHelper().createFormulaEvaluator();
try {
evaluator.evaluateInCell(cell);
Expand All @@ -85,23 +85,23 @@ private IType get(Cell cell) {
TafAssert.fail("Problems evaluation cell: " + cell.getCellFormula() + " -> " + e.getMessage());
}
}
if (cell.getCellTypeEnum() == CellType.BLANK) {
if (cell.getCellType() == CellType.BLANK) {
return TafString.emptyString();
}
if (cell.getCellTypeEnum() == CellType.BOOLEAN) {
if (cell.getCellType() == CellType.BOOLEAN) {
return new TafBoolean(cell.getBooleanCellValue());
}
if (cell.getCellTypeEnum() == CellType.NUMERIC) {
if (cell.getCellType() == CellType.NUMERIC) {
if (DateUtil.isCellDateFormatted(cell)) {
return TafDate.normalDate(cell.getDateCellValue());
}
double value = cell.getNumericCellValue();
if ((value == Math.floor(value)) && !Double.isInfinite(value)) {
return new TafInteger(new Double(value).intValue());
return new TafInteger(Double.valueOf(value).intValue());
}
return new TafDouble(cell.getNumericCellValue());
}
if (cell.getCellTypeEnum() == CellType.STRING) {
if (cell.getCellType() == CellType.STRING) {
String s = cell.getStringCellValue();
if (TafBoolean.TRUE.equalsIgnoreCase(s)) {
return TafBoolean.trueBoolean();
Expand Down
4 changes: 2 additions & 2 deletions taf-browser-junit4-extensions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
</dependency>
<dependency>
<groupId>com.baloise.testing.framework</groupId>
Expand All @@ -35,7 +35,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.26</version>
<version>2.0.7</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
12 changes: 6 additions & 6 deletions taf-browser/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
<version>4.8.3</version>
<version>4.10.0</version>
</dependency>
<!-- <dependency> <groupId>org.seleniumhq.selenium</groupId> <artifactId>selenium-java</artifactId>
<version>3.141.59</version> </dependency> -->
Expand All @@ -64,30 +64,30 @@
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>3.1.6</version>
<version>4.2.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
<version>2.67.0</version>
<version>2.70.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>htmlunit-driver</artifactId>
<version>4.7.2</version>
<version>4.10.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.17.1</version>
<version>2.20.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
11 changes: 7 additions & 4 deletions taf-swing-base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,20 @@
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.4.187</version>
<!-- <version>2.1.214</version>
--> </dependency>
<!--
Do not update to newer version due to that H2 dabase doens't work correctly with java swing at the moment
<version>2.1.214</version>
-->
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.21</version>
<version>2.0.7</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.21</version>
<version>2.0.7</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion taf-swing-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions taf-swing-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.5</version>
<version>3.12.0</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
Expand All @@ -52,7 +52,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down