This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-dbutils.git
The following commit(s) were added to refs/heads/master by this push: new 6f047d4 Use Map API directly. 6f047d4 is described below commit 6f047d4a779ade84e06f7b7e66712d4a9d8ba030 Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Sun May 24 17:01:25 2020 -0400 Use Map API directly. --- .../java/org/apache/commons/dbutils/BasicRowProcessorTest.java | 4 ++-- .../org/apache/commons/dbutils/handlers/KeyedHandlerTest.java | 8 ++++---- .../java/org/apache/commons/dbutils/handlers/MapHandlerTest.java | 2 +- .../org/apache/commons/dbutils/handlers/MapListHandlerTest.java | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/test/java/org/apache/commons/dbutils/BasicRowProcessorTest.java b/src/test/java/org/apache/commons/dbutils/BasicRowProcessorTest.java index 49458ea..349cd97 100644 --- a/src/test/java/org/apache/commons/dbutils/BasicRowProcessorTest.java +++ b/src/test/java/org/apache/commons/dbutils/BasicRowProcessorTest.java @@ -122,14 +122,14 @@ public class BasicRowProcessorTest extends BaseTestCase { assertTrue(this.rs.next()); Map<String, Object> m = processor.toMap(this.rs); - assertEquals(COLS, m.keySet().size()); + assertEquals(COLS, m.size()); assertEquals("1", m.get("one")); assertEquals("2", m.get("TWO")); assertEquals("THREE", m.get("Three")); assertTrue(this.rs.next()); m = processor.toMap(this.rs); - assertEquals(COLS, m.keySet().size()); + assertEquals(COLS, m.size()); assertEquals("4", m.get("One")); // case shouldn't matter assertEquals("5", m.get("two")); diff --git a/src/test/java/org/apache/commons/dbutils/handlers/KeyedHandlerTest.java b/src/test/java/org/apache/commons/dbutils/handlers/KeyedHandlerTest.java index 717529c..da3fc14 100644 --- a/src/test/java/org/apache/commons/dbutils/handlers/KeyedHandlerTest.java +++ b/src/test/java/org/apache/commons/dbutils/handlers/KeyedHandlerTest.java @@ -42,7 +42,7 @@ public class KeyedHandlerTest extends BaseTestCase { row = entry.getValue(); assertNotNull(row); assertTrue(row.isEmpty()); - assertEquals(0, row.keySet().size()); + assertEquals(0, row.size()); } } @@ -61,7 +61,7 @@ public class KeyedHandlerTest extends BaseTestCase { assertNotNull(key); row = entry.getValue(); assertNotNull(row); - assertEquals(COLS, row.keySet().size()); + assertEquals(COLS, row.size()); } row = results.get("1"); assertEquals("1", row.get("one")); @@ -83,7 +83,7 @@ public class KeyedHandlerTest extends BaseTestCase { assertNotNull(key); row = entry.getValue(); assertNotNull(row); - assertEquals(COLS, row.keySet().size()); + assertEquals(COLS, row.size()); } row = results.get("5"); assertEquals("4", row.get("one")); @@ -105,7 +105,7 @@ public class KeyedHandlerTest extends BaseTestCase { assertNotNull(key); row = entry.getValue(); assertNotNull(row); - assertEquals(COLS, row.keySet().size()); + assertEquals(COLS, row.size()); } row = results.get(Integer.valueOf(3)); assertEquals("4", row.get("one")); diff --git a/src/test/java/org/apache/commons/dbutils/handlers/MapHandlerTest.java b/src/test/java/org/apache/commons/dbutils/handlers/MapHandlerTest.java index 1bbc07e..62f6cff 100644 --- a/src/test/java/org/apache/commons/dbutils/handlers/MapHandlerTest.java +++ b/src/test/java/org/apache/commons/dbutils/handlers/MapHandlerTest.java @@ -32,7 +32,7 @@ public class MapHandlerTest extends BaseTestCase { final Map<String,Object> results = h.handle(this.rs); assertNotNull(results); - assertEquals(COLS, results.keySet().size()); + assertEquals(COLS, results.size()); assertEquals("1", results.get("ONE")); assertEquals("2", results.get("two")); assertEquals("THREE", results.get("Three")); diff --git a/src/test/java/org/apache/commons/dbutils/handlers/MapListHandlerTest.java b/src/test/java/org/apache/commons/dbutils/handlers/MapListHandlerTest.java index e7eb5a7..2f29f26 100644 --- a/src/test/java/org/apache/commons/dbutils/handlers/MapListHandlerTest.java +++ b/src/test/java/org/apache/commons/dbutils/handlers/MapListHandlerTest.java @@ -40,14 +40,14 @@ public class MapListHandlerTest extends BaseTestCase { Map<String,Object> row = null; assertTrue(iter.hasNext()); row = iter.next(); - assertEquals(COLS, row.keySet().size()); + assertEquals(COLS, row.size()); assertEquals("1", row.get("one")); assertEquals("2", row.get("TWO")); assertEquals("THREE", row.get("Three")); assertTrue(iter.hasNext()); row = iter.next(); - assertEquals(COLS, row.keySet().size()); + assertEquals(COLS, row.size()); assertEquals("4", row.get("one")); assertEquals("5", row.get("TWO"));