Browse Source

Disable automatic removal of trailing whitespace and reformatted using Luna

Automatic removal of trailing whitespaces in Eclipse does not work even
in a nearly consistent way across platforms, versions or even on the same
maching within the same workspaces. Saving the same file multiple times
even alternates between adding and removing a whitespace on empty block
comment lines when saving.

Change-Id: I0efd307fd48869ea688eb79aa77c9ba38de5a4a6
tags/7.3.0.rc1
Artur Signell 9 years ago
parent
commit
99118ccf94
38 changed files with 81 additions and 69 deletions
  1. 7
    1
      .settings/org.eclipse.jdt.ui.prefs
  2. 2
    1
      client/src/com/vaadin/client/ApplicationConnection.java
  3. 3
    1
      client/src/com/vaadin/client/communication/Heartbeat.java
  4. 2
    4
      client/src/com/vaadin/client/componentlocator/LocatorStrategy.java
  5. 2
    4
      client/src/com/vaadin/client/debug/internal/HierarchySection.java
  6. 1
    2
      client/src/com/vaadin/client/debug/internal/SelectConnectorListener.java
  7. 3
    3
      client/src/com/vaadin/client/ui/VOverlay.java
  8. 1
    2
      client/src/com/vaadin/client/ui/dd/DDUtil.java
  9. 2
    1
      client/src/com/vaadin/client/ui/dd/DragImageModifier.java
  10. 2
    1
      server/src/com/vaadin/server/Page.java
  11. 1
    1
      server/src/com/vaadin/server/VaadinSession.java
  12. 3
    3
      server/src/com/vaadin/server/communication/ClientRpcWriter.java
  13. 2
    1
      server/src/com/vaadin/ui/NotificationConfiguration.java
  14. 4
    5
      server/src/com/vaadin/ui/TabSheet.java
  15. 2
    2
      server/src/com/vaadin/util/CurrentInstance.java
  16. 2
    1
      server/tests/src/com/vaadin/server/VaadinPortletRequestTests.java
  17. 2
    1
      uitest/src/com/vaadin/tests/components/abstractcomponent/PrimaryStyleTest.java
  18. 1
    1
      uitest/src/com/vaadin/tests/components/button/ButtonToggleIcons.java
  19. 3
    2
      uitest/src/com/vaadin/tests/components/checkbox/CheckBoxRpcCountTest.java
  20. 6
    3
      uitest/src/com/vaadin/tests/components/combobox/ComboBoxInputPromptTest.java
  21. 4
    4
      uitest/src/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java
  22. 8
    5
      uitest/src/com/vaadin/tests/components/datefield/DateFieldReadOnlyTest.java
  23. 2
    1
      uitest/src/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayoutTest.java
  24. 2
    1
      uitest/src/com/vaadin/tests/components/menubar/MenuTooltipTest.java
  25. 2
    2
      uitest/src/com/vaadin/tests/components/notification/NotificationsWaiAria.java
  26. 4
    3
      uitest/src/com/vaadin/tests/components/window/WindowMoveListenerTest.java
  27. 2
    1
      uitest/src/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChangeTest.java
  28. 1
    1
      uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java
  29. 0
    1
      uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HAddReplaceMove.java
  30. 0
    1
      uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HCaption.java
  31. 0
    1
      uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutExpandTest.java
  32. 0
    1
      uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegErrorTest.java
  33. 0
    1
      uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizingTest.java
  34. 2
    1
      uitest/src/com/vaadin/tests/push/PushConfigurationLongPollingTest.java
  35. 0
    1
      uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java
  36. 0
    1
      uitest/src/com/vaadin/tests/push/ReconnectStreamingTest.java
  37. 2
    1
      uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
  38. 1
    2
      uitest/src/com/vaadin/tests/tooltip/AdjacentElementsWithTooltipsTest.java

+ 7
- 1
.settings/org.eclipse.jdt.ui.prefs View File

