From 7d0a2320ab31b6cb71181b32d102f609d1ef440b Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Fri, 8 Apr 2011 12:31:23 +0000 Subject: [PATCH] Merged tests and fixes from 6.5 svn changeset:18184/svn branch:6.6 --- .../server/AbstractApplicationServlet.java | 24 +++---- src/com/vaadin/ui/AbstractTextField.java | 4 +- .../weblogic-portal-integration.html | 62 +++++++++++++++++++ tests/integration_tests.xml | 40 +++++++++++- .../components/window/WindowClickEvents.html | 21 +++++++ .../components/window/WindowClickEvents.java | 10 ++- 6 files changed, 145 insertions(+), 16 deletions(-) create mode 100644 tests/integration-testscripts/weblogic-portal/weblogic-portal-integration.html diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java index 668f3892a0..7af2159dc0 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java @@ -1564,14 +1564,17 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements * If one needs to override parts of the host page, it is suggested that one * overrides on of several submethods which are called by this method: * * @@ -1660,8 +1663,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements + getDefaultTheme().replaceAll("[^a-zA-Z0-9]", ""); } - String classNames = "v-app " + themeClass + " " - + appClass; + String classNames = "v-app " + themeClass + " " + appClass; String divStyle = null; if (request.getAttribute(REQUEST_APPSTYLE) != null) { @@ -1737,12 +1739,12 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements * @param appId * @param classNames * @param divStyle - * @param request + * @param request * @throws IOException */ protected void writeAjaxPageHtmlMainDiv(final BufferedWriter page, - String appId, String classNames, String divStyle, HttpServletRequest request) - throws IOException { + String appId, String classNames, String divStyle, + HttpServletRequest request) throws IOException { page.write("
"); page.write("
"); diff --git a/src/com/vaadin/ui/AbstractTextField.java b/src/com/vaadin/ui/AbstractTextField.java index cd9d99de18..ad31a46157 100644 --- a/src/com/vaadin/ui/AbstractTextField.java +++ b/src/com/vaadin/ui/AbstractTextField.java @@ -306,6 +306,7 @@ public abstract class AbstractTextField extends AbstractField implements */ public void setNullRepresentation(String nullRepresentation) { this.nullRepresentation = nullRepresentation; + requestRepaint(); } /** @@ -325,12 +326,13 @@ public abstract class AbstractTextField extends AbstractField implements *

* * @param nullSettingAllowed - * Should the null-string represenation be always converted to + * Should the null-string representation always be converted to * null-values. * @see TextField#getNullRepresentation() */ public void setNullSettingAllowed(boolean nullSettingAllowed) { this.nullSettingAllowed = nullSettingAllowed; + requestRepaint(); } /** diff --git a/tests/integration-testscripts/weblogic-portal/weblogic-portal-integration.html b/tests/integration-testscripts/weblogic-portal/weblogic-portal-integration.html new file mode 100644 index 0000000000..802aa87160 --- /dev/null +++ b/tests/integration-testscripts/weblogic-portal/weblogic-portal-integration.html @@ -0,0 +1,62 @@ + + + + + + +weblogic-portal-integration + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
weblogic-portal-integration
open/AddrPortal/TestPortal.portal
mouseClickvaadin=v-AddressBook_1::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]/domChild[0]52,14
screenCaptureMarge_selected
clickvaadin=v-AddressBook_1::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]
screenCaptureMarge_in_edit_mode
mouseClickvaadin=v-AddressBook_1::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]52,13
enterCharactervaadin=v-AddressBook_1::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]Margery
clickvaadin=v-AddressBook_1::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]
screenCaptureMargery_Simmons
+ + diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml index f1f16d1243..9f9ef31865 100644 --- a/tests/integration_tests.xml +++ b/tests/integration_tests.xml @@ -1,7 +1,7 @@ - + @@ -296,7 +296,7 @@ - + @@ -304,7 +304,24 @@ - + + + + + + + + + + + + + + + + + + @@ -386,6 +403,14 @@ + + + + + + + + @@ -555,6 +580,12 @@ + + + + + + @@ -624,6 +655,9 @@ + + + diff --git a/tests/src/com/vaadin/tests/components/window/WindowClickEvents.html b/tests/src/com/vaadin/tests/components/window/WindowClickEvents.html index 57092595f3..4a41374e41 100644 --- a/tests/src/com/vaadin/tests/components/window/WindowClickEvents.html +++ b/tests/src/com/vaadin/tests/components/window/WindowClickEvents.html @@ -51,6 +51,27 @@ vaadin=runcomvaadintestscomponentswindowWindowClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0] 4. Click using left on Sub window + + + click + vaadin=runcomvaadintestscomponentswindowWindowClickEvents::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0] + + + + assertText + vaadin=runcomvaadintestscomponentswindowWindowClickEvents::PID_SLog_row_0 + 5. Click on button + + + assertText + vaadin=runcomvaadintestscomponentswindowWindowClickEvents::PID_SLog_row_2 + 3. Click using left on Sub window layout + + + assertText + vaadin=runcomvaadintestscomponentswindowWindowClickEvents::PID_SLog_row_1 + 4. Click using left on Sub window + diff --git a/tests/src/com/vaadin/tests/components/window/WindowClickEvents.java b/tests/src/com/vaadin/tests/components/window/WindowClickEvents.java index 4748111fd6..041ccaaf30 100644 --- a/tests/src/com/vaadin/tests/components/window/WindowClickEvents.java +++ b/tests/src/com/vaadin/tests/components/window/WindowClickEvents.java @@ -56,7 +56,15 @@ public class WindowClickEvents extends TestBase { Label l = new Label("This window is centered"); l.setSizeUndefined(); - Button b = new Button("Clicking here should not produce an event"); + Button b = new Button( + "Clicking here should not produce a layout click event"); + b.addListener(new Button.ClickListener() { + + public void buttonClick(com.vaadin.ui.Button.ClickEvent event) { + log.log("Click on button"); + } + + }); centered.addComponent(l); centered.addComponent(b); -- 2.39.5