You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by oh...@apache.org on 2010/01/27 07:56:48 UTC
svn commit: r903551 -
/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestInMemoryConfiguration.java
Author: oheger
Date: Wed Jan 27 06:56:48 2010
New Revision: 903551
URL: http://svn.apache.org/viewvc?rev=903551&view=rev
Log:
Fixed raw type warnings.
Modified:
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestInMemoryConfiguration.java
Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestInMemoryConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestInMemoryConfiguration.java?rev=903551&r1=903550&r2=903551&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestInMemoryConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestInMemoryConfiguration.java Wed Jan 27 06:56:48 2010
@@ -134,17 +134,17 @@
Object prop = config.getProperty("tables.table(0).fields.field.name");
assertNotNull(prop);
- assertTrue(prop instanceof Collection);
+ assertTrue(prop instanceof Collection<?>);
assertEquals(5, ((Collection<?>) prop).size());
prop = config.getProperty("tables.table.fields.field.name");
assertNotNull(prop);
- assertTrue(prop instanceof Collection);
+ assertTrue(prop instanceof Collection<?>);
assertEquals(10, ((Collection<?>) prop).size());
prop = config.getProperty("tables.table.fields.field(3).name");
assertNotNull(prop);
- assertTrue(prop instanceof Collection);
+ assertTrue(prop instanceof Collection<?>);
assertEquals(2, ((Collection<?>) prop).size());
prop = config.getProperty("tables.table(1).fields.field(2).name");
@@ -204,14 +204,14 @@
config.clearTree("tables.table(0).fields.field(3)");
prop = config.getProperty("tables.table(0).fields.field.name");
assertNotNull(prop);
- assertTrue(prop instanceof Collection);
+ assertTrue(prop instanceof Collection<?>);
assertEquals(4, ((Collection<?>) prop).size());
config.clearTree("tables.table(0).fields");
assertNull(config.getProperty("tables.table(0).fields.field.name"));
prop = config.getProperty("tables.table.fields.field.name");
assertNotNull(prop);
- assertTrue(prop instanceof Collection);
+ assertTrue(prop instanceof Collection<?>);
assertEquals(5, ((Collection<?>) prop).size());
config.clearTree("tables.table(1)");
@@ -383,13 +383,13 @@
config.addProperty("tables.table(0).fields.field(-1).name", "phone");
Object prop = config.getProperty("tables.table(0).fields.field.name");
assertNotNull(prop);
- assertTrue(prop instanceof Collection);
+ assertTrue(prop instanceof Collection<?>);
assertEquals(6, ((Collection<?>) prop).size());
config.addProperty("tables.table(0).fields.field.name", "fax");
prop = config.getProperty("tables.table.fields.field(5).name");
assertNotNull(prop);
- assertTrue(prop instanceof List);
+ assertTrue(prop instanceof List<?>);
List<?> list = (List<?>) prop;
assertEquals("phone", list.get(0));
assertEquals("fax", list.get(1));
@@ -397,14 +397,14 @@
config.addProperty("tables.table(-1).name", "config");
prop = config.getProperty("tables.table.name");
assertNotNull(prop);
- assertTrue(prop instanceof Collection);
+ assertTrue(prop instanceof Collection<?>);
assertEquals(3, ((Collection<?>) prop).size());
config.addProperty("tables.table(2).fields.field(0).name", "cid");
config.addProperty("tables.table(2).fields.field(-1).name",
"confName");
prop = config.getProperty("tables.table(2).fields.field.name");
assertNotNull(prop);
- assertTrue(prop instanceof Collection);
+ assertTrue(prop instanceof Collection<?>);
assertEquals(2, ((Collection<?>) prop).size());
assertEquals("confName",
config.getProperty("tables.table(2).fields.field(1).name"));
@@ -469,7 +469,7 @@
Object prop = subset.getProperty("fields.field.name");
assertNotNull(prop);
- assertTrue(prop instanceof Collection);
+ assertTrue(prop instanceof Collection<?>);
assertEquals(5, ((Collection<?>) prop).size());
for (int i = 0; i < FIELDS[0].length; i++)
@@ -486,7 +486,7 @@
// test the subset on the FIELDS
subset = config.subset("tables.table.fields.field");
prop = subset.getProperty("name");
- assertTrue("prop is not a collection", prop instanceof Collection);
+ assertTrue("prop is not a collection", prop instanceof Collection<?>);
assertEquals(10, ((Collection<?>) prop).size());
assertEquals(FIELDS[0][0], subset.getProperty("name(0)"));
@@ -1094,17 +1094,17 @@
Object prop = config.getProperty("tables/table[0]/fields/field/name");
assertNotNull(prop);
- assertTrue(prop instanceof Collection);
+ assertTrue(prop instanceof Collection<?>);
assertEquals(5, ((Collection<?>) prop).size());
prop = config.getProperty("tables/table/fields/field/name");
assertNotNull(prop);
- assertTrue(prop instanceof Collection);
+ assertTrue(prop instanceof Collection<?>);
assertEquals(10, ((Collection<?>) prop).size());
prop = config.getProperty("tables/table/fields/field[3]/name");
assertNotNull(prop);
- assertTrue(prop instanceof Collection);
+ assertTrue(prop instanceof Collection<?>);
assertEquals(2, ((Collection<?>) prop).size());
prop = config.getProperty("tables/table[1]/fields/field[2]/name");