You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2007/03/09 14:08:37 UTC
svn commit: r516403 - in /tiles/framework/trunk:
tiles-core/src/test/java/org/apache/tiles/definition/
tiles-core/src/test/java/org/apache/tiles/definition/digester/
tiles-core/src/test/java/org/apache/tiles/factory/
tiles-test/src/main/java/org/apache...
Author: apetrelli
Date: Fri Mar 9 05:08:36 2007
New Revision: 516403
URL: http://svn.apache.org/viewvc?view=rev&rev=516403
Log:
TILES-128
Cleaned Java 5 support for test classes and for tiles-test.
Modified:
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockComponentDefinitions.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestComponentDefinitions.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestReloadableDefinitionsFactory.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/KeyedDefinitionsFactoryTilesContainerFactoryTest.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/TilesContainerFactoryTest.java
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/servlet/SelectLocaleServlet.java
Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockComponentDefinitions.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockComponentDefinitions.java?view=diff&rev=516403&r1=516402&r2=516403
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockComponentDefinitions.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockComponentDefinitions.java Fri Mar 9 05:08:36 2007
@@ -24,6 +24,8 @@
package org.apache.tiles.definition;
import java.util.Locale;
+import java.util.Map;
+
import org.apache.tiles.definition.ComponentDefinitions;
import org.apache.tiles.definition.NoSuchDefinitionException;
import org.apache.tiles.definition.ComponentDefinition;
@@ -69,7 +71,8 @@
* @param defsMap The new definitions to add.
* @param locale The locale to add the definitions to.
*/
- public void addDefinitions(java.util.Map defsMap, java.util.Locale locale) {
+ public void addDefinitions(Map<String, ComponentDefinition> defsMap,
+ java.util.Locale locale) {
}
/**
@@ -90,7 +93,7 @@
*
* @param defsMap The new definitions to add.
*/
- public void addDefinitions(java.util.Map defsMap) {
+ public void addDefinitions(Map<String, ComponentDefinition> defsMap) {
}
/**
@@ -114,7 +117,7 @@
/**
* Returns base definitions collection;
*/
- public java.util.Map getBaseDefinitions() {
+ public Map<String, ComponentDefinition> getBaseDefinitions() {
return null;
}
Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java?view=diff&rev=516403&r1=516402&r2=516403
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java Fri Mar 9 05:08:36 2007
@@ -26,6 +26,7 @@
import org.apache.tiles.definition.DefinitionsFactoryException;
import java.util.Collections;
+import java.util.Map;
/**
* Mock Defintions Reader implementation. Stubs out all functionality.
@@ -62,7 +63,8 @@
* @throws org.apache.tiles.definition.DefinitionsFactoryException if the source is invalid or
* an error occurs when reading definitions.
*/
- public java.util.Map read(Object source) throws DefinitionsFactoryException {
+ @SuppressWarnings("unchecked")
+ public Map<String, ComponentDefinition> read(Object source) throws DefinitionsFactoryException {
return Collections.EMPTY_MAP;
}
@@ -75,7 +77,7 @@
* @throws org.apache.tiles.definition.DefinitionsFactoryException if required properties are not
* passed in or the initialization fails.
*/
- public void init(java.util.Map params) throws DefinitionsFactoryException {
+ public void init(Map<String, String> params) throws DefinitionsFactoryException {
}
}
Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java?view=diff&rev=516403&r1=516402&r2=516403
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java Fri Mar 9 05:08:36 2007
@@ -71,7 +71,7 @@
return null;
}
- public Map getApplicationScope() {
+ public Map<String, Object> getApplicationScope() {
return null;
}
@@ -83,7 +83,7 @@
return null;
}
- public Map getInitParams() {
+ public Map<String, String> getInitParams() {
return null;
}
Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestComponentDefinitions.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestComponentDefinitions.java?view=diff&rev=516403&r1=516402&r2=516403
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestComponentDefinitions.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestComponentDefinitions.java Fri Mar 9 05:08:36 2007
@@ -68,7 +68,7 @@
* Tests the inheritance properties of ComponentDefinition objects.
*/
public void testResolveInheritances() {
- Map defs = new HashMap();
+ Map<String, ComponentDefinition> defs = new HashMap<String, ComponentDefinition>();
ComponentDefinition def = new ComponentDefinition();
def.setName("parent.def1");
@@ -114,7 +114,7 @@
* Tests the inheritance with localized definitions.
*/
public void testLocalizedResolveInheritances() {
- Map defs = new HashMap();
+ Map<String, ComponentDefinition> defs = new HashMap<String, ComponentDefinition>();
ComponentDefinition def = new ComponentDefinition();
def.setName("parent.def1");
def.setTemplate("/test1.jsp");
@@ -133,7 +133,7 @@
def.addAttribute(attr);
defs.put(def.getName(), def);
- Map localDefs = new HashMap();
+ Map<String, ComponentDefinition> localDefs = new HashMap<String, ComponentDefinition>();
def = new ComponentDefinition();
def.setName("child.def1");
def.setExtends("parent.def1");
@@ -184,7 +184,7 @@
* Tests the reset method.
*/
public void testReset() {
- Map defs = new HashMap();
+ Map<String, ComponentDefinition> defs = new HashMap<String, ComponentDefinition>();
ComponentDefinition def = new ComponentDefinition();
def.setName("parent.def1");
@@ -227,7 +227,7 @@
* executed and attribute dependencies are calculated.
*/
public void testResolveAttributeDependencies() {
- Map defs = new HashMap();
+ Map<String, ComponentDefinition> defs = new HashMap<String, ComponentDefinition>();
ComponentDefinition def = new ComponentDefinition();
def.setName("parent.def1");
Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestReloadableDefinitionsFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestReloadableDefinitionsFactory.java?view=diff&rev=516403&r1=516402&r2=516403
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestReloadableDefinitionsFactory.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestReloadableDefinitionsFactory.java Fri Mar 9 05:08:36 2007
@@ -121,7 +121,7 @@
writer.write(xml);
writer.close();
- factory.init(new HashMap());
+ factory.init(new HashMap<String, String>());
factory.addSource(url);
// Parse files.
Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java?view=diff&rev=516403&r1=516402&r2=516403
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java Fri Mar 9 05:08:36 2007
@@ -76,6 +76,7 @@
/**
* Tests the readDefinitions method under normal conditions.
*/
+ @SuppressWarnings("unchecked")
public void testReadDefinitions() throws Exception {
DefinitionsFactory factory = new UrlDefinitionsFactory();
@@ -106,6 +107,7 @@
/**
* Tests the getDefinition method.
*/
+ @SuppressWarnings("unchecked")
public void testGetDefinition() throws Exception {
DefinitionsFactory factory = new UrlDefinitionsFactory();
@@ -168,6 +170,7 @@
/**
* Tests addSource with a bad source object type.
*/
+ @SuppressWarnings("unchecked")
public void testBadSourceType() throws Exception {
try {
DefinitionsFactory factory = new UrlDefinitionsFactory();
@@ -185,6 +188,7 @@
* Tests the addDefinitions method under normal
* circumstances.
*/
+ @SuppressWarnings("unchecked")
public void testReadByLocale() throws Exception {
MockPublicUrlDefinitionsFactory factory = new MockPublicUrlDefinitionsFactory();
@@ -229,6 +233,7 @@
/**
* Tests the isContextProcessed method.
*/
+ @SuppressWarnings("unchecked")
public void testIsContextProcessed() throws Exception {
MockPublicUrlDefinitionsFactory factory = new MockPublicUrlDefinitionsFactory();
@@ -256,7 +261,7 @@
* Tests the reader init param.
*/
public void testReaderParam() throws Exception {
- Map params = new HashMap();
+ Map<String, String> params = new HashMap<String, String>();
params.put(DefinitionsFactory.READER_IMPL_PROPERTY,
"org.apache.tiles.definition.MockDefinitionsReader");
Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java?view=diff&rev=516403&r1=516402&r2=516403
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java Fri Mar 9 05:08:36 2007
@@ -70,25 +70,23 @@
public void testRead() {
try {
DefinitionsReader reader = new DigesterDefinitionsReader();
- reader.init(new HashMap());
+ reader.init(new HashMap<String, String>());
URL configFile = this.getClass().getClassLoader().getResource(
"org/apache/tiles/config/tiles-defs.xml");
assertNotNull("Config file not found", configFile);
InputStream source = configFile.openStream();
- Map definitions = reader.read(source);
+ Map<String, ComponentDefinition> definitions = reader.read(source);
assertNotNull("Definitions not returned.", definitions);
assertNotNull("Couldn't find doc.mainLayout tile.",
- (ComponentDefinition) definitions.get("doc.mainLayout"));
- assertNotNull("Couldn't Find title attribute.",
- ((ComponentDefinition) definitions.get("doc.mainLayout"))
- .getAttribute("title"));
+ definitions.get("doc.mainLayout"));
+ assertNotNull("Couldn't Find title attribute.", definitions.get(
+ "doc.mainLayout").getAttribute("title"));
assertEquals("Incorrect Find title attribute.",
- "Tiles Library Documentation",
- ((ComponentDefinition) definitions.get("doc.mainLayout"))
- .getAttribute("title"));
+ "Tiles Library Documentation", definitions.get(
+ "doc.mainLayout").getAttribute("title"));
} catch (Exception e) {
fail("Exception reading configuration." + e);
@@ -110,7 +108,7 @@
assertNotNull("Config file not found", configFile);
InputStream source = configFile.openStream();
- Map definitions = reader.read(source);
+ reader.read(source);
fail("Should've thrown exception.");
} catch (DefinitionsFactoryException e) {
@@ -127,13 +125,13 @@
try {
// Create Digester Reader.
DefinitionsReader reader = new DigesterDefinitionsReader();
- Map params = new HashMap();
+ Map<String, String> params = new HashMap<String, String>();
// Initialize reader.
reader.init(params);
// Read definitions.
- Map definitions = reader.read(new String("Bad Input"));
+ reader.read(new String("Bad Input"));
fail("Should've thrown an exception.");
} catch (DefinitionsFactoryException e) {
// correct.
@@ -148,14 +146,14 @@
public void testBadXml() {
try {
DefinitionsReader reader = new DigesterDefinitionsReader();
- reader.init(new HashMap());
+ reader.init(new HashMap<String, String>());
URL configFile = this.getClass().getClassLoader().getResource(
"org/apache/tiles/config/malformed-defs.xml");
assertNotNull("Config file not found", configFile);
InputStream source = configFile.openStream();
- Map definitions = reader.read(source);
+ reader.read(source);
fail("Should've thrown an exception.");
} catch (DefinitionsFactoryException e) {
// correct.
Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/KeyedDefinitionsFactoryTilesContainerFactoryTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/KeyedDefinitionsFactoryTilesContainerFactoryTest.java?view=diff&rev=516403&r1=516402&r2=516403
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/KeyedDefinitionsFactoryTilesContainerFactoryTest.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/KeyedDefinitionsFactoryTilesContainerFactoryTest.java Fri Mar 9 05:08:36 2007
@@ -68,7 +68,7 @@
}
public void testCreateContainer() throws TilesException, MalformedURLException {
- Vector enumeration = new Vector();
+ Vector<String> enumeration = new Vector<String>();
EasyMock.expect(context.getInitParameter(TilesContainerFactory.CONTAINER_FACTORY_INIT_PARAM)).andReturn(null);
EasyMock.expect(context.getInitParameter(TilesContainerFactory.CONTEXT_FACTORY_INIT_PARAM)).andReturn(null);
EasyMock.expect(context.getInitParameter(TilesContainerFactory.DEFINITIONS_FACTORY_INIT_PARAM)).andReturn(null);
Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/TilesContainerFactoryTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/TilesContainerFactoryTest.java?view=diff&rev=516403&r1=516402&r2=516403
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/TilesContainerFactoryTest.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/TilesContainerFactoryTest.java Fri Mar 9 05:08:36 2007
@@ -48,8 +48,8 @@
}
public void testGetFactory() throws TilesException {
- Vector v = new Vector();
- Vector emptyVector = new Vector();
+ Vector<String> v = new Vector<String>();
+ Vector<String> emptyVector = new Vector<String>();
v.add(TilesContainerFactory.CONTAINER_FACTORY_INIT_PARAM);
EasyMock.expect(context.getInitParameterNames()).andReturn(v.elements());
@@ -92,7 +92,7 @@
public void testCreateContainer() throws TilesException, MalformedURLException {
URL url = getClass().getResource("test-defs.xml");
- Vector enumeration = new Vector();
+ Vector<String> enumeration = new Vector<String>();
EasyMock.expect(context.getInitParameter(TilesContainerFactory.CONTAINER_FACTORY_INIT_PARAM)).andReturn(null);
EasyMock.expect(context.getInitParameter(TilesContainerFactory.CONTEXT_FACTORY_INIT_PARAM)).andReturn(null);
EasyMock.expect(context.getInitParameter(TilesContainerFactory.DEFINITIONS_FACTORY_INIT_PARAM)).andReturn(null);
@@ -116,7 +116,7 @@
}
public void testGetInitParameterMap() throws TilesException {
- Vector keys = new Vector();
+ Vector<String> keys = new Vector<String>();
keys.add("one");
keys.add("two");
@@ -127,8 +127,7 @@
EasyMock.expect(context.getInitParameter("two")).andReturn("twoValue").anyTimes();
EasyMock.replay(context);
- TilesContainerFactory factory = TilesContainerFactory.getFactory(context);
- Map map = factory.getInitParameterMap(context);
+ Map<String, String> map = TilesContainerFactory.getInitParameterMap(context);
assertEquals(2, map.size());
assertTrue(map.containsKey("one"));
Modified: tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/servlet/SelectLocaleServlet.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/servlet/SelectLocaleServlet.java?view=diff&rev=516403&r1=516402&r2=516403
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/servlet/SelectLocaleServlet.java (original)
+++ tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/servlet/SelectLocaleServlet.java Fri Mar 9 05:08:36 2007
@@ -55,7 +55,7 @@
private void process(HttpServletRequest request,
HttpServletResponse response) throws ServletException, IOException {
- String localeParameter = (String) request.getParameter("locale");
+ String localeParameter = request.getParameter("locale");
HttpSession session = request.getSession();
Locale locale = null;
if (localeParameter != null && localeParameter.trim().length() > 0) {