You are viewing a plain text version of this content. The canonical link for it is here.
Posted to torque-dev@db.apache.org by tv...@apache.org on 2016/07/27 12:29:47 UTC
svn commit: r1754264 - in
/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque:
BaseDatabaseTestCase.java DataTest.java InitShutdownTest.java
util/SummaryHelperTest.java
Author: tv
Date: Wed Jul 27 12:29:47 2016
New Revision: 1754264
URL: http://svn.apache.org/viewvc?rev=1754264&view=rev
Log:
Fix several warnings
Modified:
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BaseDatabaseTestCase.java
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/InitShutdownTest.java
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/SummaryHelperTest.java
Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BaseDatabaseTestCase.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BaseDatabaseTestCase.java?rev=1754264&r1=1754263&r2=1754264&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BaseDatabaseTestCase.java (original)
+++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BaseDatabaseTestCase.java Wed Jul 27 12:29:47 2016
@@ -85,7 +85,7 @@ public abstract class BaseDatabaseTestCa
"getMysqlVersion called but database adapter is "
+ adapter.getClass().getName());
}
- List<String> records = new BasePeerImpl().doSelect(
+ List<String> records = new BasePeerImpl<String>().doSelect(
"show variables like \"version\"",
new StringMapper(1),
(String) null);
Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java?rev=1754264&r1=1754263&r2=1754264&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java (original)
+++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java Wed Jul 27 12:29:47 2016
@@ -1404,6 +1404,9 @@ public class DataTest extends BaseDataba
static class DoNothingMapper implements RecordMapper<Object>
{
+ /** Serial version */
+ private static final long serialVersionUID = 1L;
+
public Object processRow(
final ResultSet resultSet,
final int rowOffset,
Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/InitShutdownTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/InitShutdownTest.java?rev=1754264&r1=1754263&r2=1754264&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/InitShutdownTest.java (original)
+++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/InitShutdownTest.java Wed Jul 27 12:29:47 2016
@@ -26,17 +26,11 @@ import junit.framework.TestCase;
import org.apache.torque.criteria.Criteria;
import org.apache.torque.test.dbobject.OIntegerPk;
import org.apache.torque.test.dbobject.PIntegerPk;
-import org.apache.torque.test.peer.NonPkOIntegerFkPeer;
-import org.apache.torque.test.peer.NonPkPIntegerFkPeer;
-import org.apache.torque.test.peer.NullableOIntegerFkPeer;
-import org.apache.torque.test.peer.NullablePIntegerFkPeer;
import org.apache.torque.test.peer.OIntegerPkPeer;
import org.apache.torque.test.peer.PIntegerPkPeer;
-import org.apache.torque.test.peer.RequiredOIntegerFkPeer;
-import org.apache.torque.test.peer.RequiredPIntegerFkPeer;
/**
- * Tests initialisation and shutdown of Torque.
+ * Tests initialization and shutdown of Torque.
*
* @version $Id$
*/
Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/SummaryHelperTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/SummaryHelperTest.java?rev=1754264&r1=1754263&r2=1754264&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/SummaryHelperTest.java (original)
+++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/SummaryHelperTest.java Wed Jul 27 12:29:47 2016
@@ -123,7 +123,7 @@ public class SummaryHelperTest extends B
summary.addAggregate("SUM_FLOAT1", new Sum(Summarize1Peer.FLOAT1));
returnTypes.add(Float.class);
- List<ListOrderedMapCI> results = summary.summarize(c, returnTypes);
+ List<ListOrderedMapCI<Object>> results = summary.summarize(c, returnTypes);
StringWriter out = new StringWriter();
summary.dumpResults(out, results, true);
@@ -134,7 +134,7 @@ public class SummaryHelperTest extends B
assertTrue("Invalid number of records returned. Expected 4 but got " +
results.size(), results.size() == 4 );
- ListOrderedMapCI rec = results.get(0);
+ ListOrderedMapCI<Object> rec = results.get(0);
assertTrue( "GROUP_BY1 valued not correct",
"A1".equals(rec.get("GROUP_BY1").toString()) );
@@ -203,7 +203,7 @@ public class SummaryHelperTest extends B
summary.addAggregate("SUM_FLOAT1", new Sum(Summarize1Peer.FLOAT1));
returnTypes.add(Float.class);
- List<ListOrderedMapCI> results = summary.summarize(c, returnTypes);
+ List<ListOrderedMapCI<Object>> results = summary.summarize(c, returnTypes);
StringWriter out = new StringWriter();
summary.dumpResults(out, results, true);
@@ -214,7 +214,7 @@ public class SummaryHelperTest extends B
assertTrue("Invalid number of records returned. Expected 1 but got " +
results.size(), results.size() == 1 );
- ListOrderedMapCI rec = results.get(0);
+ ListOrderedMapCI<Object> rec = results.get(0);
assertTrue( "Number of columns incorrect! Did ExcludeExpColumns work? " +
"Expected 9 but got " + rec.size(), rec.size() == 9 );
@@ -278,7 +278,7 @@ public class SummaryHelperTest extends B
summary.addAggregate("SUM_FLOAT1", new Sum(Summarize1Peer.FLOAT1));
returnTypes.add(Float.class);
- List<ListOrderedMapCI> results = summary.summarize(c, returnTypes);
+ List<ListOrderedMapCI<Object>> results = summary.summarize(c, returnTypes);
StringWriter out = new StringWriter();
summary.dumpResults(out, results, true);
@@ -289,7 +289,7 @@ public class SummaryHelperTest extends B
assertTrue("Invalid number of records returned. Expected 1 but got " +
results.size(), results.size() == 1 );
- ListOrderedMapCI rec = results.get(0);
+ ListOrderedMapCI<Object> rec = results.get(0);
assertTrue("COUNT_RECS not correct value",
((Integer) rec.get("COUNT_RECS")).intValue() == 4 );
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org