squash: Checkstyle checks for whitespace after.

nordeck · Jul 16, 2021 · 3a093ce · 3a093ce
1 parent 66f8290
commit 3a093ce
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 20 deletions.
diff --git a/checkstyle.xml b/checkstyle.xml
@@ -26,6 +26,10 @@
             <property name="option" value="alone_or_singleline"/>
         </module>
 
+        <module name="WhitespaceAfter">
+            <!-- Drops TYPECAST from default tokens -->
+            <property name="tokens" value="COMMA , SEMI , LITERAL_IF , LITERAL_ELSE , LITERAL_WHILE , LITERAL_DO , LITERAL_FOR , DO_WHILE"/>
+        </module>
     </module>
 
     <module name="FileTabCharacter">

diff --git a/src/test/java/org/jitsi/meet/test/ConnectionTimeTest.java b/src/test/java/org/jitsi/meet/test/ConnectionTimeTest.java
@@ -355,21 +355,21 @@ public Double[][] collectData()
         Double[][] data
             = new Double[TimeMeasurements.length][NUMBER_OF_CONFERENCES];
 
-        for(int i = 0; i < NUMBER_OF_CONFERENCES; i++)
+        for (int i = 0; i < NUMBER_OF_CONFERENCES; i++)
         {
             refreshParticipant2();
 
             waitForMeasurements();
 
-            for(TimeMeasurements s : TimeMeasurements.values())
+            for (TimeMeasurements s : TimeMeasurements.values())
             {
                 data[s.ordinal()][i]
                     = s.execute(getParticipant2().getDriver());
                 print(s + ": " + data[s.ordinal()][i] );
             }
         }
 
-        for(TimeMeasurements s : TimeMeasurements.values())
+        for (TimeMeasurements s : TimeMeasurements.values())
         {
             print(s + ": " + Arrays.toString(data[s.ordinal()]) );
         }
