From 2650b60f4748f1c7b7419660f6e8260695411fd8 Mon Sep 17 00:00:00 2001 From: moparisthebest Date: Thu, 10 May 2018 23:41:17 -0400 Subject: [PATCH] Remove now useless extra toType tests now that we test everything with toType --- .../moparisthebest/jdbc/codegen/QmDao.java | 6 ------ .../jdbc/codegen/QueryMapperQmDao.java | 12 ----------- .../jdbc/codegen/QueryMapperTypeQmDao.java | 11 ---------- .../moparisthebest/jdbc/QueryMapperTest.java | 21 ------------------- 4 files changed, 50 deletions(-) diff --git a/test/src/main/java/com/moparisthebest/jdbc/codegen/QmDao.java b/test/src/main/java/com/moparisthebest/jdbc/codegen/QmDao.java index bd7cc2b..ff22caf 100644 --- a/test/src/main/java/com/moparisthebest/jdbc/codegen/QmDao.java +++ b/test/src/main/java/com/moparisthebest/jdbc/codegen/QmDao.java @@ -176,15 +176,9 @@ public interface QmDao extends JdbcMapper { @SQL(bobTomMap) List> getBobTomMapCaseInsensitive() throws SQLException; - @SQL(bobTomMap) - List> getBobTomMapCaseInsensitiveType() throws SQLException; - @SQL(selectThreePeople) List getThreePeople(long personNo1, long personNo2, long personNo3) throws SQLException; - @SQL(selectThreePeople) - List getThreePeopleType(long personNo1, long personNo2, long personNo3) throws SQLException; - @SQL(selectThreePeople) ResultSetIterable getThreePeopleResultSetIterable(long personNo1, long personNo2, long personNo3) throws SQLException; diff --git a/test/src/main/java/com/moparisthebest/jdbc/codegen/QueryMapperQmDao.java b/test/src/main/java/com/moparisthebest/jdbc/codegen/QueryMapperQmDao.java index 1c44a4b..d9f9d10 100644 --- a/test/src/main/java/com/moparisthebest/jdbc/codegen/QueryMapperQmDao.java +++ b/test/src/main/java/com/moparisthebest/jdbc/codegen/QueryMapperQmDao.java @@ -2,7 +2,6 @@ package com.moparisthebest.jdbc.codegen; import com.moparisthebest.jdbc.QueryMapper; import com.moparisthebest.jdbc.ResultSetMapper; -import com.moparisthebest.jdbc.TypeReference; import com.moparisthebest.jdbc.dto.*; import com.moparisthebest.jdbc.util.CaseInsensitiveHashMap; import com.moparisthebest.jdbc.util.ResultSetIterable; @@ -262,23 +261,12 @@ public class QueryMapperQmDao implements QmDao { return (List>)(Object)qm.toListMap(bobTomMap, CaseInsensitiveHashMap.class, String.class); } - @Override - public List> getBobTomMapCaseInsensitiveType() throws SQLException { - return qm.toType(bobTomMap, new TypeReference>>() {}); - } - @Override public List getThreePeople(final long personNo1, final long personNo2, final long personNo3) throws SQLException { return qm.toList(selectThreePeople, FieldPerson.class, personNo1, personNo2, personNo3); } - @Override - public List getThreePeopleType(final long personNo1, final long personNo2, final long personNo3) throws SQLException { - return qm.toType(selectThreePeople, - new TypeReference>() {}, personNo1, personNo2, personNo3); - } - @Override public ResultSetIterable getThreePeopleResultSetIterable(final long personNo1, final long personNo2, final long personNo3) throws SQLException { return qm.toResultSetIterable(selectThreePeople, diff --git a/test/src/main/java/com/moparisthebest/jdbc/codegen/QueryMapperTypeQmDao.java b/test/src/main/java/com/moparisthebest/jdbc/codegen/QueryMapperTypeQmDao.java index 83d9312..424064e 100644 --- a/test/src/main/java/com/moparisthebest/jdbc/codegen/QueryMapperTypeQmDao.java +++ b/test/src/main/java/com/moparisthebest/jdbc/codegen/QueryMapperTypeQmDao.java @@ -215,23 +215,12 @@ public class QueryMapperTypeQmDao extends QueryMapperQmDao { return qm.toType(bobTomMap, new TypeReference>>() {}); } - @Override - public List> getBobTomMapCaseInsensitiveType() throws SQLException { - return qm.toType(bobTomMap, new TypeReference>>() {}); - } - @Override public List getThreePeople(final long personNo1, final long personNo2, final long personNo3) throws SQLException { return qm.toType(selectThreePeople, new TypeReference>() {}, personNo1, personNo2, personNo3); } - @Override - public List getThreePeopleType(final long personNo1, final long personNo2, final long personNo3) throws SQLException { - return qm.toType(selectThreePeople, - new TypeReference>() {}, personNo1, personNo2, personNo3); - } - @Override public ResultSetIterable getThreePeopleResultSetIterable(final long personNo1, final long personNo2, final long personNo3) throws SQLException { return qm.toType(selectThreePeople, diff --git a/test/src/test/java/com/moparisthebest/jdbc/QueryMapperTest.java b/test/src/test/java/com/moparisthebest/jdbc/QueryMapperTest.java index 0db033a..18d4399 100644 --- a/test/src/test/java/com/moparisthebest/jdbc/QueryMapperTest.java +++ b/test/src/test/java/com/moparisthebest/jdbc/QueryMapperTest.java @@ -455,33 +455,12 @@ public class QueryMapperTest { assertEquals("tom", map.get("TOM")); } - @Test - public void testCaseInsensitiveMapJdbcMapperType() throws Throwable { - final Map map = qm.getBobTomMapCaseInsensitiveType().get(0); - assertEquals("bob", map.get("bob")); - assertEquals("bob", map.get("Bob")); - assertEquals("bob", map.get("BoB")); - assertEquals("bob", map.get("BOb")); - assertEquals("bob", map.get("BOB")); - assertEquals("tom", map.get("tom")); - assertEquals("tom", map.get("Tom")); - assertEquals("tom", map.get("ToM")); - assertEquals("tom", map.get("TOm")); - assertEquals("tom", map.get("TOM")); - } - @Test public void testList() throws SQLException { final List fromDb = qm.getThreePeople(people[0].getPersonNo(), people[1].getPersonNo(), people[2].getPersonNo()); assertArrayEquals(people, fromDb.toArray()); } - @Test - public void testListType() throws SQLException { - final List fromDb = qm.getThreePeopleType(people[0].getPersonNo(), people[1].getPersonNo(), people[2].getPersonNo()); - assertArrayEquals(people, fromDb.toArray()); - } - @Test public void testListQueryMapperList() throws SQLException { if(!(qm instanceof QueryMapperQmDao))