Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java?rev=829630&r1=829629&r2=829630&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java Sun Oct 25 19:01:12 2009 @@ -35,7 +35,6 @@ import org.apache.tiles.Definition; import org.apache.tiles.ListAttribute; import org.apache.tiles.definition.DefinitionsFactoryException; -import org.apache.tiles.definition.DefinitionsReader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -55,7 +54,7 @@ /** * The definitions reader. */ - private DefinitionsReader reader; + private DigesterDefinitionsReader reader; /** * Creates a new instance of TestDigesterDefinitionsReader. @@ -273,6 +272,7 @@ assertNotNull("Config file not found", configFile); InputStream source = configFile.openStream(); + reader.setValidating(true); reader.read(source); fail("Should've thrown an exception."); } catch (DefinitionsFactoryException e) {
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java?rev=829630&r1=829629&r2=829630&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java Sun Oct 25 19:01:12 2009 @@ -68,6 +68,9 @@ params.put(BasicRendererFactory.TYPE_RENDERERS_INIT_PARAM, "test," + StringAttributeRenderer.class.getName() + ";test2," + StringAttributeRenderer.class.getName()); + rendererFactory.registerRenderer("string", new StringAttributeRenderer()); + rendererFactory.registerRenderer("test", new StringAttributeRenderer()); + rendererFactory.registerRenderer("test2", new StringAttributeRenderer()); AttributeRenderer renderer = rendererFactory.getRenderer("string"); assertNotNull("The renderer is null", renderer); assertTrue("The class of the renderer is wrong", renderer instanceof StringAttributeRenderer); Modified: tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java?rev=829630&r1=829629&r2=829630&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java Sun Oct 25 19:01:12 2009 @@ -23,6 +23,14 @@ import java.util.HashMap; import java.util.Map; +import javax.el.ArrayELResolver; +import javax.el.BeanELResolver; +import javax.el.CompositeELResolver; +import javax.el.ELResolver; +import javax.el.ListELResolver; +import javax.el.MapELResolver; +import javax.el.ResourceBundleELResolver; + import junit.framework.TestCase; import org.apache.el.ExpressionFactoryImpl; @@ -74,6 +82,18 @@ evaluator.setApplicationContext(applicationContext); evaluator.setExpressionFactory(new ExpressionFactoryImpl()); + ELResolver elResolver = new CompositeELResolver() { + { + add(new TilesContextELResolver()); + add(new TilesContextBeanELResolver()); + add(new ArrayELResolver(false)); + add(new ListELResolver(false)); + add(new MapELResolver(false)); + add(new ResourceBundleELResolver()); + add(new BeanELResolver(false)); + } + }; + evaluator.setResolver(elResolver); } /**
