Skip to content

Commit 2afbbfb

Browse files
committed
Removing unnecessary suite() methods, object attributes and constructors
git-svn-id: https://svn.apache.org/repos/asf/commons/sandbox/csv/trunk@631847 13f79535-47bb-0310-9956-ffa450edef68
1 parent aab25c2 commit 2afbbfb

4 files changed

Lines changed: 8 additions & 68 deletions

File tree

src/test/org/apache/commons/csv/CSVParserTest.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -59,23 +59,6 @@ public String testNextToken() throws IOException {
5959
}
6060
}
6161

62-
/**
63-
* Constructor for JUnit.
64-
* @param name Name to be used in JUnit Test Environment
65-
*/
66-
public CSVParserTest(String name) {
67-
super(name);
68-
}
69-
70-
/**
71-
* Returns a Test suite for JUnit.
72-
* @return Test suite for JUnit
73-
*/
74-
public static Test suite() {
75-
return new TestSuite(CSVParserTest.class);
76-
}
77-
78-
7962
// ======================================================
8063
// lexer tests
8164
// ======================================================

src/test/org/apache/commons/csv/CSVPrinterTest.java

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,7 @@
2626
*/
2727
public class CSVPrinterTest extends TestCase {
2828

29-
String lineSeparator = null;
30-
31-
/**
32-
* Constructor for CSVPrinterTest.
33-
*/
34-
public CSVPrinterTest(String name) {
35-
super(name);
36-
this.lineSeparator = System.getProperty("line.separator");
37-
}
38-
39-
public static Test suite() {
40-
return new TestSuite(CSVPrinterTest.class);
41-
}
29+
String lineSeparator = System.getProperty("line.separator");
4230

4331
public void testPrinter1() {
4432
StringWriter sw = new StringWriter();

src/test/org/apache/commons/csv/CSVStrategyTest.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,6 @@
3232
* has problems...).
3333
*/
3434
public class CSVStrategyTest extends TestCase {
35-
36-
/**
37-
* Constructor for JUnit.
38-
* @param name Name to be used in JUnit Test Environment
39-
*/
40-
public CSVStrategyTest(String name) {
41-
super(name);
42-
}
43-
44-
/**
45-
* Returns a Test suite for JUnit.
46-
* @return Test suite for JUnit
47-
*/
48-
public static Test suite() {
49-
return new TestSuite(CSVStrategyTest.class);
50-
}
51-
5235

5336
// ======================================================
5437
// getters / setters

src/test/org/apache/commons/csv/ExtendedBufferedReaderTest.java

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -29,33 +29,19 @@
2929
*/
3030
public class ExtendedBufferedReaderTest extends TestCase {
3131

32-
private ExtendedBufferedReader br = null;
33-
34-
/**
35-
* Constructor for ExtendedBufferedReaderTest.
36-
* @param arg0
37-
*/
38-
public ExtendedBufferedReaderTest(String arg0) {
39-
super(arg0);
40-
}
41-
42-
public static Test suite() {
43-
return new TestSuite(ExtendedBufferedReaderTest.class);
44-
}
45-
4632
// ======================================================
4733
// the test cases
4834
// ======================================================
4935

5036
public void testConstructors() {
51-
br = new ExtendedBufferedReader(new StringReader(""));
37+
ExtendedBufferedReader br = new ExtendedBufferedReader(new StringReader(""));
5238
br = new ExtendedBufferedReader(new StringReader(""), 10);
5339
}
5440

5541
public void testReadLookahead1() throws Exception {
5642

5743
assertEquals(ExtendedBufferedReader.END_OF_STREAM, getEBR("").read());
58-
br = getEBR("1\n2\r3\n");
44+
ExtendedBufferedReader br = getEBR("1\n2\r3\n");
5945
assertEquals('1', br.lookAhead());
6046
assertEquals(ExtendedBufferedReader.UNDEFINED, br.readAgain());
6147
assertEquals('1', br.read());
@@ -109,7 +95,7 @@ public void testReadLookahead2() throws Exception {
10995
char[] ref = new char[5];
11096
char[] res = new char[5];
11197

112-
br = getEBR("");
98+
ExtendedBufferedReader br = getEBR("");
11399
assertEquals(0, br.read(res, 0, 0));
114100
assertTrue(Arrays.equals(res, ref));
115101

@@ -134,7 +120,7 @@ public void testMarkSupported() {
134120
}
135121

136122
public void testReadLine() throws Exception {
137-
br = getEBR("");
123+
ExtendedBufferedReader br = getEBR("");
138124
assertTrue(br.readLine() == null);
139125

140126
br = getEBR("\n");
@@ -177,7 +163,7 @@ public void testReadLine() throws Exception {
177163

178164
public void testSkip0() throws Exception {
179165

180-
br = getEBR("");
166+
ExtendedBufferedReader br = getEBR("");
181167
assertEquals(0, br.skip(0));
182168
assertEquals(0, br.skip(1));
183169

@@ -203,7 +189,7 @@ public void testSkip0() throws Exception {
203189
}
204190

205191
public void testSkipUntil() throws Exception {
206-
br = getEBR("");
192+
ExtendedBufferedReader br = getEBR("");
207193
assertEquals(0, br.skipUntil(';'));
208194
br = getEBR("ABCDEF,GHL,,MN");
209195
assertEquals(6, br.skipUntil(','));
@@ -217,7 +203,7 @@ public void testSkipUntil() throws Exception {
217203
}
218204

219205
public void testReadUntil() throws Exception {
220-
br = getEBR("");
206+
ExtendedBufferedReader br = getEBR("");
221207
assertTrue(br.readUntil(';').equals(""));
222208
br = getEBR("ABCDEF;GHL;;MN");
223209
assertTrue(br.readUntil(';').equals("ABCDEF"));

0 commit comments

Comments
 (0)