diff options
| author | Ahmed Ashour <asashour@yahoo.com> | 2017-10-20 10:10:02 +0200 |
|---|---|---|
| committer | Péter Török <31210544+torok-peter@users.noreply.github.com> | 2017-10-20 11:10:02 +0300 |
| commit | a9c83ba07e4dec90eb7d6e332b91adde9613ebb4 (patch) | |
| tree | 7907a6c389ae740572197d949e27c6fd3c25491c /test | |
| parent | 0a26d0e44169f9643e7d30ba370b8ecbbe128a56 (diff) | |
| download | vaadin-framework-a9c83ba07e4dec90eb7d6e332b91adde9613ebb4.tar.gz vaadin-framework-a9c83ba07e4dec90eb7d6e332b91adde9613ebb4.zip | |
Use .toLowerCase and .toUpperCase(Locale.ROOT) (#10182)
* Use .toLowerCase and .toUpperCase(Locale.ROOT)
* Spaces
* add spaces after if(
Diffstat (limited to 'test')
2 files changed, 4 insertions, 3 deletions
diff --git a/test/dependency-rewrite-addon/src/main/java/com/vaadin/test/dependencyrewriteaddon/RewriteJQueryFilter.java b/test/dependency-rewrite-addon/src/main/java/com/vaadin/test/dependencyrewriteaddon/RewriteJQueryFilter.java index 3a317da46c..633a3ae8c9 100644 --- a/test/dependency-rewrite-addon/src/main/java/com/vaadin/test/dependencyrewriteaddon/RewriteJQueryFilter.java +++ b/test/dependency-rewrite-addon/src/main/java/com/vaadin/test/dependencyrewriteaddon/RewriteJQueryFilter.java @@ -19,7 +19,7 @@ public class RewriteJQueryFilter List<Dependency> filtered = new ArrayList<>(); for (Dependency dependency : dependencies) { if (dependency.getType() == Type.JAVASCRIPT && dependency.getUrl() - .toLowerCase(Locale.ENGLISH).contains("jquery")) { + .toLowerCase(Locale.ROOT).contains("jquery")) { filtered.add( new Dependency(Type.JAVASCRIPT, "vaadin://jquery.js")); } else { diff --git a/test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/AbstractIntegrationTest.java b/test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/AbstractIntegrationTest.java index c05cb6fdc6..68a030ec85 100644 --- a/test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/AbstractIntegrationTest.java +++ b/test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/AbstractIntegrationTest.java @@ -3,6 +3,7 @@ package com.vaadin.tests.integration; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; +import java.util.Locale; import java.util.logging.Logger; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -81,10 +82,10 @@ public abstract class AbstractIntegrationTest extends ParallelTest { protected void compareScreen(String identifier) throws IOException { String refFileName = identifier + "-" - + getDesiredCapabilities().getBrowserName().toLowerCase() + + getDesiredCapabilities().getBrowserName().toLowerCase(Locale.ROOT) + ".png"; String errorFileName = identifier + "-" - + getDesiredCapabilities().getBrowserName().toLowerCase() + "-" + + getDesiredCapabilities().getBrowserName().toLowerCase(Locale.ROOT) + "-" + System.getProperty("server-name") + "[" + getClass().getSimpleName() + "].png"; File referenceFile = ImageFileUtil |