junit upgrade to 4.10

toben · toben · commit 44b0d01d1957 · 2012-05-13T14:35:33.000+02:00
diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>3.8.2</version>
+			<version>4.10</version>
 		</dependency>
 	</dependencies>
 
@@ -26,7 +26,7 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.0.2</version>
+				<version>2.4</version>
 				<configuration>
 					<source>1.6</source>
 					<target>1.6</target>
diff --git a/src/test/java/net/sf/jsqlparser/test/create/CreateTableTest.java b/src/test/java/net/sf/jsqlparser/test/create/CreateTableTest.java
@@ -158,9 +158,4 @@ private String getLine(BufferedReader in) throws Exception {
 
 		return line;
 	}
-
-	public static void main(String[] args) {
-		junit.swingui.TestRunner.run(CreateTableTest.class);
-	}
-
 }
diff --git a/src/test/java/net/sf/jsqlparser/test/delete/DeleteTest.java b/src/test/java/net/sf/jsqlparser/test/delete/DeleteTest.java
@@ -21,9 +21,4 @@ public void testDelete() throws JSQLParserException {
 		assertEquals("mytable", delete.getTable().getName());
 		assertEquals(statement, "" + delete);
 	}
-
-	public static void main(String[] args) {
-		junit.swingui.TestRunner.run(DeleteTest.class);
-	}
-
 }
diff --git a/src/test/java/net/sf/jsqlparser/test/drop/DropTest.java b/src/test/java/net/sf/jsqlparser/test/drop/DropTest.java
@@ -28,9 +28,4 @@ public void testDrop() throws JSQLParserException {
 		assertEquals("CASCADE", drop.getParameters().get(0));
 		assertEquals(statement, "" + drop);
 	}
-
-	public static void main(String[] args) {
-		junit.swingui.TestRunner.run(DropTest.class);
-	}
-
 }
diff --git a/src/test/java/net/sf/jsqlparser/test/insert/InsertTest.java b/src/test/java/net/sf/jsqlparser/test/insert/InsertTest.java
@@ -76,9 +76,4 @@ public void testInsertFromSelect() throws JSQLParserException {
 		String statementToString = "INSERT INTO mytable (col1, col2, col3) (SELECT * FROM mytable2)";
 		assertEquals(statementToString, "" + insert);
 	}
-
-	public static void main(String[] args) {
-		junit.swingui.TestRunner.run(InsertTest.class);
-	}
-
 }
diff --git a/src/test/java/net/sf/jsqlparser/test/replace/ReplaceTest.java b/src/test/java/net/sf/jsqlparser/test/replace/ReplaceTest.java
@@ -61,9 +61,4 @@ public void testReplaceSyntax3() throws JSQLParserException {
 		// TODO:
 		// assertEquals(statement, ""+replace);
 	}
-
-	public static void main(String[] args) {
-		junit.swingui.TestRunner.run(ReplaceTest.class);
-	}
-
 }
diff --git a/src/test/java/net/sf/jsqlparser/test/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/test/select/SelectTest.java
@@ -589,9 +589,4 @@ private void assertExpressionCanBeDeparsedAs(final Expression parsed, String exp
 
 		assertEquals(expression, stringBuffer.toString());
 	}
-
-	public static void main(String[] args) {
-		junit.swingui.TestRunner.run(SelectTest.class);
-	}
-
 }