sp_cleanup.always_use_parentheses_in_expressions=false sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false sp_cleanup.always_use_this_for_non_static_method_access=false
sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false sp_cleanup.convert_to_enhanced_for_loop=false
sp_cleanup.correct_indentation=false sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false sp_cleanup.format_source_code_changes_only=false
sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=false sp_cleanup.make_local_variable_final=false
sp_cleanup.make_parameters_final=false sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true sp_cleanup.make_private_fields_final=true
sp_cleanup.qualify_static_member_accesses_with_declaring_class=false sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true sp_cleanup.remove_private_constructors=true
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=false
sp_cleanup.remove_trailing_whitespaces_all=true sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
sp_cleanup.remove_unnecessary_casts=true sp_cleanup.remove_unnecessary_casts=true
sp_cleanup.remove_unused_private_types=true sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false sp_cleanup.sort_members_all=false
sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false sp_cleanup.use_blocks_only_for_return_and_throw=false
sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=false sp_cleanup.use_parentheses_in_expressions=false
sp_cleanup.use_this_for_non_static_field_access=true sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
sp_cleanup.use_type_arguments=false

+ 2
- 1
client/src/com/vaadin/client/ApplicationConnection.java View File

startRequest(); startRequest();


JSONObject payload = new JSONObject(); JSONObject payload = new JSONObject();
if (!getCsrfToken().equals(ApplicationConstants.CSRF_TOKEN_DEFAULT_VALUE)) {
if (!getCsrfToken().equals(
ApplicationConstants.CSRF_TOKEN_DEFAULT_VALUE)) {
payload.put(ApplicationConstants.CSRF_TOKEN, new JSONString( payload.put(ApplicationConstants.CSRF_TOKEN, new JSONString(
getCsrfToken())); getCsrfToken()));
} }

+ 3
- 1
client/src/com/vaadin/client/communication/Heartbeat.java View File



@Override @Override
public void onError(Request request, Throwable exception) { public void onError(Request request, Throwable exception) {
getLogger().severe("Exception sending heartbeat: " + exception.getMessage());
getLogger().severe(
"Exception sending heartbeat: "
+ exception.getMessage());
// Notify network observers about response status // Notify network observers about response status
connection.fireEvent(new ConnectionStatusEvent(0)); connection.fireEvent(new ConnectionStatusEvent(0));
// Don't break the loop // Don't break the loop

+ 2
- 4
client/src/com/vaadin/client/componentlocator/LocatorStrategy.java View File

* @return The DOM element identified by {@code path} or null if the element * @return The DOM element identified by {@code path} or null if the element
* could not be located. * could not be located.
*/ */
Element getElementByPathStartingAt(String path,
Element root);
Element getElementByPathStartingAt(String path, Element root);


/** /**
* Locates all elements that match a String locator (path) which identifies * Locates all elements that match a String locator (path) which identifies
* found. * found.
*/ */


List<Element> getElementsByPathStartingAt(
String path, Element root);
List<Element> getElementsByPathStartingAt(String path, Element root);
} }

+ 2
- 4
client/src/com/vaadin/client/debug/internal/HierarchySection.java View File



hierarchyPanel.addListener(new SelectConnectorListener() { hierarchyPanel.addListener(new SelectConnectorListener() {
@Override @Override
public void select(ServerConnector connector,
Element element) {
public void select(ServerConnector connector, Element element) {
printState(connector, true); printState(connector, true);
} }
}); });


analyzeLayoutsPanel.addListener(new SelectConnectorListener() { analyzeLayoutsPanel.addListener(new SelectConnectorListener() {
@Override @Override
public void select(ServerConnector connector,
Element element) {
public void select(ServerConnector connector, Element element) {
printState(connector, true); printState(connector, true);
} }
}); });

+ 1
- 2
client/src/com/vaadin/client/debug/internal/SelectConnectorListener.java View File

* @param element * @param element
* selected element of the connector or null if unknown * selected element of the connector or null if unknown
*/ */
public void select(ServerConnector connector,
Element element);
public void select(ServerConnector connector, Element element);
} }

+ 3
- 3
client/src/com/vaadin/client/ui/VOverlay.java View File

