Apache/commons-csv
1
0
Fork 0
mirror of https://github.com/apache/commons-csv.git synced 2025-02-28 05:49:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor test to better abstract set up of fixture.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1638110 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary D. Gregory 2014-11-11 14:05:34 +00:00
parent 4471e9d66a
commit a6e69b2a5e
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/test/java/org/apache/commons/csv/CSVPrinterTest.java
View File

@ -222,9 +222,9 @@ public class CSVPrinterTest {
public void testJdbcPrinter() throws IOException, ClassNotFoundException, SQLException {
final StringWriter sw = new StringWriter();
final Connection connection = geH2Connection();
setUpTable(connection);
try {
final Statement stmt = connection.createStatement();
setUpTable(stmt);
final CSVPrinter printer = new CSVPrinter(sw, CSVFormat.DEFAULT);
printer.printRecords(stmt.executeQuery("select ID, NAME from TEST"));
assertEquals("1,r1" + recordSeparator + "2,r2" + recordSeparator, sw.toString());
@ -239,11 +239,11 @@ public class CSVPrinterTest {
final StringWriter sw = new StringWriter();
Class.forName("org.h2.Driver");
final Connection connection = geH2Connection();
setUpTable(connection);
try {
@SuppressWarnings("resource")
// Closed when the connection is closed.
final Statement stmt = connection.createStatement();
setUpTable(stmt);
@SuppressWarnings("resource")
// Closed when the connection is closed.
final ResultSet resultSet = stmt.executeQuery("select ID, NAME from TEST");
@ -262,11 +262,11 @@ public class CSVPrinterTest {
final StringWriter sw = new StringWriter();
Class.forName("org.h2.Driver");
final Connection connection = geH2Connection();
setUpTable(connection);
try {
@SuppressWarnings("resource")
// Closed when the connection is closed.
final Statement stmt = connection.createStatement();
setUpTable(stmt);
@SuppressWarnings("resource")
// Closed when the connection is closed.
final ResultSet resultSet = stmt.executeQuery("select ID, NAME from TEST");
@ -280,10 +280,15 @@ public class CSVPrinterTest {
}
}
private void setUpTable(final Statement stmt) throws SQLException {
stmt.execute("CREATE TABLE TEST(ID INT PRIMARY KEY, NAME VARCHAR(255))");
stmt.execute("insert into TEST values(1, 'r1')");
stmt.execute("insert into TEST values(2, 'r2')");
private void setUpTable(final Connection connection) throws SQLException {
Statement statement = connection.createStatement();
try {
statement.execute("CREATE TABLE TEST(ID INT PRIMARY KEY, NAME VARCHAR(255))");
statement.execute("insert into TEST values(1, 'r1')");
statement.execute("insert into TEST values(2, 'r2')");
} finally {
statement.close();
}
}
@Test