[richfaces-svn-commits] JBoss Rich Faces SVN: r22150 - in branches/4.0.X/ui/validator/ui/src: test/java/org/richfaces/javascript and 1 other directory.
Author: alexsmirnov
Date: 2011-03-10 17:49:07 -0500 (Thu, 10 Mar 2011)
New Revision: 22150
Modified:
branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/javascript/ClientScriptServiceImpl.java
branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/javascript/ClientScriptServiceTest.java
Log:
RESOLVED - issue RF-10719: Validation: several javascript files not found
https://issues.jboss.org/browse/RF-10719
Discussed with Nick.
Modified:
branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/javascript/ClientScriptServiceImpl.java
===================================================================
---
branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/javascript/ClientScriptServiceImpl.java 2011-03-10
20:49:40 UTC (rev 22149)
+++
branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/javascript/ClientScriptServiceImpl.java 2011-03-10
22:49:07 UTC (rev 22150)
@@ -78,7 +78,7 @@
if (null == facesContext || null == javaClass) {
throw new NullPointerException();
}
- LibraryFunction function = getFromComputationMap(resourcesMapping, javaClass);
+ LibraryFunction function = NO_SCRIPT;// RF-10719, temporary disable.
getFromComputationMap(resourcesMapping, javaClass);
if(NO_SCRIPT == function) {
if (defaultMapping.containsKey(javaClass)) {
function = defaultMapping.get(javaClass);
Modified:
branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/javascript/ClientScriptServiceTest.java
===================================================================
---
branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/javascript/ClientScriptServiceTest.java 2011-03-10
20:49:40 UTC (rev 22149)
+++
branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/javascript/ClientScriptServiceTest.java 2011-03-10
22:49:07 UTC (rev 22150)
@@ -20,6 +20,7 @@
import org.jboss.test.faces.mock.MockTestRunner;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.richfaces.resource.ResourceKey;
@@ -84,6 +85,7 @@
* @throws Exception
*/
@Test
+ @Ignore
public void testGetScriptAsJsfResource() throws Exception {
LibraryFunction script = getScript(resource, ValidatorWithFacesResource.class);
assertEquals(RESOURCE_NAME, getOnlyResource(script).getResourceName());
@@ -119,7 +121,7 @@
}
private LibraryFunction getScript(Resource resource, Class<?> serverSideType)
throws ScriptNotFoundException {
- expect(resourceHandler.createResource(serverSideType.getSimpleName() +
".js", ORG_RICHFACES_CSV, TEXT_JAVASCRIPT)).andReturn(resource);
+// expect(resourceHandler.createResource(serverSideType.getSimpleName() +
".js", ORG_RICHFACES_CSV, TEXT_JAVASCRIPT)).andReturn(resource);
controller.replay();
LibraryFunction script = serviceImpl.getScript(environment.getFacesContext(),
serverSideType);
return script;