[qdox-scm] [1401] trunk/qdox/src/test/java/com/thoughtworks/qdox/parser: Fix some generics for tests

Tue, 11 Oct 2011 13:36:52 -0700

Title: [1401] trunk/qdox/src/test/java/com/thoughtworks/qdox/parser: Fix some generics for tests
Revision
1401
Author
rfscholte
Date
2011-10-11 15:36:47 -0500 (Tue, 11 Oct 2011)

Log Message

Fix some generics for tests

Modified Paths

Diff

Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/util/TagParserTest.java (1400 => 1401)

--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/util/TagParserTest.java	2011-10-11 20:27:39 UTC (rev 1400)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/util/TagParserTest.java	2011-10-11 20:36:47 UTC (rev 1401)
@@ -16,7 +16,7 @@
     //---( Parse into named parameters )---
     
     public void testEmptyInputContainsNoNamedParameters() {
-        Map paramMap = TagParser.parseNamedParameters("");
+        Map<String, String> paramMap = TagParser.parseNamedParameters("");
         assertNotNull(paramMap);
         assertTrue(paramMap.isEmpty());
     }
@@ -48,14 +48,14 @@
     }
 
     public void testCanParseSimpleNamedParameters() {
-        Map paramMap = TagParser.parseNamedParameters("x=foo");
+        Map<String, String> paramMap = TagParser.parseNamedParameters("x=foo");
         assertNotNull(paramMap);
         assertEquals(1, paramMap.size());
         assertEquals("foo", paramMap.get("x"));
     }
 
     public void testCanParseMultipleNamedParameters() {
-        Map paramMap = TagParser.parseNamedParameters("x=foo y=bar");
+        Map<String, String> paramMap = TagParser.parseNamedParameters("x=foo y=bar");
         assertNotNull(paramMap);
         assertEquals(2, paramMap.size());
         assertEquals("foo", paramMap.get("x"));
@@ -63,11 +63,11 @@
     }
 
     public void testNamedParametersAreReturnedInOrderDeclared() {
-        Map paramMap = TagParser.parseNamedParameters(
+        Map<String, String> paramMap = TagParser.parseNamedParameters(
             "x=foo y=bar a=orses b=oney"
         );
         assertEquals(4, paramMap.size());
-        Iterator keyIterator = paramMap.keySet().iterator();
+        Iterator<String> keyIterator = paramMap.keySet().iterator();
         assertEquals("x", keyIterator.next());
         assertEquals("y", keyIterator.next());
         assertEquals("a", keyIterator.next());
@@ -75,7 +75,7 @@
     }
 
     public void testNamedParameterValuesCanBeSingleQuoted() {
-        Map paramMap = TagParser.parseNamedParameters("x='foo' y='bar fly'");
+        Map<String, String> paramMap = TagParser.parseNamedParameters("x='foo' y='bar fly'");
         assertNotNull(paramMap);
         assertEquals(2, paramMap.size());
         assertEquals("foo", paramMap.get("x"));
@@ -83,7 +83,7 @@
     }
 
     public void testNamedParameterValuesCanBeDoubleQuoted() {
-        Map paramMap = TagParser.parseNamedParameters("x=\"'foo'\" y=\"bar fly\"");
+        Map<String, String> paramMap = TagParser.parseNamedParameters("x=\"'foo'\" y=\"bar fly\"");
         assertNotNull(paramMap);
         assertEquals(2, paramMap.size());
         assertEquals("'foo'", paramMap.get("x"));
@@ -91,7 +91,7 @@
     }
 
     public void testNamedParametersCanHaveSpacesAroundEquals() {
-        Map paramMap = TagParser.parseNamedParameters("x = foo y = 'bar'");
+        Map<String, String> paramMap = TagParser.parseNamedParameters("x = foo y = 'bar'");
         assertNotNull(paramMap);
         assertEquals(2, paramMap.size());
         assertEquals("foo", paramMap.get("x"));
@@ -99,7 +99,7 @@
     }
 
     public void testNamedParameterNamesCanContainHypensEtc() {
-        Map paramMap = TagParser.parseNamedParameters("x.a = '1'  x-b = '2'  x_c = '3'");
+        Map<String, String> paramMap = TagParser.parseNamedParameters("x.a = '1'  x-b = '2'  x_c = '3'");
         assertNotNull(paramMap);
         assertEquals(3, paramMap.size());
         assertEquals("1", paramMap.get("x.a"));
@@ -108,7 +108,7 @@
     }
 
     public void testNamedParameterValuesCanBeNumeric() {
-        Map paramMap = TagParser.parseNamedParameters("x=1 y=2");
+        Map<String, String> paramMap = TagParser.parseNamedParameters("x=1 y=2");
         assertNotNull(paramMap);
         assertEquals(2, paramMap.size());
         assertEquals("1", paramMap.get("x"));
@@ -116,7 +116,7 @@
     }
 
     public void testNamedParameterValuesCanSpanLinesIfBackslashIsUsed() {
-        Map paramMap = TagParser.parseNamedParameters("x='multiline\\\nvalue'");
+        Map<String, String> paramMap = TagParser.parseNamedParameters("x='multiline\\\nvalue'");
         assertNotNull(paramMap);
         assertEquals(1, paramMap.size());
         assertEquals("multiline\nvalue", paramMap.get("x"));

Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/parser/LexerTest.java (1400 => 1401)

--- trunk/qdox/src/test/java/com/thoughtworks/qdox/parser/LexerTest.java	2011-10-11 20:27:39 UTC (rev 1400)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/parser/LexerTest.java	2011-10-11 20:36:47 UTC (rev 1401)
@@ -1,6 +1,5 @@
 package com.thoughtworks.qdox.parser;
 
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.StringReader;
 import java.lang.reflect.Field;
@@ -14,10 +13,10 @@
 
 public class LexerTest extends TestCase {
 
-    private static Map tokens;
+    private static Map<Integer, String> tokens;
 
     static {
-        tokens = new HashMap();
+        tokens = new HashMap<Integer, String>();
         Field[] tokenFlds = Parser.class.getDeclaredFields();
         for (int i = 0; i < tokenFlds.length; i++) {
             Field f = tokenFlds[i];

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to