diff --git a/commons-api/pom.xml b/commons-api/pom.xml index 0a581d45c..3eea2c4c2 100644 --- a/commons-api/pom.xml +++ b/commons-api/pom.xml @@ -22,7 +22,7 @@ commons io.meeds.commons - 7.1.x-SNAPSHOT + 7.1.x-meeds-qaui-SNAPSHOT commons-api jar diff --git a/commons-comet-service/pom.xml b/commons-comet-service/pom.xml index f94b5f29e..b1699b0d0 100644 --- a/commons-comet-service/pom.xml +++ b/commons-comet-service/pom.xml @@ -22,7 +22,7 @@ commons io.meeds.commons - 7.1.x-SNAPSHOT + 7.1.x-meeds-qaui-SNAPSHOT commons-comet-service jar diff --git a/commons-comet-webapp/pom.xml b/commons-comet-webapp/pom.xml index c114d6b0f..4ca861448 100644 --- a/commons-comet-webapp/pom.xml +++ b/commons-comet-webapp/pom.xml @@ -22,7 +22,7 @@ commons io.meeds.commons - 7.1.x-SNAPSHOT + 7.1.x-meeds-qaui-SNAPSHOT commons-comet-webapp war diff --git a/commons-component-common/pom.xml b/commons-component-common/pom.xml index 0414e7684..8a2632436 100644 --- a/commons-component-common/pom.xml +++ b/commons-component-common/pom.xml @@ -22,7 +22,7 @@ commons io.meeds.commons - 7.1.x-SNAPSHOT + 7.1.x-meeds-qaui-SNAPSHOT commons-component-common jar diff --git a/commons-component-product/pom.xml b/commons-component-product/pom.xml index 8af4e9ddd..ca00e43c4 100644 --- a/commons-component-product/pom.xml +++ b/commons-component-product/pom.xml @@ -23,7 +23,7 @@ commons io.meeds.commons - 7.1.x-SNAPSHOT + 7.1.x-meeds-qaui-SNAPSHOT commons-component-product jar diff --git a/commons-component-upgrade/pom.xml b/commons-component-upgrade/pom.xml index 345775caa..d3f267b50 100644 --- a/commons-component-upgrade/pom.xml +++ b/commons-component-upgrade/pom.xml @@ -22,7 +22,7 @@ commons io.meeds.commons - 7.1.x-SNAPSHOT + 7.1.x-meeds-qaui-SNAPSHOT commons-component-upgrade Meeds:: PLF:: Commons - Transparent Upgrade Framework diff --git a/commons-extension-webapp/pom.xml b/commons-extension-webapp/pom.xml index e0f3e6423..7ce01d912 100644 --- a/commons-extension-webapp/pom.xml +++ b/commons-extension-webapp/pom.xml @@ -22,7 +22,7 @@ commons io.meeds.commons - 7.1.x-SNAPSHOT + 7.1.x-meeds-qaui-SNAPSHOT commons-extension-webapp war diff --git a/commons-search/pom.xml b/commons-search/pom.xml index ddf9b573e..0d2a9dcda 100644 --- a/commons-search/pom.xml +++ b/commons-search/pom.xml @@ -22,7 +22,7 @@ commons io.meeds.commons - 7.1.x-SNAPSHOT + 7.1.x-meeds-qaui-SNAPSHOT commons-search jar diff --git a/commons-testing/pom.xml b/commons-testing/pom.xml index e49c01685..27fdc00d8 100644 --- a/commons-testing/pom.xml +++ b/commons-testing/pom.xml @@ -22,7 +22,7 @@ commons io.meeds.commons - 7.1.x-SNAPSHOT + 7.1.x-meeds-qaui-SNAPSHOT commons-testing jar diff --git a/commons-testing/src/main/java/org/exoplatform/commons/testing/mock/MockWebUIRequestContext.java b/commons-testing/src/main/java/org/exoplatform/commons/testing/mock/MockWebUIRequestContext.java deleted file mode 100644 index 8307c3471..000000000 --- a/commons-testing/src/main/java/org/exoplatform/commons/testing/mock/MockWebUIRequestContext.java +++ /dev/null @@ -1,107 +0,0 @@ -/** - * This file is part of the Meeds project (https://meeds.io/). - * - * Copyright (C) 2020 - 2025 Meeds Association contact@meeds.io - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.exoplatform.commons.testing.mock; - -import org.exoplatform.portal.mop.user.UserPortal; -import org.exoplatform.services.resources.Orientation; -import org.exoplatform.web.application.Application; -import org.exoplatform.web.application.RequestContext; -import org.exoplatform.web.application.URLBuilder; -import org.exoplatform.web.url.PortalURL; -import org.exoplatform.web.url.ResourceType; -import org.exoplatform.web.url.URLFactory; -import org.exoplatform.webui.application.WebuiRequestContext; - -public class MockWebUIRequestContext extends WebuiRequestContext { - - public MockWebUIRequestContext(RequestContext parentAppRequestContext, Application app) { - super(parentAppRequestContext, app); - } - - @Override - public T getRequest() { - - return null; - } - - public String getPortalContextPath(){ - return null ; - } - - @Override - public String getRequestContextPath() { - - return null; - } - - @Override - public T getResponse() { - - return null; - } - - @Override - public void sendRedirect(String url) throws Exception { - } - - @Override - public Orientation getOrientation() { - - return null; - } - - @Override - public String getRequestParameter(String name) { - - return null; - } - - @Override - public String[] getRequestParameterValues(String name) { - return new String[0]; - } - - @Override - public URLBuilder getURLBuilder() { - - return null; - } - - @Override - public boolean useAjax() { - - return false; - } - - @Override - public URLFactory getURLFactory() { - return null; - } - - @Override - public > U newURL(ResourceType resourceType, URLFactory urlFactory) { - return null; - } - - @Override - public UserPortal getUserPortal() { - return null; - } - -} diff --git a/commons-testing/src/main/java/org/exoplatform/commons/testing/mock/MockWebuiApplication.java b/commons-testing/src/main/java/org/exoplatform/commons/testing/mock/MockWebuiApplication.java deleted file mode 100644 index 5eb5a3d6e..000000000 --- a/commons-testing/src/main/java/org/exoplatform/commons/testing/mock/MockWebuiApplication.java +++ /dev/null @@ -1,84 +0,0 @@ -/** - * This file is part of the Meeds project (https://meeds.io/). - * - * Copyright (C) 2020 - 2025 Meeds Association contact@meeds.io - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.exoplatform.commons.testing.mock; - -import java.util.Locale; -import java.util.ResourceBundle; - -import org.exoplatform.webui.application.WebuiApplication; -import org.exoplatform.webui.application.WebuiRequestContext; -import org.exoplatform.webui.core.UIComponent; - -public class MockWebuiApplication extends WebuiApplication { - - @Override - public String getApplicationInitParam(String name) { - - return null; - } - - @Override - public String getApplicationGroup() { - - return null; - } - - @Override - public String getApplicationId() { - - return null; - } - - @Override - public String getApplicationName() { - - return null; - } - - @Override - public String getApplicationType() { - - return null; - } - - @Override - public ResourceBundle getOwnerResourceBundle(String username, Locale locale) { - - return null; - } - - @Override - public ResourceBundle getResourceBundle(Locale locale) { - - return rb; - } - - ResourceBundle rb; - - public void setResourceBundle(ResourceBundle rb) { - this.rb = rb; - } - - public T createUIComponent(Class type, String configId, String id, - WebuiRequestContext context) throws Exception { - return type.getConstructor().newInstance(); - - } - -} diff --git a/commons-testing/src/main/java/org/exoplatform/commons/testing/webui/AbstractUIComponentTestCase.java b/commons-testing/src/main/java/org/exoplatform/commons/testing/webui/AbstractUIComponentTestCase.java deleted file mode 100644 index dba79d9ff..000000000 --- a/commons-testing/src/main/java/org/exoplatform/commons/testing/webui/AbstractUIComponentTestCase.java +++ /dev/null @@ -1,91 +0,0 @@ -/** - * This file is part of the Meeds project (https://meeds.io/). - * - * Copyright (C) 2020 - 2025 Meeds Association contact@meeds.io - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.exoplatform.commons.testing.webui; - -import org.exoplatform.web.application.AbstractApplicationMessage; -import org.exoplatform.webui.core.UIApplication; -import org.exoplatform.webui.core.UIComponent; - -/** - * Convenience TestCase made to test UIComponent classes. - * Creates a new UIComponent for each call to {@link #setUp()} - * @param type of the UIComponent - */ -public abstract class AbstractUIComponentTestCase extends AbstractWebuiTestCase { - - public AbstractUIComponentTestCase() throws Exception { - super(); - - } - - - protected T component; - - - public void doSetUp() { - try { - initComponent(); - } catch (Exception e) { //we want to catch all exceptions here to know a testcase is false or not. - fail("failed to initialize UIComponent: " + e.getMessage()); - } - } - - private void initComponent() throws Exception { - this.component = createComponent(); - this.component.setParent(new MockUIApplication()); - } - - protected abstract T createComponent() throws Exception; - - protected void assertApplicationMessage(String key) { - UIApplication app = component.getAncestorOfType(UIApplication.class); - boolean found = false; - for (AbstractApplicationMessage message : app.getUIPopupMessages().getWarnings()) { - if(key.equals(message.getMessageKey())) { - found = true; - } - } - - for (AbstractApplicationMessage message : app.getUIPopupMessages().getInfos()) { - if(key.equals(message.getMessageKey())) { - found = true; - } - } - - for (AbstractApplicationMessage message : app.getUIPopupMessages().getErrors()) { - if(key.equals(message.getMessageKey())) { - found = true; - } - } - - assertTrue("Message not found <" + key +">", found); - - } - - - class MockUIApplication extends UIApplication { - - public MockUIApplication() throws Exception { - super(); - - } - - } - -} diff --git a/commons-testing/src/main/java/org/exoplatform/commons/testing/webui/AbstractWebuiTestCase.java b/commons-testing/src/main/java/org/exoplatform/commons/testing/webui/AbstractWebuiTestCase.java deleted file mode 100644 index db0d9caa1..000000000 --- a/commons-testing/src/main/java/org/exoplatform/commons/testing/webui/AbstractWebuiTestCase.java +++ /dev/null @@ -1,91 +0,0 @@ -/** - * This file is part of the Meeds project (https://meeds.io/). - * - * Copyright (C) 2020 - 2025 Meeds Association contact@meeds.io - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.exoplatform.commons.testing.webui; - - -import java.util.HashMap; - -import junit.framework.TestCase; - -import org.exoplatform.commons.testing.mock.MockParentRequestContext; -import org.exoplatform.commons.testing.mock.MockResourceBundle; -import org.exoplatform.commons.testing.mock.MockWebUIRequestContext; -import org.exoplatform.commons.testing.mock.MockWebuiApplication; -import org.exoplatform.webui.application.WebuiRequestContext; - -/** - * Abstract TestCase to test a Webui UIComponent - */ -public abstract class AbstractWebuiTestCase extends TestCase { - - - protected MockWebuiApplication webuiApplication; - - public AbstractWebuiTestCase() throws Exception { - webuiApplication = new MockWebuiApplication(); - webuiApplication.setResourceBundle(new MockResourceBundle(new HashMap())); - } - - public final void setUp() throws Exception { - - initRequest(); - - doSetUp(); - } - - - - private void initRequest() { - MockWebUIRequestContext context = new MockWebUIRequestContext(new MockParentRequestContext(null, null), webuiApplication); - WebuiRequestContext.setCurrentInstance(context); - } - - protected void doSetUp() { - // to be overriden - } - - - - /** - * Convenience method to set an entry in the application resource bundle - * @param key - * @param value - */ - protected void setResourceBundleEntry(String key, String value) { - getAppRes().put(key, value); - } - - - /** - * Convenience method to access the app resource bundle mock - * @return - */ - private MockResourceBundle getAppRes() { - try { - return (MockResourceBundle) webuiApplication.getResourceBundle(null); - } catch (Exception e) { //we want to catch all exceptions here to know a testcase is false or not. - fail(e.getMessage()); - } - return null; - } - - - - -} diff --git a/pom.xml b/pom.xml index 69065dd79..89a397c31 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ io.meeds.commons commons - 7.1.x-SNAPSHOT + 7.1.x-meeds-qaui-SNAPSHOT pom Meeds:: PLF:: Commons @@ -51,8 +51,8 @@ - 7.1.x-SNAPSHOT - 7.1.x-SNAPSHOT + 7.1.x-meeds-qaui-SNAPSHOT + 7.1.x-meeds-qaui-SNAPSHOT meeds-io