Fixed unit tests mostly around drag and drop issues

Author: shai-almog

maven/core-unittests/src/test/java/com/codename1/junit/UITestBase.java

@@ -5,6 +5,7 @@
 import com.codename1.testing.SafeL10NManager;
 import com.codename1.testing.TestCodenameOneImplementation;
 import com.codename1.testing.TestUtils;
+import com.codename1.ui.Component;
 import com.codename1.ui.Display;
 import com.codename1.ui.DisplayTest;
 import com.codename1.ui.plaf.UIManager;
@@ -126,4 +127,9 @@ private void resetUIManager() throws Exception {
     protected void flushSerialCalls() {
         DisplayTest.flushEdt();
     }
+
+    protected void tapComponent(Component c) {
+        implementation.tapComponent(c);
+        flushSerialCalls();
+    }
 }

maven/core-unittests/src/test/java/com/codename1/samples/AddComponentToRightBarSampleTest.java

@@ -39,7 +39,7 @@ void rightBarCommandCanBeTriggeredThroughToolbarComponent() {
             assertNotNull(commandComponent);
             ensureSized(commandComponent, form);
 
-            implementation.tapComponent(commandComponent);
+            tapComponent(commandComponent);
             flushSerialCalls();
             DisplayTest.flushEdt();
             flushSerialCalls();
@@ -86,7 +86,7 @@ void commandComponentCanBeReplacedWithCustomButton() {
             assertFalse(rightBarContainer.contains(commandComponent));
 
             ensureSized(replacement, form);
-            implementation.tapComponent(replacement);
+            tapComponent(replacement);
             flushSerialCalls();
             DisplayTest.flushEdt();
             flushSerialCalls();

maven/core-unittests/src/test/java/com/codename1/samples/AutocompleteSample2788PortTest.java

@@ -66,23 +66,4 @@ private Container findVisibleAutocompletePopup(Form form) {
         }
         return null;
     }
-
-    private void tapComponent(Component component) {
-        ensureSized(component);
-        int x = component.getAbsoluteX() + component.getWidth() / 2;
-        int y = component.getAbsoluteY() + component.getHeight() / 2;
-        implementation.dispatchPointerPressAndRelease(x, y);
-        flushSerialCalls();
-    }
-
-    private void ensureSized(Component component) {
-        Form parentForm = component.getComponentForm();
-        for (int i = 0; i < 5 && (component.getWidth() <= 0 || component.getHeight() <= 0); i++) {
-            if (parentForm != null) {
-                parentForm.revalidate();
-            }
-            DisplayTest.flushEdt();
-            flushSerialCalls();
-        }
-    }
 }

maven/core-unittests/src/test/java/com/codename1/samples/BlockLeadIssue3246Test.java

