Skip to content

Commit

Permalink
make inner class protected
Browse files Browse the repository at this point in the history
  • Loading branch information
chenson42 committed Feb 16, 2012
1 parent fbf0ece commit 23863ab
Showing 1 changed file with 9 additions and 11 deletions.
Expand Up @@ -26,7 +26,7 @@
abstract public class AbstractWriterTest extends AbstractDbTest {

protected static IDatabasePlatform platform;

protected boolean errorExpected = true;

protected final static String TEST_TABLE = "test_dataloader_table";
Expand Down Expand Up @@ -65,13 +65,12 @@ protected void writeData(CsvData data, String[] expectedValues) {
writeData(data, expectedValues, TEST_COLUMNS);
}

protected void writeData(CsvData data, String[] expectedValues, String[] columnNames)
{
protected void writeData(CsvData data, String[] expectedValues, String[] columnNames) {
writeData(data, expectedValues, TEST_TABLE, TEST_KEYS, columnNames);
}

protected void writeData(CsvData data, String[] expectedValues, String tableName,
String[] keyNames, String[] columnNames) {
String[] keyNames, String[] columnNames) {
Table table = buildSourceTable(tableName, keyNames, columnNames);
writeData(new TableCsvData(table, data));
String[] pkData = data.getParsedData(CsvData.ROW_DATA);
Expand All @@ -86,8 +85,7 @@ protected long writeData(TableCsvData... datas) {
}

protected long writeData(IDataWriter writer, TableCsvData... datas) {
DataContext context = new DataContext(
null, writer);
DataContext context = new DataContext(null, writer);
writer.open(context);
try {
for (TableCsvData tableCsvData : datas) {
Expand All @@ -105,7 +103,7 @@ protected long writeData(IDataWriter writer, TableCsvData... datas) {
writer.end(batch, true);
if (!isErrorExpected()) {
if (ex instanceof RuntimeException) {
throw (RuntimeException)ex;
throw (RuntimeException) ex;
} else {
throw new RuntimeException(ex);
}
Expand Down Expand Up @@ -216,20 +214,20 @@ protected void assertEquals(String[] name, String[] expected, Map<String, Object
protected String printDatabase() {
return " The database we are testing against is " + platform.getName() + ".";
}

protected boolean isOracle() {
return DatabaseNamesConstants.ORACLE.equals(platform.getName());
}

public void setErrorExpected(boolean errorExpected) {
this.errorExpected = errorExpected;
}

public boolean isErrorExpected() {
return errorExpected;
}

class TableCsvData {
protected class TableCsvData {
Table table;
List<CsvData> data;

Expand Down

0 comments on commit 23863ab

Please sign in to comment.