summaryrefslogtreecommitdiffstats
path: root/server/tests/src/com
diff options
context:
space:
mode:
authorMaciej PrzepioĢra <matthew@vaadin.com>2015-05-25 10:08:59 +0200
committerVaadin Code Review <review@vaadin.com>2015-05-25 21:53:28 +0000
commite2678791bb028746f1b78aa232bef4240ebffa92 (patch)
tree6d5d496d8a8e49d15b2ff70cafe0d5b22aff22ac /server/tests/src/com
parenta562635f09cbb9d7a7d550a7429de754609bc384 (diff)
downloadvaadin-framework-e2678791bb028746f1b78aa232bef4240ebffa92.tar.gz
vaadin-framework-e2678791bb028746f1b78aa232bef4240ebffa92.zip
Fix font icon codepoint formatting in DesignResourceConverter (#17970)
ResourceReference.getURL() is now used to ensure consistency. Change-Id: Ic204a826c093fc34af2be1e0e4e8a8dd4f820e09
Diffstat (limited to 'server/tests/src/com')
-rw-r--r--server/tests/src/com/vaadin/tests/design/DesignFormatterTest.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/server/tests/src/com/vaadin/tests/design/DesignFormatterTest.java b/server/tests/src/com/vaadin/tests/design/DesignFormatterTest.java
index dcabd6c637..00af20ea8c 100644
--- a/server/tests/src/com/vaadin/tests/design/DesignFormatterTest.java
+++ b/server/tests/src/com/vaadin/tests/design/DesignFormatterTest.java
@@ -275,8 +275,8 @@ public class DesignFormatterTest {
String httpUrl = "http://example.com/icon.png";
String httpsUrl = "https://example.com/icon.png";
String themePath = "icons/icon.png";
- String fontAwesomeUrl = "fonticon://FontAwesome/0xf0f9";
- String someOtherFontUrl = "fonticon://SomeOther/0xF0F9";
+ String fontAwesomeUrl = "fonticon://FontAwesome/f0f9";
+ String someOtherFontUrl = "fonticon://SomeOther/F0F9";
String fileSystemPath = "c:\\app\\resources\\icon.png";
assertEquals(httpUrl, formatter.format(new ExternalResource(httpUrl)));
@@ -315,8 +315,8 @@ public class DesignFormatterTest {
String httpUrl = "http://example.com/icon.png";
String httpsUrl = "https://example.com/icon.png";
String themePath = "icons/icon.png";
- String fontAwesomeUrl = "fonticon://FontAwesome/0xf0f9";
- String someOtherFont = "fonticon://SomeOther/0xF0F9";
+ String fontAwesomeUrl = "fonticon://FontAwesome/f0f9";
+ String someOtherFont = "fonticon://SomeOther/F0F9";
String fontAwesomeUrlOld = "font://AMBULANCE";
String fileSystemPath = "c:\\app\\resources\\icon.png";