@@ -452,7 +452,7 @@ private static Double getMedian(Double[] data) {
     private static Double[] subtractArrays(Double[] a, Double[] b)
     {
         Double[] res = b.clone();
-        for(int i = 0; i < res.length; i++)
+        for (int i = 0; i < res.length; i++)
         {
             if (res[i] == null && a[i] == null)
             {

diff --git a/src/test/java/org/jitsi/meet/test/JVBConferencesCheck.java b/src/test/java/org/jitsi/meet/test/JVBConferencesCheck.java
@@ -119,7 +119,7 @@ public void testJvbConferences()
             if (jsonElem.isJsonArray())
             {
                 JsonArray jsonArray = jsonElem.getAsJsonArray();
-                for(int i = 0; i < jsonArray.size(); i++)
+                for (int i = 0; i < jsonArray.size(); i++)
                 {
                     conferencesList.add(
                         ((JsonObject)jsonArray.get(i)).get("id").getAsString());

diff --git a/src/test/java/org/jitsi/meet/test/LipSyncTest.java b/src/test/java/org/jitsi/meet/test/LipSyncTest.java
@@ -417,7 +417,7 @@ void process()
         private <T> int findSignalIdx(T[] series,
                                       Comparator<T> condition, int startIdx)
         {
-            for (int i = startIdx + 1; i + 1 < series.length;i++)
+            for (int i = startIdx + 1; i + 1 < series.length; i++)
             {
                 if (condition.compare(series[i-1], series[i]) > 0)
                 {

diff --git a/src/test/java/org/jitsi/meet/test/MaxUsersTest.java b/src/test/java/org/jitsi/meet/test/MaxUsersTest.java
@@ -84,7 +84,7 @@ public void enterWithMaxParticipantsAndCheckDialog()
             Participant[] participants = new Participant[MAX_USERS - 2];
             try
             {
-                for(int i = 0; i < participants.length; i++)
+                for (int i = 0; i < participants.length; i++)
                 {
                     participants[i] =
                         this.participants

diff --git a/src/test/java/org/jitsi/meet/test/base/FailureListener.java b/src/test/java/org/jitsi/meet/test/base/FailureListener.java
@@ -136,8 +136,7 @@ public void onFinish(ITestContext iTestContext)
     {
         // move all failed configurations to the failed tests set
         // in order to easily spot them in the html report
-        for(ITestResult r
-            : iTestContext.getFailedConfigurations().getAllResults())
+        for (ITestResult r : iTestContext.getFailedConfigurations().getAllResults())
         {
             iTestContext.getFailedTests().addResult(r, r.getMethod());
         }

diff --git a/src/test/java/org/jitsi/meet/test/base/Participant.java b/src/test/java/org/jitsi/meet/test/base/Participant.java
@@ -500,8 +500,7 @@ public void saveHtmlSource(File outputDir, String fileName)
                 = FileUtils.openOutputStream(
                         new File(outputDir, fileName)))
         {
-            fOut.write(
-                    driver.getPageSource().replace(">",">\n").getBytes());
+            fOut.write(driver.getPageSource().replace(">", ">\n").getBytes());
         }
         catch(Exception e)
         {

diff --git a/src/test/java/org/jitsi/meet/test/pageobjects/mobile/base/AbstractMobilePage.java b/src/test/java/org/jitsi/meet/test/pageobjects/mobile/base/AbstractMobilePage.java
@@ -64,7 +64,7 @@ private void initFields()
      */
     private void initTestHintFields()
     {
-        for(Class classIn = getClass();
+        for (Class classIn = getClass();
             classIn != Object.class;
             classIn = classIn.getSuperclass())
         {
@@ -74,7 +74,7 @@ private void initTestHintFields()
 
     private void initTestHintFields(Class classIn)
     {
-        for(Field field : classIn.getDeclaredFields())
+        for (Field field : classIn.getDeclaredFields())
         {
             TestHintLocator[] locators
                 = field.getAnnotationsByType(TestHintLocator.class);

diff --git a/src/test/java/org/jitsi/meet/test/pageobjects/web/KnockingParticipantList.java b/src/test/java/org/jitsi/meet/test/pageobjects/web/KnockingParticipantList.java
@@ -184,7 +184,7 @@ private void clickButton(String buttonId)
             // machine, so we will retry several times before giving up
             // the element should disappear once it was successfully clicked
             int retries = 5;
-            while(participantElement != null && retries > 0)
+            while (participantElement != null && retries > 0)
             {
                 new Actions(participant.getDriver())
                     .click(participantElement.findElement(ByTestId.testId(buttonId)))

diff --git a/src/test/java/org/jitsi/meet/test/pageobjects/web/LobbyScreen.java b/src/test/java/org/jitsi/meet/test/pageobjects/web/LobbyScreen.java
@@ -89,7 +89,7 @@ public void enterDisplayName(String displayName)
         WebElement displayNameInput = getDisplayNameInput();
 
         // element.clear does not always work, make sure we delete the content
-        while(!displayNameInput.getAttribute("value").equals(""))
+        while (!displayNameInput.getAttribute("value").equals(""))
         {
             displayNameInput.sendKeys(Keys.BACK_SPACE);
         }

diff --git a/src/test/java/org/jitsi/meet/test/util/MeetUIUtils.java b/src/test/java/org/jitsi/meet/test/util/MeetUIUtils.java
@@ -202,12 +202,13 @@ public static void assertLargeVideoNotGrey(WebDriver driver)
             driver,
             5,
             (ExpectedCondition<Boolean>)
-                webDriver -> {
+                webDriver ->
+                {
                     WebElement el
                         = webDriver.findElement(By.xpath(largeVideoXPath));
 
-                    return !el.getAttribute("class")
-                        .contains("remoteVideoProblemFilter");});
+                    return !el.getAttribute("class").contains("remoteVideoProblemFilter");
+                });
 
         // Check if the message is displayed
         TestUtils.waitForDisplayedOrNotByXPath(

diff --git a/src/test/java/org/jitsi/meet/test/util/MeetUtils.java b/src/test/java/org/jitsi/meet/test/util/MeetUtils.java
@@ -283,7 +283,7 @@ public static long getDownloadBitrate(WebDriver driver)
         Map stats = (Map)((JavascriptExecutor) driver)
             .executeScript("return APP.conference.getStats();");
 
-        Map<String,Long> bitrate = (Map<String,Long>)stats.get("bitrate");
+        Map<String, Long> bitrate = (Map<String, Long>)stats.get("bitrate");
 
         if (bitrate != null)
         {

diff --git a/src/test/java/org/jitsi/meet/test/web/WebParticipantFactory.java b/src/test/java/org/jitsi/meet/test/web/WebParticipantFactory.java
@@ -134,7 +134,7 @@ private WebDriver startWebDriver(
             FirefoxProfile profile = new FirefoxProfile();
             // Force firefox to use English instead of system language.
             // Not test because of having not firefox installed.
-            profile.setPreference("intl.accept_languages","en");
+            profile.setPreference("intl.accept_languages", "en");
             profile.setPreference("media.navigator.permission.disabled", true);
             // Enables tcp in firefox, disabled by default in 44
             profile.setPreference("media.peerconnection.ice.tcp", true);