diff options
| author | Anna Koskinen <Ansku@users.noreply.github.com> | 2021-07-08 12:04:58 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-08 12:04:58 +0300 |
| commit | 3afe45849edc79f0e7b371a7fd3ef209292dce79 (patch) | |
| tree | 2934d3ca30286b3480d7c6b4c5d5bfc99aa196db /server/src/test/java/com | |
| parent | 347d36dcbccb07f1dd46f17ea5be6fceecc755cb (diff) | |
| download | vaadin-framework-3afe45849edc79f0e7b371a7fd3ef209292dce79.tar.gz vaadin-framework-3afe45849edc79f0e7b371a7fd3ef209292dce79.zip | |
Code cleanup (#12333)
- removed unused private methods
- removed unused private variables
- removed unnecessary initializations
- removed unnecessary substring(0)
- removed inner assignments
- renamed private methods that started with upper case
- renamed static final variables to use upper case
- converted to use non-deprecated options
- suppressed unavoidable warnings
- divided long Strings to multiple lines
- added missing types
- added missing JavaDoc parameters
- formatting
- updated comments & JavaDocs
Diffstat (limited to 'server/src/test/java/com')
| -rw-r--r-- | server/src/test/java/com/vaadin/server/VaadinServletTest.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/server/src/test/java/com/vaadin/server/VaadinServletTest.java b/server/src/test/java/com/vaadin/server/VaadinServletTest.java index 006872b212..2c318e0897 100644 --- a/server/src/test/java/com/vaadin/server/VaadinServletTest.java +++ b/server/src/test/java/com/vaadin/server/VaadinServletTest.java @@ -233,7 +233,7 @@ public class VaadinServletTest { public void isAllowedVAADINResource_jarWarFileScheme_detectsAsStaticResources() throws IOException, URISyntaxException, ServletException { assertTrue("Can not run concurrently with other test", - VaadinServlet.openFileSystems.isEmpty()); + VaadinServlet.OPEN_FILE_SYSTEMS.isEmpty()); VaadinServlet servlet = new VaadinServlet(); servlet.init(new MockServletConfig()); @@ -276,7 +276,7 @@ public class VaadinServletTest { public void isAllowedVAADINResource_jarInAJar_detectsAsStaticResources() throws IOException, URISyntaxException, ServletException { assertTrue("Can not run concurrently with other test", - VaadinServlet.openFileSystems.isEmpty()); + VaadinServlet.OPEN_FILE_SYSTEMS.isEmpty()); VaadinServlet servlet = new VaadinServlet(); servlet.init(new MockServletConfig()); @@ -325,7 +325,7 @@ public class VaadinServletTest { public void openingJarFileSystemForDifferentFilesInSameJar_existingFileSystemIsUsed() throws IOException, URISyntaxException, ServletException { assertTrue("Can not run concurrently with other test", - VaadinServlet.openFileSystems.isEmpty()); + VaadinServlet.OPEN_FILE_SYSTEMS.isEmpty()); VaadinServlet servlet = new VaadinServlet(); servlet.init(new MockServletConfig()); @@ -348,15 +348,15 @@ public class VaadinServletTest { servlet.getFileSystem(fileResourceURL.toURI()); assertEquals("Same file should be marked for both resources", - (Integer) 2, VaadinServlet.openFileSystems.entrySet() + (Integer) 2, VaadinServlet.OPEN_FILE_SYSTEMS.entrySet() .iterator().next().getValue()); servlet.closeFileSystem(folderResourceURL.toURI()); assertEquals("Closing resource should be removed from jar uri", - (Integer) 1, VaadinServlet.openFileSystems.entrySet() + (Integer) 1, VaadinServlet.OPEN_FILE_SYSTEMS.entrySet() .iterator().next().getValue()); servlet.closeFileSystem(fileResourceURL.toURI()); assertTrue("Closing last resource should clear marking", - VaadinServlet.openFileSystems.isEmpty()); + VaadinServlet.OPEN_FILE_SYSTEMS.isEmpty()); try { FileSystems.getFileSystem(folderResourceURL.toURI()); @@ -375,7 +375,7 @@ public class VaadinServletTest { throws IOException, InterruptedException, ExecutionException, URISyntaxException, ServletException { assertTrue("Can not run concurrently with other test", - VaadinServlet.openFileSystems.isEmpty()); + VaadinServlet.OPEN_FILE_SYSTEMS.isEmpty()); VaadinServlet servlet = new VaadinServlet(); servlet.init(new MockServletConfig()); @@ -547,7 +547,7 @@ public class VaadinServletTest { private void ensureFileSystemsCleared(URL fileResourceURL) throws URISyntaxException { assertFalse("URI should have been cleared", - VaadinServlet.openFileSystems + VaadinServlet.OPEN_FILE_SYSTEMS .containsKey(fileResourceURL.toURI())); try { FileSystems.getFileSystem(fileResourceURL.toURI()); |