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/02 10:41:08 UTC
(myfaces) branch 2.3-next updated: MYFACES-4636
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch 2.3-next
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/2.3-next by this push:
new 627e97b45 MYFACES-4636
627e97b45 is described below
commit 627e97b451c4d6d37df358120369161096e777a2
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Thu Nov 2 11:37:42 2023 +0100
MYFACES-4636
---
impl/pom.xml | 8 +++
.../renderkit/html/util/AjaxScriptBuilder.java | 4 +-
.../renderkit/html/util/AjaxScriptBuilderTest.java | 73 ++++++++++++++++++++++
.../apache/myfaces/test/mock/MockApplication.java | 28 ++++++++-
4 files changed, 110 insertions(+), 3 deletions(-)
diff --git a/impl/pom.xml b/impl/pom.xml
index 1f95c075a..5946da1a3 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -716,6 +716,14 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>11</source>
+ <target>11</target>
+ </configuration>
+ </plugin>
</plugins>
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 e20a71540..9b6ce7b92 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
@@ -258,8 +258,8 @@ public class AjaxScriptBuilder
}
}
paramsBuilder.append(R_C_BRACE);
- sb.append(AJAX_KEY_PARAMS+COLON);
- sb.append(paramsBuilder);
+
+ appendProperty(sb, AJAX_KEY_PARAMS, paramsBuilder, false);
}
sb.append(R_C_BRACE);
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..a8955af87
--- /dev/null
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/util/AjaxScriptBuilderTest.java
@@ -0,0 +1,73 @@
+package org.apache.myfaces.renderkit.html.util;
+
+import org.apache.myfaces.component.search.*;
+import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
+import org.apache.myfaces.test.mock.MockApplication;
+import org.junit.Assert;
+import org.junit.Test;
+
+import javax.faces.FactoryFinder;
+import javax.faces.component.UIComponentMock;
+import javax.faces.component.behavior.ClientBehaviorContext;
+import javax.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 ce915a2ff..d0e2d0e30 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
@@ -19,6 +19,9 @@
package org.apache.myfaces.test.mock;
+import javax.faces.component.search.SearchExpressionHandler;
+import javax.faces.component.search.SearchKeywordResolver;
+
/**
* <p>Mock implementation of <code>Application</code> that includes the semantics
* added by JavaServer Faces 2.3.</p>
@@ -29,6 +32,29 @@ package org.apache.myfaces.test.mock;
*/
public class MockApplication extends MockApplication22
{
-
+ private SearchExpressionHandler searchExpressionHandler;
+ private SearchKeywordResolver searchKeywordResolver;
+
+ @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;
+ }
}