* A "thread local" of sorts, set temporarily so that VOverlayImpl knows * A "thread local" of sorts, set temporarily so that VOverlayImpl knows
* which VOverlay is using it, so that it can be attached to the correct * which VOverlay is using it, so that it can be attached to the correct
* overlay container. * overlay container.
*
*
* TODO this is a strange pattern that we should get rid of when possible. * TODO this is a strange pattern that we should get rid of when possible.
*/ */
protected static VOverlay current; protected static VOverlay current;


/* /*
* (non-Javadoc) * (non-Javadoc)
*
*
* @see com.google.gwt.user.client.ui.PopupPanel#hide() * @see com.google.gwt.user.client.ui.PopupPanel#hide()
*/ */
@Override @Override


/* /*
* (non-Javadoc) * (non-Javadoc)
*
*
* @see com.google.gwt.user.client.ui.PopupPanel#hide(boolean) * @see com.google.gwt.user.client.ui.PopupPanel#hide(boolean)
*/ */
@Override @Override

+ 1
- 2
client/src/com/vaadin/client/ui/dd/DDUtil.java View File

} }


public static HorizontalDropLocation getHorizontalDropLocation( public static HorizontalDropLocation getHorizontalDropLocation(
Element element, NativeEvent event,
double leftRightRatio) {
Element element, NativeEvent event, double leftRightRatio) {
int clientX = Util.getTouchOrMouseClientX(event); int clientX = Util.getTouchOrMouseClientX(event);


// Event coordinates are relative to the viewport, element absolute // Event coordinates are relative to the viewport, element absolute

+ 2
- 1
client/src/com/vaadin/client/ui/dd/DragImageModifier.java View File

/** /**
* Interface implemented by widgets if the drag image used for drag'n'drop * Interface implemented by widgets if the drag image used for drag'n'drop
* requires additional initialization/configuration. The method * requires additional initialization/configuration. The method
* {@link #modifyDragImage(Element)} is called for each element in the automatically generated drag image.
* {@link #modifyDragImage(Element)} is called for each element in the
* automatically generated drag image.
* *
* @since 7.2 * @since 7.2
* @author Vaadin Ltd * @author Vaadin Ltd

+ 2
- 1
server/src/com/vaadin/server/Page.java View File

} }


public void init(VaadinRequest request) { public void init(VaadinRequest request) {
// NOTE: UI.refresh makes assumptions about the semantics of this method.
// NOTE: UI.refresh makes assumptions about the semantics of this
// method.
// It should be kept in sync if this method is changed. // It should be kept in sync if this method is changed.


// Extract special parameter sent by vaadinBootstrap.js // Extract special parameter sent by vaadinBootstrap.js

+ 1
- 1
server/src/com/vaadin/server/VaadinSession.java View File

* deadlocks unless implemented very carefully. get(long, TimeUnit) * deadlocks unless implemented very carefully. get(long, TimeUnit)
* does not have the same detection since a sensible timeout should * does not have the same detection since a sensible timeout should
* avoid completely locking up the application. * avoid completely locking up the application.
*
*
* Even though no deadlock could occur after the runnable has been * Even though no deadlock could occur after the runnable has been
* run, the check is always done as the deterministic behavior makes * run, the check is always done as the deterministic behavior makes
* it easier to detect potential problems. * it easier to detect potential problems.

+ 3
- 3
server/src/com/vaadin/server/communication/ClientRpcWriter.java View File

// + parameterType.getName()); // + parameterType.getName());
// } // }
// } // }
EncodeResult encodeResult = JsonCodec.encode(invocation.getParameters()[i],
referenceParameter, parameterType,
ui.getConnectorTracker());
EncodeResult encodeResult = JsonCodec.encode(
invocation.getParameters()[i], referenceParameter,
parameterType, ui.getConnectorTracker());
paramJson.put(encodeResult.getEncodedValue()); paramJson.put(encodeResult.getEncodedValue());
} }
invocationJson.put(paramJson); invocationJson.put(paramJson);

+ 2
- 1
server/src/com/vaadin/ui/NotificationConfiguration.java View File

NotificationTypeConfiguration styleSetup = getTypeConf(type); NotificationTypeConfiguration styleSetup = getTypeConf(type);
if (styleSetup == null) { if (styleSetup == null) {
styleSetup = new NotificationTypeConfiguration(); styleSetup = new NotificationTypeConfiguration();
ui.getState().notificationConfigurations.put(type.getStyle(), styleSetup);
ui.getState().notificationConfigurations.put(type.getStyle(),
styleSetup);
} }


return styleSetup; return styleSetup;

+ 4
- 5
server/src/com/vaadin/ui/TabSheet.java View File

* the position at where the the tab should be added. * the position at where the the tab should be added.
* @return the created {@link Tab} * @return the created {@link Tab}
*/ */
public Tab addTab(Component tabComponent, String caption, Resource icon, int position) {
public Tab addTab(Component tabComponent, String caption, Resource icon,
int position) {
if (tabComponent == null) { if (tabComponent == null) {
return null; return null;
} else if (tabs.containsKey(tabComponent)) { } else if (tabs.containsKey(tabComponent)) {


@Override @Override
public Resource getIcon() { public Resource getIcon() {
return getResource(ComponentConstants.ICON_RESOURCE
+ tabState.key);
return getResource(ComponentConstants.ICON_RESOURCE + tabState.key);
} }


@Override @Override


@Override @Override
public void setIcon(Resource icon, String iconAltText) { public void setIcon(Resource icon, String iconAltText) {
setResource(ComponentConstants.ICON_RESOURCE + tabState.key,
icon);
setResource(ComponentConstants.ICON_RESOURCE + tabState.key, icon);
tabState.iconAltText = iconAltText; tabState.iconAltText = iconAltText;
} }
} }

+ 2
- 2
server/src/com/vaadin/util/CurrentInstance.java View File

* ThreadLocal should only outlive the referenced object on * ThreadLocal should only outlive the referenced object on
* threads that are not doing anything related to Vaadin, which * threads that are not doing anything related to Vaadin, which
* should thus never invoke CurrentInstance.get(). * should thus never invoke CurrentInstance.get().
*
*
* At this point, there might also be other values that have * At this point, there might also be other values that have
* been collected, so we'll scan the entire map and remove stale * been collected, so we'll scan the entire map and remove stale
* CurrentInstance objects. Using a ReferenceQueue could make * CurrentInstance objects. Using a ReferenceQueue could make
* CurrentInstance. Without this a reference to an already * CurrentInstance. Without this a reference to an already
* collected instance may be left in the CurrentInstance when it * collected instance may be left in the CurrentInstance when it
* really should be restored to null. * really should be restored to null.
*
*
* One example case that this fixes: * One example case that this fixes:
* VaadinService.runPendingAccessTasks() clears all current * VaadinService.runPendingAccessTasks() clears all current
* instances and then sets everything but the UI. This makes * instances and then sets everything but the UI. This makes

+ 2
- 1
server/tests/src/com/vaadin/server/VaadinPortletRequestTests.java View File



@Test @Test
public void defaultValueForPortletPreferenceIsNull() { public void defaultValueForPortletPreferenceIsNull() {
when(preferences.getValue(anyString(), isNull(String.class))).thenReturn(null);
when(preferences.getValue(anyString(), isNull(String.class)))
.thenReturn(null);


String value = sut.getPortletPreference("foo"); String value = sut.getPortletPreference("foo");



+ 2
- 1
uitest/src/com/vaadin/tests/components/abstractcomponent/PrimaryStyleTest.java View File

$(ButtonElement.class).id("update-button").click(); $(ButtonElement.class).id("update-button").click();


// Verify that the class names where updated as expected. // Verify that the class names where updated as expected.
List<WebElement> updatedElements = driver.findElements(By.className("updated-correctly"));
List<WebElement> updatedElements = driver.findElements(By
.className("updated-correctly"));
assertThat(updatedElements, hasSize(initialElements.size())); assertThat(updatedElements, hasSize(initialElements.size()));


} }

+ 1
- 1
uitest/src/com/vaadin/tests/components/button/ButtonToggleIcons.java View File

layout.addComponent(new Button("Toggle icon", iconToggleListener)); layout.addComponent(new Button("Toggle icon", iconToggleListener));
layout.addComponent(new NativeButton("Toggle icon", iconToggleListener)); layout.addComponent(new NativeButton("Toggle icon", iconToggleListener));
} }
}
}

