summaryrefslogtreecommitdiffstats
path: root/client-compiler
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2014-12-29 14:11:12 +0200
committerArtur Signell <artur@vaadin.com>2014-12-29 14:12:27 +0200
commit32a5d8f3827fbf0ba2c0c3102f0d818d7b7a3873 (patch)
treea060131679bfeb133934c800b00a01f893feb1bd /client-compiler
parentb89213ee880dd1197bc7696f6f5a1919c0ff02c1 (diff)
downloadvaadin-framework-32a5d8f3827fbf0ba2c0c3102f0d818d7b7a3873.tar.gz
vaadin-framework-32a5d8f3827fbf0ba2c0c3102f0d818d7b7a3873.zip
Reformat project using Eclipse Luna SR1
Change-Id: I58748499c87d470e70304d882d3227cda5803481
Diffstat (limited to 'client-compiler')
-rw-r--r--client-compiler/tests/src/com/vaadin/tools/CvalCheckerTest.java23
1 files changed, 12 insertions, 11 deletions
diff --git a/client-compiler/tests/src/com/vaadin/tools/CvalCheckerTest.java b/client-compiler/tests/src/com/vaadin/tools/CvalCheckerTest.java
index 64a38fae2e..fb4799ae12 100644
--- a/client-compiler/tests/src/com/vaadin/tools/CvalCheckerTest.java
+++ b/client-compiler/tests/src/com/vaadin/tools/CvalCheckerTest.java
@@ -69,8 +69,8 @@ public class CvalCheckerTest {
+ "'expiredEpoch':1893511225000," + "'product':{'name':'"
+ productNameCval + "', 'version': 2}}";
- static final String responseJsonWithNullVersion = "{'licenseKey':'" + VALID_KEY + "',"
- + "'licensee':'Test User','type':'normal',"
+ static final String responseJsonWithNullVersion = "{'licenseKey':'"
+ + VALID_KEY + "'," + "'licensee':'Test User','type':'normal',"
+ "'expiredEpoch':1893511225000," + "'product':{'name':'"
+ productNameCval + "', 'version': null}}";
@@ -462,10 +462,10 @@ public class CvalCheckerTest {
out.println("5 = this-is-another-license");
out.close();
- assertEquals("this-is-a-license", licenseChecker.readKeyFromFile(tmpLicenseFile.toURI()
- .toURL(), 3));
- assertEquals("this-is-a-license", licenseChecker.readKeyFromFile(tmpLicenseFile.toURI()
- .toURL(), 4));
+ assertEquals("this-is-a-license", licenseChecker.readKeyFromFile(
+ tmpLicenseFile.toURI().toURL(), 3));
+ assertEquals("this-is-a-license", licenseChecker.readKeyFromFile(
+ tmpLicenseFile.toURI().toURL(), 4));
assertEquals("this-is-another-license", licenseChecker.readKeyFromFile(
tmpLicenseFile.toURI().toURL(), 5));
@@ -473,17 +473,18 @@ public class CvalCheckerTest {
}
@Test
- public void testReadKeyFromFile_FallbackToDefaultKeyReversed() throws Exception {
+ public void testReadKeyFromFile_FallbackToDefaultKeyReversed()
+ throws Exception {
File tmpLicenseFile = File.createTempFile("license", "lic");
PrintWriter out = new PrintWriter(tmpLicenseFile);
out.println("5 = this-is-another-license");
out.println("this-is-a-license");
out.close();
- assertEquals("this-is-a-license", licenseChecker.readKeyFromFile(tmpLicenseFile.toURI()
- .toURL(), 3));
- assertEquals("this-is-a-license", licenseChecker.readKeyFromFile(tmpLicenseFile.toURI()
- .toURL(), 4));
+ assertEquals("this-is-a-license", licenseChecker.readKeyFromFile(
+ tmpLicenseFile.toURI().toURL(), 3));
+ assertEquals("this-is-a-license", licenseChecker.readKeyFromFile(
+ tmpLicenseFile.toURI().toURL(), 4));
assertEquals("this-is-another-license", licenseChecker.readKeyFromFile(
tmpLicenseFile.toURI().toURL(), 5));