Skip to content

Commit 7dd857e

Browse files
wumpzwumpz
committed
replace some junit pre 4.x artifacts
1 parent 49127be commit 7dd857e

File tree

9 files changed

+165
-164
lines changed

9 files changed

+165
-164
lines changed

‎src/test/java/net/sf/jsqlparser/schema/ServerTest.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package net.sf.jsqlparser.schema;
22

3+
import static org.junit.Assert.assertEquals;
4+
import org.junit.Test;
5+
36
/*
47
* #%L
58
* JSQLParser library
@@ -22,10 +25,10 @@
2225
* #L%
2326
*/
2427

25-
import junit.framework.*;
2628

27-
public class ServerTest extends TestCase {
29+
public class ServerTest {
2830

31+
@Test
2932
public void testServerNameParsing() throws Exception {
3033
final String serverName = "LOCALHOST";
3134

‎src/test/java/net/sf/jsqlparser/test/create/CreateIndexTest.java‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,22 @@
22

33
import java.io.StringReader;
44

5-
import junit.framework.TestCase;
65
import net.sf.jsqlparser.JSQLParserException;
76
import net.sf.jsqlparser.parser.CCJSqlParserManager;
87
import net.sf.jsqlparser.statement.create.index.CreateIndex;
98
import static net.sf.jsqlparser.test.TestUtils.*;
9+
import static org.junit.Assert.assertEquals;
10+
import static org.junit.Assert.assertNull;
11+
import org.junit.Test;
1012

1113
/**
1214
* @author Raymond Augé
1315
*/
14-
public class CreateIndexTest extends TestCase {
16+
public class CreateIndexTest {
1517

16-
private CCJSqlParserManager parserManager = new CCJSqlParserManager();
17-
18-
public CreateIndexTest(String arg0) {
19-
super(arg0);
20-
}
18+
private final CCJSqlParserManager parserManager = new CCJSqlParserManager();
2119

20+
@Test
2221
public void testCreateIndex() throws JSQLParserException {
2322
String statement =
2423
"CREATE INDEX myindex ON mytab (mycol, mycol2)";
@@ -31,6 +30,7 @@ public void testCreateIndex() throws JSQLParserException {
3130
assertEquals(statement, ""+createIndex);
3231
}
3332

33+
@Test
3434
public void testCreateIndex2() throws JSQLParserException {
3535
String statement =
3636
"CREATE mytype INDEX myindex ON mytab (mycol, mycol2)";
@@ -43,6 +43,7 @@ public void testCreateIndex2() throws JSQLParserException {
4343
assertEquals(statement, ""+createIndex);
4444
}
4545

46+
@Test
4647
public void testCreateIndex3() throws JSQLParserException {
4748
String statement =
4849
"CREATE mytype INDEX myindex ON mytab (mycol ASC, mycol2, mycol3)";
@@ -54,6 +55,7 @@ public void testCreateIndex3() throws JSQLParserException {
5455
assertEquals("mycol3", createIndex.getIndex().getColumnsNames().get(2));
5556
}
5657

58+
@Test
5759
public void testCreateIndex4() throws JSQLParserException {
5860
String statement =
5961
"CREATE mytype INDEX myindex ON mytab (mycol ASC, mycol2 (75), mycol3)";
@@ -65,6 +67,7 @@ public void testCreateIndex4() throws JSQLParserException {
6567
assertEquals("mycol3", createIndex.getIndex().getColumnsNames().get(2));
6668
}
6769

70+
@Test
6871
public void testCreateIndex5() throws JSQLParserException {
6972
String statement =
7073
"CREATE mytype INDEX myindex ON mytab (mycol ASC, mycol2 (75), mycol3) mymodifiers";
@@ -76,6 +79,7 @@ public void testCreateIndex5() throws JSQLParserException {
7679
assertEquals("mycol3", createIndex.getIndex().getColumnsNames().get(2));
7780
}
7881

82+
@Test
7983
public void testCreateIndex6() throws JSQLParserException {
8084
String stmt= "CREATE INDEX myindex ON mytab (mycol, mycol2)";
8185
assertSqlCanBeParsedAndDeparsed(stmt);

‎src/test/java/net/sf/jsqlparser/test/delete/DeleteTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package net.sf.jsqlparser.test.delete;
22

3-
import static junit.framework.Assert.assertEquals;
43
import static net.sf.jsqlparser.test.TestUtils.assertSqlCanBeParsedAndDeparsed;
54

65
import java.io.StringReader;
@@ -10,10 +9,11 @@
109
import net.sf.jsqlparser.JSQLParserException;
1110
import net.sf.jsqlparser.parser.CCJSqlParserManager;
1211
import net.sf.jsqlparser.statement.delete.Delete;
12+
import static org.junit.Assert.assertEquals;
1313

1414
public class DeleteTest {
1515

16-
private CCJSqlParserManager parserManager = new CCJSqlParserManager();
16+
private final CCJSqlParserManager parserManager = new CCJSqlParserManager();
1717

1818
@Test
1919
public void testDelete() throws JSQLParserException {

‎src/test/java/net/sf/jsqlparser/test/drop/DropTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,18 @@
22

33
import java.io.StringReader;
44

5-
import junit.framework.TestCase;
65
import net.sf.jsqlparser.JSQLParserException;
76
import net.sf.jsqlparser.parser.CCJSqlParserManager;
87
import net.sf.jsqlparser.statement.drop.Drop;
98
import static net.sf.jsqlparser.test.TestUtils.*;
9+
import static org.junit.Assert.assertEquals;
10+
import org.junit.Test;
1011

11-
public class DropTest extends TestCase {
12+
public class DropTest {
1213

13-
private CCJSqlParserManager parserManager = new CCJSqlParserManager();
14-
15-
public DropTest(String arg0) {
16-
super(arg0);
17-
}
14+
private final CCJSqlParserManager parserManager = new CCJSqlParserManager();
1815

16+
@Test
1917
public void testDrop() throws JSQLParserException {
2018
String statement = "DROP TABLE mytab";
2119
Drop drop = (Drop) parserManager.parse(new StringReader(statement));
@@ -31,12 +29,14 @@ public void testDrop() throws JSQLParserException {
3129
assertEquals(statement, "" + drop);
3230
}
3331

32+
@Test
3433
public void testDrop2() throws JSQLParserException {
3534
Drop drop = (Drop) parserManager.parse(new StringReader("DROP TABLE \"testtable\""));
3635
assertEquals("TABLE", drop.getType());
3736
assertEquals("\"testtable\"", drop.getName().getFullyQualifiedName());
3837
}
3938

39+
@Test
4040
public void testDropIfExists() throws JSQLParserException {
4141
assertSqlCanBeParsedAndDeparsed("DROP TABLE IF EXISTS my_table");
4242
}

‎src/test/java/net/sf/jsqlparser/test/select/HiveTest.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
package net.sf.jsqlparser.test.select;
22

3-
import junit.framework.*;
43
import net.sf.jsqlparser.parser.CCJSqlParserUtil;
54
import net.sf.jsqlparser.schema.Table;
65
import net.sf.jsqlparser.statement.Statement;
76
import net.sf.jsqlparser.statement.select.PlainSelect;
87
import net.sf.jsqlparser.statement.select.Select;
98

109
import static net.sf.jsqlparser.test.TestUtils.*;
10+
import static org.junit.Assert.assertEquals;
11+
import static org.junit.Assert.assertTrue;
12+
import org.junit.Test;
1113

1214
/**
1315
* Created by nhanitvn on 5/19/16.
1416
*/
15-
public class HiveTest extends TestCase {
17+
public class HiveTest {
1618

19+
@Test
1720
public void testLeftSemiJoin() throws Exception {
1821
String sql;
1922
Statement statement;

‎src/test/java/net/sf/jsqlparser/test/select/SpeedTest.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,21 @@
88
import java.util.Iterator;
99
import java.util.List;
1010

11-
import junit.framework.TestCase;
1211
import net.sf.jsqlparser.JSQLParserException;
1312
import net.sf.jsqlparser.parser.CCJSqlParserManager;
1413
import net.sf.jsqlparser.statement.Statement;
1514
import net.sf.jsqlparser.statement.select.Select;
1615
import net.sf.jsqlparser.test.TestException;
1716
import net.sf.jsqlparser.test.simpleparsing.CCJSqlParserManagerTest;
1817
import net.sf.jsqlparser.util.TablesNamesFinder;
18+
import org.junit.Test;
1919

20-
public class SpeedTest extends TestCase {
20+
public class SpeedTest {
2121

2222
private final static int NUM_REPS = 500;
23-
private CCJSqlParserManager parserManager = new CCJSqlParserManager();
24-
25-
public SpeedTest(String arg0) {
26-
super(arg0);
27-
}
23+
private final CCJSqlParserManager parserManager = new CCJSqlParserManager();
2824

25+
@Test
2926
public void testSpeed() throws Exception {
3027
// all the statements in testfiles/simple_parsing.txt
3128
BufferedReader in = new BufferedReader(new InputStreamReader(SpeedTest.class.getResourceAsStream("/simple_parsing.txt")));

‎src/test/java/net/sf/jsqlparser/test/simpleparsing/CCJSqlParserManagerTest.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,15 @@
44
import java.io.InputStreamReader;
55
import java.io.StringReader;
66

7-
import junit.framework.TestCase;
8-
97
import net.sf.jsqlparser.JSQLParserException;
108
import net.sf.jsqlparser.parser.CCJSqlParserManager;
119
import net.sf.jsqlparser.test.TestException;
1210
import net.sf.jsqlparser.test.create.CreateTableTest;
11+
import org.junit.Test;
1312

14-
public class CCJSqlParserManagerTest extends TestCase {
15-
16-
public CCJSqlParserManagerTest(String arg0) {
17-
super(arg0);
18-
}
13+
public class CCJSqlParserManagerTest {
1914

15+
@Test
2016
public void testParse() throws Exception {
2117
CCJSqlParserManager parserManager = new CCJSqlParserManager();
2218
BufferedReader in = new BufferedReader(new InputStreamReader(CreateTableTest.class.getResourceAsStream("/simple_parsing.txt")));

‎src/test/java/net/sf/jsqlparser/test/truncate/TruncateTest.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@
22

33
import java.io.StringReader;
44

5-
import junit.framework.TestCase;
65
import net.sf.jsqlparser.parser.CCJSqlParserManager;
76
import net.sf.jsqlparser.statement.truncate.Truncate;
7+
import static org.junit.Assert.assertEquals;
8+
import org.junit.Test;
89

9-
public class TruncateTest extends TestCase {
10+
public class TruncateTest {
1011

1112
private CCJSqlParserManager parserManager = new CCJSqlParserManager();
1213

13-
public TruncateTest(String arg0) {
14-
super(arg0);
15-
}
16-
14+
@Test
1715
public void testTruncate() throws Exception {
1816
String statement = "TRUncATE TABLE myschema.mytab";
1917
Truncate truncate = (Truncate) parserManager.parse(new StringReader(statement));

0 commit comments

Comments
 (0)