You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2023/11/03 10:03:13 UTC
(myfaces) branch 3.0.x updated: MYFACES-4636
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch 3.0.x
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/3.0.x by this push:
new fa30d547b MYFACES-4636
fa30d547b is described below
commit fa30d547b50594dfd08fa8426d5448d3c697023b
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Fri Nov 3 11:03:02 2023 +0100
MYFACES-4636
---
.../renderkit/html/util/AjaxScriptBuilder.java | 6 +-
.../renderkit/html/util/AjaxScriptBuilderTest.java | 88 ++++++++++++++++++++++
.../apache/myfaces/test/mock/MockApplication.java | 36 +++++++--
3 files changed, 119 insertions(+), 11 deletions(-)
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/util/AjaxScriptBuilder.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/util/AjaxScriptBuilder.java
index a190cac0c..1978d0eae 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/util/AjaxScriptBuilder.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/util/AjaxScriptBuilder.java
@@ -277,12 +277,8 @@ public class AjaxScriptBuilder
}
}
-
-
paramsBuilder.append(R_C_BRACE);
- sb.append(AJAX_KEY_PARAMS);
- sb.append(COLON);
- sb.append(paramsBuilder);
+ appendProperty(sb, AJAX_KEY_PARAMS, paramsBuilder, false);
}
}
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/util/AjaxScriptBuilderTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/util/AjaxScriptBuilderTest.java
new file mode 100644
index 000000000..a1bc8f13e
--- /dev/null
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/util/AjaxScriptBuilderTest.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2007 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.myfaces.renderkit.html.util;
+
+import org.apache.myfaces.component.search.*;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
+import org.apache.myfaces.test.mock.MockApplication;
+import org.junit.Assert;
+import org.junit.Test;
+
+import jakarta.faces.FactoryFinder;
+import jakarta.faces.component.UIComponentMock;
+import jakarta.faces.component.behavior.ClientBehaviorContext;
+import jakarta.faces.context.FacesContext;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class AjaxScriptBuilderTest extends AbstractJsfTestCase
+{
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+
+ FactoryFinder.setFactory(FactoryFinder.SEARCH_EXPRESSION_CONTEXT_FACTORY,
+ SearchExpressionContextFactoryImpl.class.getName());
+
+ MockApplication mockApplication = (MockApplication) FacesContext.getCurrentInstance().getApplication();
+ mockApplication.setSearchExpressionHandler(new SearchExpressionHandlerImpl());
+
+ CompositeSearchKeywordResolver baseResolver = new CompositeSearchKeywordResolver();
+ baseResolver.add(new ThisSearchKeywordResolver());
+ baseResolver.add(new ParentSearchKeywordResolver());
+ baseResolver.add(new ChildSearchKeywordResolver());
+ baseResolver.add(new CompositeComponentParentSearchKeywordResolver());
+ baseResolver.add(new FormSearchKeywordResolver());
+ baseResolver.add(new NamingContainerSearchKeywordResolver());
+ baseResolver.add(new NextSearchKeywordResolver());
+ baseResolver.add(new NoneSearchKeywordResolver());
+ baseResolver.add(new PreviousSearchKeywordResolver());
+ baseResolver.add(new RootSearchKeywordResolver());
+ baseResolver.add(new IdSearchKeywordResolver());
+ baseResolver.add(new AllSearchKeywordResolver());
+ mockApplication.setSearchKeywordResolver(baseResolver);
+ }
+
+ @Test
+ public void test()
+ {
+ UIComponentMock component = new UIComponentMock();
+ component.setId("test");
+
+ List<ClientBehaviorContext.Parameter> params = new ArrayList<>();
+ params.add(new ClientBehaviorContext.Parameter("var1", "NEW VALUE"));
+
+ StringBuilder sb = new StringBuilder();
+ AjaxScriptBuilder.build(FacesContext.getCurrentInstance(),
+ sb,
+ component,
+ "j_id_i",
+ "click",
+ Arrays.asList("@this"),
+ null,
+ null,
+ false,
+ null,
+ "testJs",
+ params);
+
+ String script = sb.toString();
+
+ Assert.assertFalse(script.contains("':testJsparams:{"));
+ Assert.assertTrue(script.contains("':testJs,'params':{"));
+ }
+}
diff --git a/test/src/main/java/org/apache/myfaces/test/mock/MockApplication.java b/test/src/main/java/org/apache/myfaces/test/mock/MockApplication.java
index 2e44d3ed9..ef1a446c9 100644
--- a/test/src/main/java/org/apache/myfaces/test/mock/MockApplication.java
+++ b/test/src/main/java/org/apache/myfaces/test/mock/MockApplication.java
@@ -21,12 +21,10 @@ package org.apache.myfaces.test.mock;
import jakarta.faces.FacesException;
import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.search.SearchExpressionHandler;
+import jakarta.faces.component.search.SearchKeywordResolver;
import jakarta.faces.context.FacesContext;
-import jakarta.faces.el.MethodBinding;
-import jakarta.faces.el.PropertyResolver;
-import jakarta.faces.el.ReferenceSyntaxException;
-import jakarta.faces.el.ValueBinding;
-import jakarta.faces.el.VariableResolver;
+import jakarta.faces.el.*;
/**
* <p>Mock implementation of <code>Application</code> that includes the semantics
@@ -40,13 +38,39 @@ public class MockApplication extends MockApplication22
{
private VariableResolver variableResolver;
private PropertyResolver propertyResolver;
-
+ private SearchExpressionHandler searchExpressionHandler;
+ private SearchKeywordResolver searchKeywordResolver;
+
public MockApplication()
{
setVariableResolver(new MockVariableResolver());
setPropertyResolver(new MockPropertyResolver());
}
+ @Override
+ public SearchExpressionHandler getSearchExpressionHandler()
+ {
+ return searchExpressionHandler;
+ }
+
+ @Override
+ public void setSearchExpressionHandler(SearchExpressionHandler searchExpressionHandler)
+ {
+ this.searchExpressionHandler = searchExpressionHandler;
+ }
+
+ @Override
+ public SearchKeywordResolver getSearchKeywordResolver()
+ {
+ return searchKeywordResolver;
+ }
+
+ public void setSearchKeywordResolver(SearchKeywordResolver searchKeywordResolver)
+ {
+ this.searchKeywordResolver = searchKeywordResolver;
+ }
+
+
@Override
public UIComponent createComponent(ValueBinding componentBinding, FacesContext context, String componentType)
throws FacesException