diff --git a/src/test/java/net/sf/jsqlparser/test/simpleparsing/CCJSqlParserManagerTest.java b/src/test/java/net/sf/jsqlparser/test/simpleparsing/CCJSqlParserManagerTest.java
@@ -18,11 +18,7 @@ public class CCJSqlParserManagerTest extends TestCase {
 	public CCJSqlParserManagerTest(String arg0) {
 		super(arg0);
 	}
-
-	public static void main(String[] args) {
-		junit.swingui.TestRunner.run(CCJSqlParserManagerTest.class);
-	}
-
+	
 	public void testParse() throws Exception {
 		CCJSqlParserManager parserManager = new CCJSqlParserManager();
 		BufferedReader in = new BufferedReader( new InputStreamReader( CreateTableTest.class.getResourceAsStream( "/simple_parsing.txt" ) ) );
diff --git a/src/test/java/net/sf/jsqlparser/test/tablesfinder/TablesNamesFinderTest.java b/src/test/java/net/sf/jsqlparser/test/tablesfinder/TablesNamesFinderTest.java
@@ -24,10 +24,6 @@ public TablesNamesFinderTest(String arg0) {
 		super(arg0);
 	}
 
-	public static void main(String[] args) {
-		junit.swingui.TestRunner.run(TablesNamesFinderTest.class);
-	}
-
 	public void testRUBiSTableList() throws Exception {
 
 	    BufferedReader in = new BufferedReader( new InputStreamReader( CreateTableTest.class.getResourceAsStream( "/RUBiS-select-requests.txt" ) ) );
diff --git a/src/test/java/net/sf/jsqlparser/test/truncate/TruncateTest.java b/src/test/java/net/sf/jsqlparser/test/truncate/TruncateTest.java
@@ -26,9 +26,4 @@ public void testTruncate() throws Exception {
 		assertEquals("mytab", truncate.getTable().getName());
 		assertEquals(toStringStatement.toUpperCase(), truncate.toString().toUpperCase());
 	}
-
-	public static void main(String[] args) {
-		junit.swingui.TestRunner.run(TruncateTest.class);
-	}
-
 }
diff --git a/src/test/java/net/sf/jsqlparser/test/update/UpdateTest.java b/src/test/java/net/sf/jsqlparser/test/update/UpdateTest.java
@@ -38,9 +38,4 @@ public void testUpdateWAlias() throws JSQLParserException {
 		String statement = "UPDATE table1 A SET A.column = 'XXX' WHERE A.cod_table = 'YYY'";
 		Update update = (Update) parserManager.parse(new StringReader(statement));
 	}
-
-	public static void main(String[] args) {
-		junit.swingui.TestRunner.run(UpdateTest.class);
-	}
-
 }

Original file line number	Diff line number	Diff line change
`@@ -158,9 +158,4 @@ private String getLine(BufferedReader in) throws Exception {`
`158`	`158`
`159`	`159`	`return line;`
`160`	`160`	`}`
`161`		`-`
`162`		`- public static void main(String[] args) {`
`163`		`- junit.swingui.TestRunner.run(CreateTableTest.class);`
`164`		`- }`
`165`		`-`
`166`	`161`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,4 @@ public void testDelete() throws JSQLParserException {`
`21`	`21`	`assertEquals("mytable", delete.getTable().getName());`
`22`	`22`	`assertEquals(statement, "" + delete);`
`23`	`23`	`}`
`24`		`-`
`25`		`- public static void main(String[] args) {`
`26`		`- junit.swingui.TestRunner.run(DeleteTest.class);`
`27`		`- }`
`28`		`-`
`29`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,4 @@ public void testDrop() throws JSQLParserException {`
`28`	`28`	`assertEquals("CASCADE", drop.getParameters().get(0));`
`29`	`29`	`assertEquals(statement, "" + drop);`
`30`	`30`	`}`
`31`		`-`
`32`		`- public static void main(String[] args) {`
`33`		`- junit.swingui.TestRunner.run(DropTest.class);`
`34`		`- }`
`35`		`-`
`36`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,9 +76,4 @@ public void testInsertFromSelect() throws JSQLParserException {`
`76`	`76`	`String statementToString = "INSERT INTO mytable (col1, col2, col3) (SELECT * FROM mytable2)";`
`77`	`77`	`assertEquals(statementToString, "" + insert);`
`78`	`78`	`}`
`79`		`-`
`80`		`- public static void main(String[] args) {`
`81`		`- junit.swingui.TestRunner.run(InsertTest.class);`
`82`		`- }`
`83`		`-`
`84`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,9 +61,4 @@ public void testReplaceSyntax3() throws JSQLParserException {`
`61`	`61`	`// TODO:`
`62`	`62`	`// assertEquals(statement, ""+replace);`
`63`	`63`	`}`
`64`		`-`
`65`		`- public static void main(String[] args) {`
`66`		`- junit.swingui.TestRunner.run(ReplaceTest.class);`
`67`		`- }`
`68`		`-`
`69`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -589,9 +589,4 @@ private void assertExpressionCanBeDeparsedAs(final Expression parsed, String exp`
`589`	`589`
`590`	`590`	`assertEquals(expression, stringBuffer.toString());`
`591`	`591`	`}`
`592`		`-`
`593`		`- public static void main(String[] args) {`
`594`		`- junit.swingui.TestRunner.run(SelectTest.class);`
`595`		`- }`
`596`		`-`
`597`	`592`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,6 @@ public TablesNamesFinderTest(String arg0) {`
`24`	`24`	`super(arg0);`
`25`	`25`	`}`
`26`	`26`
`27`		`- public static void main(String[] args) {`
`28`		`- junit.swingui.TestRunner.run(TablesNamesFinderTest.class);`
`29`		`- }`
`30`		`-`
`31`	`27`	`public void testRUBiSTableList() throws Exception {`
`32`	`28`
`33`	`29`	`BufferedReader in = new BufferedReader( new InputStreamReader( CreateTableTest.class.getResourceAsStream( "/RUBiS-select-requests.txt" ) ) );`
Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,4 @@ public void testTruncate() throws Exception {`
`26`	`26`	`assertEquals("mytab", truncate.getTable().getName());`
`27`	`27`	`assertEquals(toStringStatement.toUpperCase(), truncate.toString().toUpperCase());`
`28`	`28`	`}`
`29`		`-`
`30`		`- public static void main(String[] args) {`
`31`		`- junit.swingui.TestRunner.run(TruncateTest.class);`
`32`		`- }`
`33`		`-`
`34`	`29`	`}`