diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-01-12 11:28:55 +0200 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-01-12 11:28:55 +0200 |
| commit | 2286f9871f7f77dea6139d0cd1dfc6754b1946d5 (patch) | |
| tree | c8a978d77dff74788b5a290f6c7928e39932b8a5 /client-compiler | |
| parent | 35d91245de3218283c8f4c733a3aa72ea395fb1c (diff) | |
| parent | 3f27e02f121c0a39b217532afcf9530bfd2caba7 (diff) | |
| download | vaadin-framework-2286f9871f7f77dea6139d0cd1dfc6754b1946d5.tar.gz vaadin-framework-2286f9871f7f77dea6139d0cd1dfc6754b1946d5.zip | |
Merge remote-tracking branch 'origin/master' into grid
Change-Id: Ic6b667ea6ceff43a609ce2037f656c6274871fb7
Diffstat (limited to 'client-compiler')
| -rw-r--r-- | client-compiler/tests/src/com/vaadin/tools/CvalCheckerTest.java | 23 |
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)); |