+ 3
- 2
uitest/src/com/vaadin/tests/components/checkbox/CheckBoxRpcCountTest.java View File



// Click on the actual checkbox. // Click on the actual checkbox.
inputElem.click(); inputElem.click();
//Have to use waitUntil to make this test more stable.
// Have to use waitUntil to make this test more stable.
waitUntilLabelIsUpdated(countElem, "1 RPC call(s) made."); waitUntilLabelIsUpdated(countElem, "1 RPC call(s) made.");


// Click on the checkbox label. // Click on the checkbox label.
waitUntilLabelIsUpdated(countElem, "3 RPC call(s) made."); waitUntilLabelIsUpdated(countElem, "3 RPC call(s) made.");
} }


private void waitUntilLabelIsUpdated(final WebElement countElem, final String expectedText) {
private void waitUntilLabelIsUpdated(final WebElement countElem,
final String expectedText) {
waitUntil(new ExpectedCondition<Boolean>() { waitUntil(new ExpectedCondition<Boolean>() {
@Override @Override
public Boolean apply(WebDriver input) { public Boolean apply(WebDriver input) {

+ 6
- 3
uitest/src/com/vaadin/tests/components/combobox/ComboBoxInputPromptTest.java View File

ComboBoxElement disabledComboBox = getComboBoxWithCaption("Disabled"); ComboBoxElement disabledComboBox = getComboBoxWithCaption("Disabled");
ComboBoxElement readOnlyComboBox = getComboBoxWithCaption("Read-only"); ComboBoxElement readOnlyComboBox = getComboBoxWithCaption("Read-only");


assertThat(getInputPromptValue(normalComboBox), is("Normal input prompt"));
assertThat(getInputPromptValue(normalComboBox),
is("Normal input prompt"));
assertThat(getInputPromptValue(disabledComboBox), isEmptyString()); assertThat(getInputPromptValue(disabledComboBox), isEmptyString());
assertThat(getInputPromptValue(readOnlyComboBox), isEmptyString()); assertThat(getInputPromptValue(readOnlyComboBox), isEmptyString());


toggleDisabledAndReadonly(); toggleDisabledAndReadonly();
assertThat(getInputPromptValue(disabledComboBox), is("Disabled input prompt"));
assertThat(getInputPromptValue(readOnlyComboBox), is("Read-only input prompt"));
assertThat(getInputPromptValue(disabledComboBox),
is("Disabled input prompt"));
assertThat(getInputPromptValue(readOnlyComboBox),
is("Read-only input prompt"));


toggleDisabledAndReadonly(); toggleDisabledAndReadonly();
assertThat(getInputPromptValue(disabledComboBox), isEmptyString()); assertThat(getInputPromptValue(disabledComboBox), isEmptyString());

+ 4
- 4
uitest/src/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java View File

// provide any way to access the popup and send keys to it. // provide any way to access the popup and send keys to it.
// Ticket #13756 // Ticket #13756


return driver.findElement(By
.className("v-filterselect-input"));
return driver.findElement(By.className("v-filterselect-input"));
} }


private void openPopup() { private void openPopup() {
dropDownComboBox.sendKeys(Keys.DOWN); dropDownComboBox.sendKeys(Keys.DOWN);
} }


assertThat(getSelectedItemText(), is("item " + PAGESIZE)); //item 10
assertThat(getSelectedItemText(), is("item " + PAGESIZE)); // item 10
} }


private String getSelectedItemText() { private String getSelectedItemText() {
waitUntilNextPageIsVisible(); waitUntilNextPageIsVisible();
dropDownComboBox.sendKeys(Keys.UP); dropDownComboBox.sendKeys(Keys.UP);


assertThat(getSelectedItemText(), is("item " + (PAGESIZE - 1))); //item 9
assertThat(getSelectedItemText(), is("item " + (PAGESIZE - 1))); // item
// 9
} }


private void waitUntilNextPageIsVisible() { private void waitUntilNextPageIsVisible() {

+ 8
- 5
uitest/src/com/vaadin/tests/components/datefield/DateFieldReadOnlyTest.java View File

package com.vaadin.tests.components.datefield; package com.vaadin.tests.components.datefield;



import com.vaadin.testbench.By; import com.vaadin.testbench.By;
import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.ButtonElement;
import com.vaadin.testbench.elements.DateFieldElement; import com.vaadin.testbench.elements.DateFieldElement;
public class DateFieldReadOnlyTest extends MultiBrowserTest { public class DateFieldReadOnlyTest extends MultiBrowserTest {


@Test @Test
public void readOnlyDateFieldPopupShouldNotOpen() throws IOException, InterruptedException {
public void readOnlyDateFieldPopupShouldNotOpen() throws IOException,
InterruptedException {
openTestURL(); openTestURL();


compareScreen("initial"); compareScreen("initial");
} }


private void closePopup() { private void closePopup() {
findElement(By.className("v-datefield-calendarpanel")).sendKeys(Keys.RETURN);
findElement(By.className("v-datefield-calendarpanel")).sendKeys(
Keys.RETURN);
} }


private void openPopup() { private void openPopup() {
//waiting for openPopup() in TB4 beta1: http://dev.vaadin.com/ticket/13766
$(DateFieldElement.class).first().findElement(By.tagName("button")).click();
// waiting for openPopup() in TB4 beta1:
// http://dev.vaadin.com/ticket/13766
$(DateFieldElement.class).first().findElement(By.tagName("button"))
.click();
} }


private void toggleReadOnly() { private void toggleReadOnly() {

+ 2
- 1
uitest/src/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayoutTest.java View File



import static org.junit.Assert.*; import static org.junit.Assert.*;


public class MoveComponentsFromGridLayoutToInnerLayoutTest extends MultiBrowserTest {
public class MoveComponentsFromGridLayoutToInnerLayoutTest extends
MultiBrowserTest {


@Test @Test
public void buttonIsMovedInsideInnerLayout() throws IOException { public void buttonIsMovedInsideInnerLayout() throws IOException {

+ 2
- 1
uitest/src/com/vaadin/tests/components/menubar/MenuTooltipTest.java View File

public void testToolTipDelay() throws InterruptedException { public void testToolTipDelay() throws InterruptedException {
openTestURL(); openTestURL();


Coordinates elementCoordinates = getCoordinates($(MenuBarElement.class).first());
Coordinates elementCoordinates = getCoordinates($(MenuBarElement.class)
.first());


Mouse mouse = ((HasInputDevices) getDriver()).getMouse(); Mouse mouse = ((HasInputDevices) getDriver()).getMouse();



+ 2
- 2
uitest/src/com/vaadin/tests/components/notification/NotificationsWaiAria.java View File

.getNotificationConfiguration(); .getNotificationConfiguration();
notificationConf.setAssistivePrefix(typeValue, prefix.getValue()); notificationConf.setAssistivePrefix(typeValue, prefix.getValue());
notificationConf.setAssistivePostfix(typeValue, postfix.getValue()); notificationConf.setAssistivePostfix(typeValue, postfix.getValue());
notificationConf
.setAssistiveRole(typeValue, (NotificationRole) role.getValue());
notificationConf.setAssistiveRole(typeValue,
(NotificationRole) role.getValue());


n.show(Page.getCurrent()); n.show(Page.getCurrent());
} }

+ 4
- 3
uitest/src/com/vaadin/tests/components/window/WindowMoveListenerTest.java View File

waitUntilWindowHasReseted(window, winPos); waitUntilWindowHasReseted(window, winPos);
} }


private void waitUntilWindowHasReseted(final WebElement window, final Point winPos) {
private void waitUntilWindowHasReseted(final WebElement window,
final Point winPos) {
waitUntil(new ExpectedCondition<Boolean>() { waitUntil(new ExpectedCondition<Boolean>() {
@Override @Override
public Boolean apply(WebDriver input) { public Boolean apply(WebDriver input) {
return winPos.x == window.getLocation().x &&
winPos.y == window.getLocation().y;
return winPos.x == window.getLocation().x
&& winPos.y == window.getLocation().y;
} }
}, 5); }, 5);
} }

+ 2
- 1
uitest/src/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChangeTest.java View File



compareScreen("initial"); compareScreen("initial");


$(ButtonElement.class).caption("Reduce GridLayout parent width").first().click();
$(ButtonElement.class).caption("Reduce GridLayout parent width")
.first().click();


compareScreen("buttonMoved"); compareScreen("buttonMoved");
} }

+ 1
- 1
uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java View File



/* /*
* (non-Javadoc) * (non-Javadoc)
*
*
* @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server. * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
* VaadinRequest) * VaadinRequest)
*/ */

+ 0
- 1
uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HAddReplaceMove.java View File

import com.vaadin.tests.layouts.layouttester.BaseAddReplaceMove; import com.vaadin.tests.layouts.layouttester.BaseAddReplaceMove;
import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.HorizontalLayout;



public class HAddReplaceMove extends BaseAddReplaceMove { public class HAddReplaceMove extends BaseAddReplaceMove {


/** /**

+ 0
- 1
uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HCaption.java View File

import com.vaadin.tests.layouts.layouttester.BaseCaption; import com.vaadin.tests.layouts.layouttester.BaseCaption;
import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.HorizontalLayout;



public class HCaption extends BaseCaption { public class HCaption extends BaseCaption {


/** /**

+ 0
- 1
uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutExpandTest.java View File



import com.vaadin.tests.layouts.layouttester.BaseLayoutExpandTest; import com.vaadin.tests.layouts.layouttester.BaseLayoutExpandTest;



/** /**
* *
* @since * @since

+ 0
- 1
uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegErrorTest.java View File



import com.vaadin.tests.layouts.layouttester.BaseLayoutRegErrorTest; import com.vaadin.tests.layouts.layouttester.BaseLayoutRegErrorTest;



/** /**
* *
* @since * @since

+ 0
- 1
uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizingTest.java View File



import com.vaadin.tests.layouts.layouttester.BaseLayoutSizingTest; import com.vaadin.tests.layouts.layouttester.BaseLayoutSizingTest;



/** /**
* *
* @since * @since

+ 2
- 1
uitest/src/com/vaadin/tests/push/PushConfigurationLongPollingTest.java View File



clearDebugMessages(); clearDebugMessages();
new Select(getPushModeSelect()).selectByVisibleText("AUTOMATIC"); new Select(getPushModeSelect()).selectByVisibleText("AUTOMATIC");
waitForDebugMessage("Push connection established using long-polling", 10);
waitForDebugMessage("Push connection established using long-polling",
10);
waitForServerCounterToUpdate(); waitForServerCounterToUpdate();
} }



+ 0
- 1
uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java View File

*/ */
package com.vaadin.tests.push; package com.vaadin.tests.push;



public class ReconnectLongPollingTest extends ReconnectTest { public class ReconnectLongPollingTest extends ReconnectTest {


@Override @Override

+ 0
- 1
uitest/src/com/vaadin/tests/push/ReconnectStreamingTest.java View File

*/ */
package com.vaadin.tests.push; package com.vaadin.tests.push;



public class ReconnectStreamingTest extends ReconnectTest { public class ReconnectStreamingTest extends ReconnectTest {


@Override @Override

+ 2
- 1
uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java View File

} }


protected WebElement getTooltipElement() { protected WebElement getTooltipElement() {
return getDriver().findElement(com.vaadin.testbench.By.className("v-tooltip-text"));
return getDriver().findElement(
com.vaadin.testbench.By.className("v-tooltip-text"));
} }


protected Coordinates getCoordinates(TestBenchElement element) { protected Coordinates getCoordinates(TestBenchElement element) {

+ 1
- 2
uitest/src/com/vaadin/tests/tooltip/AdjacentElementsWithTooltipsTest.java View File

} }


private ButtonElement getButton(String caption) { private ButtonElement getButton(String caption) {
return $(ButtonElement.class)
.caption(caption).first();
return $(ButtonElement.class).caption(caption).first();
} }
} }

Loading…
Cancel
Save