@@ -42,7 +42,7 @@ void blockedComponentReceivesEventsInsteadOfLeadComponent() {
         flushSerialCalls();
         ensureSized(blocked, form);
 
-        implementation.tapComponent(blocked);
+        tapComponent(blocked);
         flushSerialCalls();
         DisplayTest.flushEdt();
         flushSerialCalls();
@@ -60,8 +60,7 @@ void blockedComponentReceivesEventsInsteadOfLeadComponent() {
         flushSerialCalls();
         DisplayTest.flushEdt();
 
-        implementation.tapComponent(blocked);
-        flushSerialCalls();
+        tapComponent(blocked);
         DisplayTest.flushEdt();
         flushSerialCalls();
 

maven/core-unittests/src/test/java/com/codename1/samples/CircleProgressSampleTest.java

@@ -40,10 +40,9 @@ void circleProgressIndicatorIsReplacedWhenDataIsReady() {
         flushSerialCalls();
 
         ensureSized(showDetails, launcher);
-        implementation.tapComponent(showDetails);
+        tapComponent(showDetails);
         flushSerialCalls();
         DisplayTest.flushEdt();
-        flushSerialCalls();
 
         assertNotNull(detailsHolder[0]);
         assertSame(detailsHolder[0], Display.getInstance().getCurrent());

maven/core-unittests/src/test/java/com/codename1/samples/DateFormatTest2772PortTest.java

@@ -32,7 +32,7 @@ void tappingShowDateFormatsUsingLocalizationManager() {
         form.show();
         ensureSized(showDate, form);
 
-        implementation.tapComponent(showDate);
+        tapComponent(showDate);
         flushSerialCalls();
         DisplayTest.flushEdt();
         flushSerialCalls();

maven/core-unittests/src/test/java/com/codename1/samples/DialogPositioningSampleTest.java

@@ -50,7 +50,7 @@ void dialogPositionsItselfBelowTitleAreaAndStretchesOnPhone() {
             flushSerialCalls();
 
             ensureSized(trigger, form);
-            implementation.tapComponent(trigger);
+            tapComponent(trigger);
             flushSerialCalls();
             DisplayTest.flushEdt();
             flushSerialCalls();

maven/core-unittests/src/test/java/com/codename1/samples/ListFilesSampleTest.java

@@ -14,10 +14,9 @@ public class ListFilesSampleTest extends UITestBase {
 
     @FormTest
     public void testListFilesSample() {
-        TestCodenameOneImplementation impl = TestCodenameOneImplementation.getInstance();
-        impl.clearFileSystem();
-        String appHome = impl.getAppHomePath();
-        impl.mkdir(appHome);
+        implementation.clearFileSystem();
+        String appHome = implementation.getAppHomePath();
+        implementation.mkdir(appHome);
 
         Form hi = new Form("Hi World", new BorderLayout());
 
@@ -51,18 +50,18 @@ public void testListFilesSample() {
         hi.show();
         waitForFormTitle("Hi World");
 
-        impl.tapComponent(add);
-        assertTrue(impl.exists(appHome + "NewDir"), "Directory NewDir should exist");
-        assertTrue(impl.isDirectory(appHome + "NewDir"), "NewDir should be a directory");
+        tapComponent(add);
+        assertTrue(implementation.exists(appHome + "NewDir"), "Directory NewDir should exist");
+        assertTrue(implementation.isDirectory(appHome + "NewDir"), "NewDir should be a directory");
 
-        impl.tapComponent(refresh);
+        tapComponent(refresh);
         assertTrue(listing.getText().contains("NewDir"), "Listing should contain NewDir");
 
-        impl.tapComponent(rename);
-        assertFalse(impl.exists(appHome + "NewDir"), "Old directory should not exist");
-        assertTrue(impl.exists(appHome + "RenamedDir"), "Renamed directory should exist");
+        tapComponent(rename);
+        assertFalse(implementation.exists(appHome + "NewDir"), "Old directory should not exist");
+        assertTrue(implementation.exists(appHome + "RenamedDir"), "Renamed directory should exist");
 
-        impl.tapComponent(refresh);
+        tapComponent(refresh);
         assertTrue(listing.getText().contains("RenamedDir"), "Listing should contain RenamedDir");
         assertFalse(listing.getText().contains("NewDir"), "Listing should not contain NewDir");
     }

maven/core-unittests/src/test/java/com/codename1/samples/LocationSampleTest.java

@@ -13,9 +13,8 @@ public class LocationSampleTest extends UITestBase {
 
     @FormTest
     public void testLocationSample() {
-        TestCodenameOneImplementation impl = TestCodenameOneImplementation.getInstance();
         MockLocationManager mockLoc = new MockLocationManager();
-        impl.setLocationManager(mockLoc);
+        implementation.setLocationManager(mockLoc);
 
         Form hi = new Form("Hi World", BoxLayout.y());
         Button checkIfDetectionAvailable = new Button("Check if GPS Detection Available");
@@ -40,13 +39,13 @@ public void testLocationSample() {
         hi.show();
         waitForFormTitle("Hi World");
 
-        impl.tapComponent(checkIfDetectionAvailable);
+        tapComponent(checkIfDetectionAvailable);
         assertEquals("GPS Detection IS supported", checkIfDetectionAvailable.getClientProperty("lastMessage"));
 
-        impl.tapComponent(isGPSEnabled);
+        tapComponent(isGPSEnabled);
         assertEquals("GPS IS enabled", isGPSEnabled.getClientProperty("lastMessage"));
 
-        impl.tapComponent(getLocation);
+        tapComponent(getLocation);
         String locMsg = (String) getLocation.getClientProperty("lastMessage");
         assertTrue(locMsg != null && locMsg.contains("Location is"), "Should find location");
     }

maven/core-unittests/src/test/java/com/codename1/samples/LongPointerPressSampleTest.java

@@ -40,9 +40,11 @@ public void pointerPressed(int x, int y) {
         int y = centerCnt.getAbsoluteY() + 10;
 
         impl.dispatchPointerPress(x, y);
+        flushSerialCalls();
         assertTrue(pointerPressedTriggered, "pointerPressed should be triggered");
 
         centerCnt.longPointerPress(x, y);
+        flushSerialCalls();
         assertTrue(longPressTriggered, "longPointerPress should be triggered");
 
         impl.dispatchPointerRelease(x, y);