diff --git a/pmd-plsql/pom.xml b/pmd-plsql/pom.xml
index f2b349e98f..d23562dfd7 100644
--- a/pmd-plsql/pom.xml
+++ b/pmd-plsql/pom.xml
@@ -88,8 +88,13 @@
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter
+ test
+
+
+ org.junit.platform
+ junit-platform-suite
test
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/LanguageVersionDiscovererTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/LanguageVersionDiscovererTest.java
index 8343dbfca8..8adf75d708 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/LanguageVersionDiscovererTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/LanguageVersionDiscovererTest.java
@@ -4,29 +4,29 @@
package net.sourceforge.pmd;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.File;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.LanguageRegistry;
import net.sourceforge.pmd.lang.LanguageVersion;
import net.sourceforge.pmd.lang.LanguageVersionDiscoverer;
import net.sourceforge.pmd.lang.plsql.PLSQLLanguageModule;
-public class LanguageVersionDiscovererTest {
+class LanguageVersionDiscovererTest {
/**
* Test on PLSQL file with default version
*/
@Test
- public void testPlsql() {
+ void testPlsql() {
LanguageVersionDiscoverer discoverer = new LanguageVersionDiscoverer();
File plsqlFile = new File("/path/to/MY_PACKAGE.sql");
LanguageVersion languageVersion = discoverer.getDefaultLanguageVersionForFile(plsqlFile);
- assertEquals("LanguageVersion must be PLSQL!",
- LanguageRegistry.getLanguage(PLSQLLanguageModule.NAME).getDefaultVersion(), languageVersion);
+ assertEquals(LanguageRegistry.getLanguage(PLSQLLanguageModule.NAME).getDefaultVersion(), languageVersion,
+ "LanguageVersion must be PLSQL!");
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/cpd/PLSQLTokenizerTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/cpd/PLSQLTokenizerTest.java
index bd3860e8a0..cfd5a3260f 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/cpd/PLSQLTokenizerTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/cpd/PLSQLTokenizerTest.java
@@ -6,13 +6,13 @@ package net.sourceforge.pmd.cpd;
import java.util.Properties;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
-public class PLSQLTokenizerTest extends CpdTextComparisonTest {
+class PLSQLTokenizerTest extends CpdTextComparisonTest {
- public PLSQLTokenizerTest() {
+ PLSQLTokenizerTest() {
super(".sql");
}
@@ -28,17 +28,17 @@ public class PLSQLTokenizerTest extends CpdTextComparisonTest {
@Test
- public void testSimple() {
+ void testSimple() {
doTest("sample-plsql");
}
@Test
- public void testSpecialComments() {
+ void testSpecialComments() {
doTest("specialComments");
}
@Test
- public void testTabWidth() {
+ void testTabWidth() {
doTest("tabWidth");
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/PLSQLXPathRuleTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/PLSQLXPathRuleTest.java
index 504540ae87..fbfce7df24 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/PLSQLXPathRuleTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/PLSQLXPathRuleTest.java
@@ -4,8 +4,9 @@
package net.sourceforge.pmd.lang.plsql;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.Report;
import net.sourceforge.pmd.lang.LanguageRegistry;
@@ -15,21 +16,18 @@ import net.sourceforge.pmd.lang.rule.xpath.XPathVersion;
/**
* Tests to use XPath rules with PLSQL.
*/
-public class PLSQLXPathRuleTest extends AbstractPLSQLParserTst {
+class PLSQLXPathRuleTest extends AbstractPLSQLParserTst {
private static final String SOURCE =
"create or replace\n" + "package pkg_xpath_problem\n" + "AS\n" + " PROCEDURE pkg_minimal\n" + " IS\n"
+ " a_variable VARCHAR2(1);\n" + " BEGIN \n" + " --PRAGMA INLINE(output,'YES');\n"
+ " a_variable := 'Y' ;\n" + " END ;\n" + "end pkg_xpath_problem;\n" + "/\n";
- public PLSQLXPathRuleTest() {
- }
-
/**
* See https://sourceforge.net/p/pmd/bugs/1166/
*/
@Test
- public void testXPathRule1() {
+ void testXPathRule1() {
testOnVersion(XPathVersion.XPATH_1_0);
}
@@ -37,7 +35,7 @@ public class PLSQLXPathRuleTest extends AbstractPLSQLParserTst {
* See https://sourceforge.net/p/pmd/bugs/1166/
*/
@Test
- public void testXPathRule1Compatibility() {
+ void testXPathRule1Compatibility() {
testOnVersion(XPathVersion.XPATH_1_0_COMPATIBILITY);
}
@@ -45,7 +43,7 @@ public class PLSQLXPathRuleTest extends AbstractPLSQLParserTst {
* See https://sourceforge.net/p/pmd/bugs/1166/
*/
@Test
- public void testXPathRule2() {
+ void testXPathRule2() {
testOnVersion(XPathVersion.XPATH_2_0);
}
@@ -56,8 +54,7 @@ public class PLSQLXPathRuleTest extends AbstractPLSQLParserTst {
rule.setMessage("Test Violation");
Report report = plsql.executeRule(rule, SOURCE);
- Assert.assertEquals(2, report.getViolations().size());
+ assertEquals(2, report.getViolations().size());
}
-
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ASTComparisonConditionTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ASTComparisonConditionTest.java
index 1425941012..5721d6ab4f 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ASTComparisonConditionTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ASTComparisonConditionTest.java
@@ -4,20 +4,21 @@
package net.sourceforge.pmd.lang.plsql.ast;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class ASTComparisonConditionTest extends AbstractPLSQLParserTst {
+class ASTComparisonConditionTest extends AbstractPLSQLParserTst {
@Test
- public void testOperator() {
+ void testOperator() {
ASTInput input = plsql.parse("BEGIN SELECT COUNT(1) INTO MY_TABLE FROM USERS_TABLE WHERE user_id = 1; END;");
List conditions = input.findDescendantsOfType(ASTComparisonCondition.class);
- Assert.assertEquals(1, conditions.size());
- Assert.assertEquals("=", conditions.get(0).getOperator());
+ assertEquals(1, conditions.size());
+ assertEquals("=", conditions.get(0).getOperator());
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ASTCompoundConditionTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ASTCompoundConditionTest.java
index ff13a04493..87941a22a5 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ASTCompoundConditionTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ASTCompoundConditionTest.java
@@ -4,21 +4,22 @@
package net.sourceforge.pmd.lang.plsql.ast;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-
-public class ASTCompoundConditionTest extends AbstractPLSQLParserTst {
+class ASTCompoundConditionTest extends AbstractPLSQLParserTst {
@Test
- public void testParseType() {
+ void testParseType() {
ASTInput input = plsql.parse("BEGIN SELECT COUNT(1) INTO MY_TABLE FROM USERS_TABLE WHERE user_id = 1 AnD user_id = 2; END;");
List compoundConditions = input.findDescendantsOfType(ASTCompoundCondition.class);
- Assert.assertFalse(compoundConditions.isEmpty());
- Assert.assertEquals("AND", compoundConditions.get(0).getType());
+ assertFalse(compoundConditions.isEmpty());
+ assertEquals("AND", compoundConditions.get(0).getType());
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ASTExtractExpressionTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ASTExtractExpressionTest.java
index 99a83f30e3..e341dae49a 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ASTExtractExpressionTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ASTExtractExpressionTest.java
@@ -4,22 +4,23 @@
package net.sourceforge.pmd.lang.plsql.ast;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
public class ASTExtractExpressionTest extends AbstractPLSQLParserTst {
-
@Test
- public void testXml() {
+ void testXml() {
ASTInput unit = plsql.parse("SELECT warehouse_name, EXTRACT(warehouse_spec, '/Warehouse/Docks', "
+ "'xmlns:a=\"http://warehouse/1\" xmlns:b=\"http://warehouse/2\"') \"Number of Docks\" "
+ " FROM warehouses WHERE warehouse_spec IS NOT NULL;");
ASTExtractExpression extract = unit.getFirstDescendantOfType(ASTExtractExpression.class);
- Assert.assertTrue(extract.isXml());
- Assert.assertEquals("/Warehouse/Docks", extract.getXPath());
- Assert.assertEquals("xmlns:a=\"http://warehouse/1\" xmlns:b=\"http://warehouse/2\"", extract.getNamespace());
+ assertTrue(extract.isXml());
+ assertEquals("/Warehouse/Docks", extract.getXPath());
+ assertEquals("xmlns:a=\"http://warehouse/1\" xmlns:b=\"http://warehouse/2\"", extract.getNamespace());
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ASTFetchStatementTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ASTFetchStatementTest.java
index 53ad53d938..8f6c81d289 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ASTFetchStatementTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ASTFetchStatementTest.java
@@ -4,32 +4,35 @@
package net.sourceforge.pmd.lang.plsql.ast;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class ASTFetchStatementTest extends AbstractPLSQLParserTst {
+class ASTFetchStatementTest extends AbstractPLSQLParserTst {
@Test
- public void testBulkCollectLimit() {
+ void testBulkCollectLimit() {
ASTInput input = plsql.parseResource("FetchStatementBulkCollectLimit.pls");
List fetchStatements = input.findDescendantsOfType(ASTFetchStatement.class);
- Assert.assertEquals(1, fetchStatements.size());
+ assertEquals(1, fetchStatements.size());
ASTFetchStatement fetch = fetchStatements.get(0);
- Assert.assertTrue(fetch.isBulkCollect());
- Assert.assertTrue(fetch.isLimit());
+ assertTrue(fetch.isBulkCollect());
+ assertTrue(fetch.isLimit());
}
@Test
- public void testFetch() {
+ void testFetch() {
ASTInput input = plsql.parseResource("FetchStatement.pls");
List fetchStatements = input.findDescendantsOfType(ASTFetchStatement.class);
- Assert.assertEquals(1, fetchStatements.size());
+ assertEquals(1, fetchStatements.size());
ASTFetchStatement fetch = fetchStatements.get(0);
- Assert.assertFalse(fetch.isBulkCollect());
- Assert.assertFalse(fetch.isLimit());
+ assertFalse(fetch.isBulkCollect());
+ assertFalse(fetch.isLimit());
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ASTSqlStatementTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ASTSqlStatementTest.java
index f395018baf..9edd3f2744 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ASTSqlStatementTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ASTSqlStatementTest.java
@@ -4,51 +4,52 @@
package net.sourceforge.pmd.lang.plsql.ast;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class ASTSqlStatementTest extends AbstractPLSQLParserTst {
+class ASTSqlStatementTest extends AbstractPLSQLParserTst {
@Test
- public void testCommit() {
+ void testCommit() {
ASTInput input = plsql.parseResource("CommitStatement.pls");
List sqlStatements = input.findDescendantsOfType(ASTSqlStatement.class);
- Assert.assertEquals(1, sqlStatements.size());
+ assertEquals(1, sqlStatements.size());
assertType(sqlStatements, 0, ASTSqlStatement.Type.COMMIT);
}
@Test
- public void testRollback() {
+ void testRollback() {
ASTInput input = plsql.parseResource("RollbackStatement.pls");
List sqlStatements = input.findDescendantsOfType(ASTSqlStatement.class);
- Assert.assertEquals(1, sqlStatements.size());
+ assertEquals(1, sqlStatements.size());
assertType(sqlStatements, 0, ASTSqlStatement.Type.ROLLBACK);
}
@Test
- public void testSavepoint() {
+ void testSavepoint() {
ASTInput input = plsql.parseResource("SavepointStatement.pls");
List sqlStatements = input.findDescendantsOfType(ASTSqlStatement.class);
- Assert.assertEquals(2, sqlStatements.size());
+ assertEquals(2, sqlStatements.size());
assertType(sqlStatements, 0, ASTSqlStatement.Type.SAVEPOINT);
assertType(sqlStatements, 1, ASTSqlStatement.Type.ROLLBACK);
}
@Test
- public void testSetTransaction() {
+ void testSetTransaction() {
ASTInput input = plsql.parseResource("SetTransactionStatement.pls");
List sqlStatements = input.findDescendantsOfType(ASTSqlStatement.class);
- Assert.assertEquals(3, sqlStatements.size());
+ assertEquals(3, sqlStatements.size());
assertType(sqlStatements, 0, ASTSqlStatement.Type.COMMIT);
assertType(sqlStatements, 1, ASTSqlStatement.Type.SET_TRANSACTION);
assertType(sqlStatements, 2, ASTSqlStatement.Type.COMMIT);
}
private void assertType(List sqlStatements, int index, ASTSqlStatement.Type expectedType) {
- Assert.assertEquals(expectedType, sqlStatements.get(index).getType());
+ assertEquals(expectedType, sqlStatements.get(index).getType());
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/AllPlsqlAstTreeDumpTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/AllPlsqlAstTreeDumpTest.java
index 4b09b78897..f610cc5b9d 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/AllPlsqlAstTreeDumpTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/AllPlsqlAstTreeDumpTest.java
@@ -4,16 +4,15 @@
package net.sourceforge.pmd.lang.plsql.ast;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
-@RunWith(Suite.class)
-@SuiteClasses({
+@Suite
+@SelectClasses({
PlsqlTreeDumpTest.class,
ParenthesisGroupTest.class,
ExecuteImmediateBulkCollectTest.class
})
-public class AllPlsqlAstTreeDumpTest {
+class AllPlsqlAstTreeDumpTest {
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/AnonymousBlockTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/AnonymousBlockTest.java
index bd5c9f1c60..7d2781cb08 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/AnonymousBlockTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/AnonymousBlockTest.java
@@ -4,19 +4,19 @@
package net.sourceforge.pmd.lang.plsql.ast;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class AnonymousBlockTest extends AbstractPLSQLParserTst {
+class AnonymousBlockTest extends AbstractPLSQLParserTst {
@Test
- public void parseCursorInsideProcAnonymousBlock() {
+ void parseCursorInsideProcAnonymousBlock() {
plsql.parseResource("AnonymousBlock1.sql");
}
@Test
- public void parseCursorInsideAnonymousBlock() {
+ void parseCursorInsideAnonymousBlock() {
plsql.parseResource("AnonymousBlock2.sql");
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CreateTableTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CreateTableTest.java
index 01c1fa0fd3..7aa1790777 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CreateTableTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CreateTableTest.java
@@ -4,25 +4,26 @@
package net.sourceforge.pmd.lang.plsql.ast;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class CreateTableTest extends AbstractPLSQLParserTst {
+class CreateTableTest extends AbstractPLSQLParserTst {
@Test
- public void parseCreateTable() {
+ void parseCreateTable() {
ASTInput input = plsql.parseResource("CreateTable.pls");
// 5th column of first table statement has a inline constraint of type check
ASTTableColumn columnStatus = input.findChildrenOfType(ASTTable.class).get(0).findChildrenOfType(ASTTableColumn.class).get(4);
- Assert.assertEquals("status", columnStatus.getFirstChildOfType(ASTID.class).getImage());
- Assert.assertEquals(ConstraintType.CHECK, columnStatus.getFirstChildOfType(ASTInlineConstraint.class).getType());
+ assertEquals("status", columnStatus.getFirstChildOfType(ASTID.class).getImage());
+ assertEquals(ConstraintType.CHECK, columnStatus.getFirstChildOfType(ASTInlineConstraint.class).getType());
}
@Test
- public void parseCreateOrganizedTable() {
+ void parseCreateOrganizedTable() {
plsql.parseResource("CreateOrganizedTable.pls");
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorAttributesTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorAttributesTest.java
index 429d47b83e..22927fda0c 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorAttributesTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorAttributesTest.java
@@ -4,22 +4,23 @@
package net.sourceforge.pmd.lang.plsql.ast;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class CursorAttributesTest extends AbstractPLSQLParserTst {
+class CursorAttributesTest extends AbstractPLSQLParserTst {
@Test
- public void parseCursorWithAttribute() {
+ void parseCursorWithAttribute() {
ASTInput input = plsql.parseResource("CursorAttributes.pls");
ASTExpression exp = input.getFirstDescendantOfType(ASTIfStatement.class).getFirstChildOfType(ASTExpression.class);
- Assert.assertEquals("TestSearch%notfound", exp.getImage());
+ assertEquals("TestSearch%notfound", exp.getImage());
}
@Test
- public void parseImplicitCursorAttributeBulkExceptions() {
+ void parseImplicitCursorAttributeBulkExceptions() {
plsql.parseResource("CursorAttributesBulkExceptions.pls");
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorForLoopTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorForLoopTest.java
index 6b8b99e369..dbe29c9f6f 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorForLoopTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorForLoopTest.java
@@ -4,56 +4,58 @@
package net.sourceforge.pmd.lang.plsql.ast;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class CursorForLoopTest extends AbstractPLSQLParserTst {
+class CursorForLoopTest extends AbstractPLSQLParserTst {
@Test
- public void parseCursorForLoopSimple() {
+ void parseCursorForLoopSimple() {
ASTInput input = plsql.parseResource("CursorForLoopSimple.pls");
ASTCursorForLoopStatement forloop = input.getFirstDescendantOfType(ASTCursorForLoopStatement.class);
- Assert.assertNotNull(forloop);
+ assertNotNull(forloop);
ASTForIndex forindex = forloop.getFirstChildOfType(ASTForIndex.class);
- Assert.assertNotNull(forindex);
- Assert.assertEquals("someone", forindex.getImage());
+ assertNotNull(forindex);
+ assertEquals("someone", forindex.getImage());
}
@Test
- public void parseCursorForLoopNested() {
+ void parseCursorForLoopNested() {
ASTInput input = plsql.parseResource("CursorForLoopNested.pls");
ASTCursorForLoopStatement forloop = input.getFirstDescendantOfType(ASTCursorForLoopStatement.class);
- Assert.assertNotNull(forloop);
+ assertNotNull(forloop);
ASTForIndex forindex = forloop.getFirstChildOfType(ASTForIndex.class);
- Assert.assertNotNull(forindex);
- Assert.assertEquals("c_cmp", forindex.getImage());
+ assertNotNull(forindex);
+ assertEquals("c_cmp", forindex.getImage());
ASTCursorForLoopStatement forloop2 = forloop.getFirstDescendantOfType(ASTCursorForLoopStatement.class);
ASTForIndex forindex2 = forloop2.getFirstChildOfType(ASTForIndex.class);
- Assert.assertEquals("c_con", forindex2.getImage());
+ assertEquals("c_con", forindex2.getImage());
ASTCursorForLoopStatement forloop3 = forloop2.getFirstDescendantOfType(ASTCursorForLoopStatement.class);
ASTForIndex forindex3 = forloop3.getFirstChildOfType(ASTForIndex.class);
- Assert.assertEquals("c_pa", forindex3.getImage());
+ assertEquals("c_pa", forindex3.getImage());
}
@Test
- public void parseCursorForLoop1047a() {
+ void parseCursorForLoop1047a() {
ASTInput input = plsql.parseResource("CursorForLoop1047a.pls");
- Assert.assertNotNull(input);
+ assertNotNull(input);
}
@Test
- public void parseCursorForLoop1047b() {
+ void parseCursorForLoop1047b() {
ASTInput input = plsql.parseResource("CursorForLoop1047b.pls");
- Assert.assertNotNull(input);
+ assertNotNull(input);
}
@Test
- public void parseCursorForLoop681() {
+ void parseCursorForLoop681() {
ASTInput input = plsql.parseResource("CursorForLoop681.pls");
- Assert.assertNotNull(input);
+ assertNotNull(input);
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorWithWithTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorWithWithTest.java
index f634b8b4bc..55c98987f7 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorWithWithTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorWithWithTest.java
@@ -4,20 +4,21 @@
package net.sourceforge.pmd.lang.plsql.ast;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class CursorWithWithTest extends AbstractPLSQLParserTst {
+class CursorWithWithTest extends AbstractPLSQLParserTst {
@Test
- public void parseCursorWithWith() {
+ void parseCursorWithWith() {
ASTInput input = plsql.parseResource("CursorWithWith.pls");
ASTCursorUnit cursor = input.getFirstDescendantOfType(ASTCursorUnit.class);
ASTSelectStatement select = (ASTSelectStatement) cursor.getChild(1);
ASTWithClause with = (ASTWithClause) select.getChild(0);
ASTName queryName = (ASTName) with.getChild(0);
- Assert.assertEquals("risk_set", queryName.getImage());
+ assertEquals("risk_set", queryName.getImage());
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/DeleteStatementTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/DeleteStatementTest.java
index 9255482f35..9f901299ef 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/DeleteStatementTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/DeleteStatementTest.java
@@ -4,22 +4,23 @@
package net.sourceforge.pmd.lang.plsql.ast;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class DeleteStatementTest extends AbstractPLSQLParserTst {
+class DeleteStatementTest extends AbstractPLSQLParserTst {
@Test
- public void parseDeleteStatementExample() {
+ void parseDeleteStatementExample() {
ASTInput input = plsql.parseResource("DeleteStatementExample.pls");
List deleteStatements = input.findDescendantsOfType(ASTDeleteStatement.class);
- Assert.assertEquals(3, deleteStatements.size());
+ assertEquals(3, deleteStatements.size());
- Assert.assertEquals("product_descriptions", deleteStatements.get(0).getChild(0)
+ assertEquals("product_descriptions", deleteStatements.get(0).getChild(0)
.getFirstChildOfType(ASTTableName.class).getImage());
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollectTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollectTest.java
index 0d06ef1c5f..ab1e68acd5 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollectTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollectTest.java
@@ -4,16 +4,16 @@
package net.sourceforge.pmd.lang.plsql.ast;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
import net.sourceforge.pmd.lang.ast.test.BaseTreeDumpTest;
import net.sourceforge.pmd.lang.ast.test.RelevantAttributePrinter;
import net.sourceforge.pmd.lang.plsql.PlsqlParsingHelper;
-public class ExecuteImmediateBulkCollectTest extends BaseTreeDumpTest {
+class ExecuteImmediateBulkCollectTest extends BaseTreeDumpTest {
- public ExecuteImmediateBulkCollectTest() {
+ ExecuteImmediateBulkCollectTest() {
super(new RelevantAttributePrinter(), ".pls");
}
@@ -23,17 +23,17 @@ public class ExecuteImmediateBulkCollectTest extends BaseTreeDumpTest {
}
@Test
- public void testExecuteImmediateBulkCollect1() {
+ void testExecuteImmediateBulkCollect1() {
doTest("ExecuteImmediateBulkCollect1");
}
@Test
- public void testExecuteImmediateBulkCollect2() {
+ void testExecuteImmediateBulkCollect2() {
doTest("ExecuteImmediateBulkCollect2");
}
@Test
- public void testExecuteImmediateBulkCollect3() {
+ void testExecuteImmediateBulkCollect3() {
doTest("ExecuteImmediateBulkCollect3");
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateTest.java
index d72ccfb037..9ca9633f6e 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateTest.java
@@ -4,24 +4,24 @@
package net.sourceforge.pmd.lang.plsql.ast;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class ExecuteImmediateTest extends AbstractPLSQLParserTst {
+class ExecuteImmediateTest extends AbstractPLSQLParserTst {
@Test
- public void parseExecuteImmediate1047a() {
+ void parseExecuteImmediate1047a() {
plsql.parseResource("ExecuteImmediate1047a.pls");
}
@Test
- public void parseExecuteImmediate1047b() {
+ void parseExecuteImmediate1047b() {
plsql.parseResource("ExecuteImmediate1047b.pls");
}
@Test
- public void parseExecuteImmediateString() {
+ void parseExecuteImmediateString() {
plsql.parseResource("ExecuteImmediateString.pls");
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/FunctionsTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/FunctionsTest.java
index 5a6b8ef7a7..f745ceb878 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/FunctionsTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/FunctionsTest.java
@@ -4,24 +4,24 @@
package net.sourceforge.pmd.lang.plsql.ast;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class FunctionsTest extends AbstractPLSQLParserTst {
+class FunctionsTest extends AbstractPLSQLParserTst {
@Test
- public void parseTrimCall() {
+ void parseTrimCall() {
plsql.parseResource("TrimFunction.pls");
}
@Test
- public void parseSelectExtractExpression() {
+ void parseSelectExtractExpression() {
plsql.parseResource("ExtractExpressions.pls");
}
@Test
- public void parseXMLExpression() {
+ void parseXMLExpression() {
plsql.parseResource("XMLFunctions.pls");
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/IfStatementTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/IfStatementTest.java
index acb57a2a4f..fe7a7cfa6f 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/IfStatementTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/IfStatementTest.java
@@ -4,17 +4,18 @@
package net.sourceforge.pmd.lang.plsql.ast;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class IfStatementTest extends AbstractPLSQLParserTst {
+class IfStatementTest extends AbstractPLSQLParserTst {
@Test
- public void parseIfWithElseIf() throws Exception {
+ void parseIfWithElseIf() throws Exception {
String code = "BEGIN\nIF 1 = 1 THEN null;\nELSIF (2 = 2) THEN null;\nELSE null;\nEND IF;\nEND;\n/\n";
ASTInput input = plsql.parse(code);
- Assert.assertNotNull(input);
+ assertNotNull(input);
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/InOutNoCopyTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/InOutNoCopyTest.java
index c8915329c6..5b92de2cf0 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/InOutNoCopyTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/InOutNoCopyTest.java
@@ -4,47 +4,51 @@
package net.sourceforge.pmd.lang.plsql.ast;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class InOutNoCopyTest extends AbstractPLSQLParserTst {
+class InOutNoCopyTest extends AbstractPLSQLParserTst {
@Test
- public void parseInOutNoCopy() {
+ void parseInOutNoCopy() {
ASTInput input = plsql.parseResource("InOutNoCopy.pls");
- Assert.assertNotNull(input);
+ assertNotNull(input);
List params = input.findDescendantsOfType(ASTFormalParameter.class);
- Assert.assertEquals(18, params.size());
+ assertEquals(18, params.size());
//detailed check of first 6 test cases
- Assert.assertFalse(params.get(0).isIn());
- Assert.assertFalse(params.get(0).isOut());
- Assert.assertFalse(params.get(0).isNoCopy());
- Assert.assertTrue(params.get(1).isIn());
- Assert.assertFalse(params.get(1).isOut());
- Assert.assertFalse(params.get(1).isNoCopy());
- Assert.assertFalse(params.get(2).isIn());
- Assert.assertTrue(params.get(2).isOut());
- Assert.assertFalse(params.get(2).isNoCopy());
- Assert.assertTrue(params.get(3).isIn());
- Assert.assertTrue(params.get(3).isOut());
- Assert.assertFalse(params.get(3).isNoCopy());
- Assert.assertTrue(params.get(4).isIn());
- Assert.assertTrue(params.get(4).isOut());
- Assert.assertTrue(params.get(4).isNoCopy());
- Assert.assertFalse(params.get(5).isIn());
- Assert.assertTrue(params.get(5).isOut());
- Assert.assertTrue(params.get(5).isNoCopy());
+ assertFalse(params.get(0).isIn());
+ assertFalse(params.get(0).isOut());
+ assertFalse(params.get(0).isNoCopy());
+ assertTrue(params.get(1).isIn());
+ assertFalse(params.get(1).isOut());
+ assertFalse(params.get(1).isNoCopy());
+ assertFalse(params.get(2).isIn());
+ assertTrue(params.get(2).isOut());
+ assertFalse(params.get(2).isNoCopy());
+ assertTrue(params.get(3).isIn());
+ assertTrue(params.get(3).isOut());
+ assertFalse(params.get(3).isNoCopy());
+ assertTrue(params.get(4).isIn());
+ assertTrue(params.get(4).isOut());
+ assertTrue(params.get(4).isNoCopy());
+ assertFalse(params.get(5).isIn());
+ assertTrue(params.get(5).isOut());
+ assertTrue(params.get(5).isNoCopy());
//piecemeal test of other test cases
- Assert.assertFalse(params.get(11).isIn());
- Assert.assertTrue(params.get(11).isOut());
- Assert.assertTrue(params.get(11).isNoCopy());
- Assert.assertTrue(params.get(16).isIn());
- Assert.assertTrue(params.get(16).isOut());
- Assert.assertTrue(params.get(16).isNoCopy());
+ assertFalse(params.get(11).isIn());
+ assertTrue(params.get(11).isOut());
+ assertTrue(params.get(11).isNoCopy());
+ assertTrue(params.get(16).isIn());
+ assertTrue(params.get(16).isOut());
+ assertTrue(params.get(16).isNoCopy());
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/InsertIntoClauseTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/InsertIntoClauseTest.java
index fd8bbbe7a3..cd5bde53fd 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/InsertIntoClauseTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/InsertIntoClauseTest.java
@@ -4,24 +4,24 @@
package net.sourceforge.pmd.lang.plsql.ast;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class InsertIntoClauseTest extends AbstractPLSQLParserTst {
+class InsertIntoClauseTest extends AbstractPLSQLParserTst {
@Test
- public void parseInsertInto() {
+ void parseInsertInto() {
plsql.parseResource("InsertIntoClause.pls");
}
@Test
- public void parseInsertIntoReturning() {
+ void parseInsertIntoReturning() {
plsql.parseResource("InsertIntoClauseReturning.pls");
}
@Test
- public void parseInsertIntoWithRecord() {
+ void parseInsertIntoWithRecord() {
plsql.parseResource("InsertIntoClauseRecord.pls");
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/JoinClauseTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/JoinClauseTest.java
index a4c3ad4bba..bd6b2e55e6 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/JoinClauseTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/JoinClauseTest.java
@@ -4,115 +4,119 @@
package net.sourceforge.pmd.lang.plsql.ast;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class JoinClauseTest extends AbstractPLSQLParserTst {
+class JoinClauseTest extends AbstractPLSQLParserTst {
@Test
- public void testInnerCrossJoin() {
+ void testInnerCrossJoin() {
ASTInput input = plsql.parseResource("InnerCrossJoin.pls");
List joins = input.findDescendantsOfType(ASTInnerCrossJoinClause.class);
- Assert.assertEquals(1, joins.size());
- Assert.assertTrue(joins.get(0).isCross());
- Assert.assertFalse(joins.get(0).isNatural());
+ assertEquals(1, joins.size());
+ assertTrue(joins.get(0).isCross());
+ assertFalse(joins.get(0).isNatural());
}
@Test
- public void testInnerNaturalJoin() {
+ void testInnerNaturalJoin() {
ASTInput input = plsql.parseResource("InnerNaturalJoin.pls");
List joins = input.findDescendantsOfType(ASTInnerCrossJoinClause.class);
- Assert.assertEquals(2, joins.size());
- Assert.assertFalse(joins.get(0).isCross());
- Assert.assertTrue(joins.get(0).isNatural());
+ assertEquals(2, joins.size());
+ assertFalse(joins.get(0).isCross());
+ assertTrue(joins.get(0).isNatural());
}
@Test
- public void testInnerJoinUsing() {
+ void testInnerJoinUsing() {
ASTInput input = plsql.parseResource("InnerJoinUsing.pls");
List joins = input.findDescendantsOfType(ASTInnerCrossJoinClause.class);
- Assert.assertEquals(3, joins.size());
- Assert.assertFalse(joins.get(0).isCross());
- Assert.assertFalse(joins.get(0).isNatural());
+ assertEquals(3, joins.size());
+ assertFalse(joins.get(0).isCross());
+ assertFalse(joins.get(0).isNatural());
List columns = joins.get(0).findChildrenOfType(ASTColumn.class);
- Assert.assertEquals(1, columns.size());
- Assert.assertEquals("department_id", columns.get(0).getImage());
+ assertEquals(1, columns.size());
+ assertEquals("department_id", columns.get(0).getImage());
}
@Test
- public void testOuterJoinUsing() {
+ void testOuterJoinUsing() {
ASTInput input = plsql.parseResource("OuterJoinUsing.pls");
List joins = input.findDescendantsOfType(ASTOuterJoinClause.class);
- Assert.assertEquals(1, joins.size());
+ assertEquals(1, joins.size());
ASTOuterJoinType type = joins.get(0).getFirstChildOfType(ASTOuterJoinType.class);
- Assert.assertEquals(ASTOuterJoinType.Type.FULL, type.getType());
+ assertEquals(ASTOuterJoinType.Type.FULL, type.getType());
List columns = joins.get(0).findChildrenOfType(ASTColumn.class);
- Assert.assertEquals(1, columns.size());
- Assert.assertEquals("department_id", columns.get(0).getImage());
+ assertEquals(1, columns.size());
+ assertEquals("department_id", columns.get(0).getImage());
}
@Test
- public void testRightOuterJoin() {
+ void testRightOuterJoin() {
ASTInput input = plsql.parseResource("RightOuterJoin.pls");
List joins = input.findDescendantsOfType(ASTOuterJoinClause.class);
- Assert.assertEquals(2, joins.size());
+ assertEquals(2, joins.size());
ASTOuterJoinType type = joins.get(0).getFirstChildOfType(ASTOuterJoinType.class);
- Assert.assertEquals(ASTOuterJoinType.Type.RIGHT, type.getType());
+ assertEquals(ASTOuterJoinType.Type.RIGHT, type.getType());
}
@Test
- public void testLeftOuterJoin() {
+ void testLeftOuterJoin() {
ASTInput input = plsql.parseResource("LeftOuterJoin.pls");
List joins = input.findDescendantsOfType(ASTOuterJoinClause.class);
- Assert.assertEquals(2, joins.size());
+ assertEquals(2, joins.size());
ASTOuterJoinType type = joins.get(0).getFirstChildOfType(ASTOuterJoinType.class);
- Assert.assertEquals(ASTOuterJoinType.Type.LEFT, type.getType());
+ assertEquals(ASTOuterJoinType.Type.LEFT, type.getType());
List selects = input.findDescendantsOfType(ASTSelectStatement.class);
- Assert.assertEquals(2, selects.size());
- Assert.assertTrue(selects.get(0).getFromClause().getChild(0) instanceof ASTJoinClause);
- Assert.assertTrue(selects.get(1).getFromClause().getChild(0) instanceof ASTJoinClause);
+ assertEquals(2, selects.size());
+ assertTrue(selects.get(0).getFromClause().getChild(0) instanceof ASTJoinClause);
+ assertTrue(selects.get(1).getFromClause().getChild(0) instanceof ASTJoinClause);
}
@Test
- public void testNaturalRightOuterJoin() {
+ void testNaturalRightOuterJoin() {
ASTInput input = plsql.parseResource("NaturalRightOuterJoin.pls");
List joins = input.findDescendantsOfType(ASTOuterJoinClause.class);
- Assert.assertEquals(1, joins.size());
+ assertEquals(1, joins.size());
ASTOuterJoinType type = joins.get(0).getFirstChildOfType(ASTOuterJoinType.class);
- Assert.assertEquals(ASTOuterJoinType.Type.RIGHT, type.getType());
- Assert.assertTrue(joins.get(0).isNatural());
+ assertEquals(ASTOuterJoinType.Type.RIGHT, type.getType());
+ assertTrue(joins.get(0).isNatural());
}
@Test
- public void testOuterJoinPartitioned() {
+ void testOuterJoinPartitioned() {
ASTInput input = plsql.parseResource("OuterJoinPartitioned.pls");
List joins = input.findDescendantsOfType(ASTOuterJoinClause.class);
- Assert.assertEquals(1, joins.size());
+ assertEquals(1, joins.size());
ASTOuterJoinType type = joins.get(0).getFirstChildOfType(ASTOuterJoinType.class);
- Assert.assertEquals(ASTOuterJoinType.Type.RIGHT, type.getType());
- Assert.assertNotNull(joins.get(0).getFirstChildOfType(ASTQueryPartitionClause.class));
+ assertEquals(ASTOuterJoinType.Type.RIGHT, type.getType());
+ assertNotNull(joins.get(0).getFirstChildOfType(ASTQueryPartitionClause.class));
}
@Test
- public void testFullOuterJoin() {
+ void testFullOuterJoin() {
plsql.parseResource("FullOuterJoin.pls");
}
@Test
- public void testInnerJoinSubquery() {
+ void testInnerJoinSubquery() {
plsql.parseResource("InnerJoinSubquery.pls");
}
@Test
- public void testJoinOperator() {
+ void testJoinOperator() {
ASTInput input = plsql.parseResource("JoinOperator.pls");
List expressions = input.findDescendantsOfType(ASTOuterJoinExpression.class);
- Assert.assertEquals(4, expressions.size());
- Assert.assertEquals("h.opp_id", expressions.get(3).getImage());
+ assertEquals(4, expressions.size());
+ assertEquals("h.opp_id", expressions.get(3).getImage());
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/LexicalParametersTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/LexicalParametersTest.java
index b694b685ea..0dd90e0d00 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/LexicalParametersTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/LexicalParametersTest.java
@@ -4,14 +4,14 @@
package net.sourceforge.pmd.lang.plsql.ast;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class LexicalParametersTest extends AbstractPLSQLParserTst {
+class LexicalParametersTest extends AbstractPLSQLParserTst {
@Test
- public void parseLexicalParameters() {
+ void parseLexicalParameters() {
plsql.parseResource("LexicalParameters.sql");
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/MultipleDDLStatementsTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/MultipleDDLStatementsTest.java
index 5b21d5711a..a99d1f6686 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/MultipleDDLStatementsTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/MultipleDDLStatementsTest.java
@@ -4,22 +4,23 @@
package net.sourceforge.pmd.lang.plsql.ast;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class MultipleDDLStatementsTest extends AbstractPLSQLParserTst {
+class MultipleDDLStatementsTest extends AbstractPLSQLParserTst {
@Test
- public void parseDDLCommands() throws Exception {
+ void parseDDLCommands() throws Exception {
ASTInput input = plsql.parseResource("DDLCommands.sql");
List ddlcommands = input.findDescendantsOfType(ASTDDLCommand.class);
- Assert.assertEquals(6, ddlcommands.size());
+ assertEquals(6, ddlcommands.size());
List comments = input.findDescendantsOfType(ASTComment.class);
- Assert.assertEquals(5, comments.size());
- Assert.assertEquals("'abbreviated job title'", comments.get(0).getFirstChildOfType(ASTStringLiteral.class).getImage());
+ assertEquals(5, comments.size());
+ assertEquals("'abbreviated job title'", comments.get(0).getFirstChildOfType(ASTStringLiteral.class).getImage());
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/OrderByExpressionsTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/OrderByExpressionsTest.java
index 8c729df6dc..41a3e0109c 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/OrderByExpressionsTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/OrderByExpressionsTest.java
@@ -4,14 +4,14 @@
package net.sourceforge.pmd.lang.plsql.ast;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class OrderByExpressionsTest extends AbstractPLSQLParserTst {
+class OrderByExpressionsTest extends AbstractPLSQLParserTst {
@Test
- public void parseOrderByExpression() {
+ void parseOrderByExpression() {
plsql.parseResource("OrderByExpression.pls");
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/PLSQLParserTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/PLSQLParserTest.java
index 25d7bfca55..091a7cd6e0 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/PLSQLParserTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/PLSQLParserTest.java
@@ -4,14 +4,19 @@
package net.sourceforge.pmd.lang.plsql.ast;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertTimeout;
+
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class PLSQLParserTest extends AbstractPLSQLParserTst {
+class PLSQLParserTest extends AbstractPLSQLParserTst {
@Test
- public void testExceptions() {
+ void testExceptions() {
plsql.parse("CREATE OR REPLACE PROCEDURE bar IS BEGIN" + " doSomething;" + " EXCEPTION"
+ " WHEN FooException THEN" + " doSomethingElse;" + " WHEN OTHERS THEN"
+ " doSomethingElse;" + "END;");
@@ -21,67 +26,68 @@ public class PLSQLParserTest extends AbstractPLSQLParserTst {
* See https://sourceforge.net/p/pmd/bugs/1167/
*/
@Test
- public void testBOM() {
+ void testBOM() {
plsql.parse("\ufeff" + "CREATE OR REPLACE PROCEDURE bar IS BEGIN" + " doSomething;" + " EXCEPTION"
+ " WHEN FooException THEN" + " doSomethingElse;" + " WHEN OTHERS THEN"
+ " doSomethingElse;" + "END;");
}
- @Test(timeout = 5000)
- public void testBug1531() {
- plsql.parse("create or replace force view oxa.o_xa_function_role_types as\n"
- + "select \"CFT_ID\",\"CFR_ID\",\"CFT_NAME\",\"TCN\",\"LOG_MODULE\",\"LOG_USER\",\"LOG_DATE\",\"LOG_TIME\" from crm_function_role_types\n"
- + "/");
+ @Test
+ void testBug1531() {
+ assertTimeout(Duration.of(5, ChronoUnit.SECONDS), () ->
+ plsql.parse("create or replace force view oxa.o_xa_function_role_types as\n"
+ + "select \"CFT_ID\",\"CFR_ID\",\"CFT_NAME\",\"TCN\",\"LOG_MODULE\",\"LOG_USER\",\"LOG_DATE\",\"LOG_TIME\" from crm_function_role_types\n"
+ + "/"));
}
@Test
- public void testBug1527() {
+ void testBug1527() {
plsql.parseResource("InlinePragmaProcError.pls");
}
@Test
- public void testBug1520IsOfType() {
+ void testBug1520IsOfType() {
plsql.parseResource("IsOfType.pls");
}
@Test
- public void testBug1520Using() {
+ void testBug1520Using() {
plsql.parseResource("Using.pls");
}
@Test
- public void testSingleLineSelect() {
+ void testSingleLineSelect() {
plsql.parseResource("SingleLineSelect.pls");
}
@Test
- public void testMultiLineSelect() {
+ void testMultiLineSelect() {
plsql.parseResource("MultiLineSelect.pls");
}
@Test
- public void testIsNull() {
+ void testIsNull() {
plsql.parseResource("IsNull.pls");
}
@Test
- public void testCodingStyleExample() {
+ void testCodingStyleExample() {
plsql.parseResource("CodingStyleExample.pls");
}
@Test
- public void testCaseIssue1454() {
+ void testCaseIssue1454() {
plsql.parseResource("CaseIssue1454.pls");
}
@Test
- public void testRelationalOperators() {
+ void testRelationalOperators() {
// https://github.com/pmd/pmd/issues/3746
plsql.parseResource("RelationalOperators.pls");
}
@Test
- public void testExecuteImmediateIssue3106() {
+ void testExecuteImmediateIssue3106() {
plsql.parseResource("ExecuteImmediateIssue3106.pls");
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroupTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroupTest.java
index 49cc555e4d..6ad3cdc2f3 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroupTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroupTest.java
@@ -4,16 +4,16 @@
package net.sourceforge.pmd.lang.plsql.ast;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
import net.sourceforge.pmd.lang.ast.test.BaseTreeDumpTest;
import net.sourceforge.pmd.lang.ast.test.RelevantAttributePrinter;
import net.sourceforge.pmd.lang.plsql.PlsqlParsingHelper;
-public class ParenthesisGroupTest extends BaseTreeDumpTest {
+class ParenthesisGroupTest extends BaseTreeDumpTest {
- public ParenthesisGroupTest() {
+ ParenthesisGroupTest() {
super(new RelevantAttributePrinter(), ".pls");
}
@@ -23,17 +23,17 @@ public class ParenthesisGroupTest extends BaseTreeDumpTest {
}
@Test
- public void parseParenthesisGroup0() {
+ void parseParenthesisGroup0() {
doTest("ParenthesisGroup0");
}
@Test
- public void parseParenthesisGroup1() {
+ void parseParenthesisGroup1() {
doTest("ParenthesisGroup1");
}
@Test
- public void parseParenthesisGroup2() {
+ void parseParenthesisGroup2() {
doTest("ParenthesisGroup2");
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/PlsqlTreeDumpTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/PlsqlTreeDumpTest.java
index 9e2e7c6699..c36fb7503c 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/PlsqlTreeDumpTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/PlsqlTreeDumpTest.java
@@ -4,16 +4,16 @@
package net.sourceforge.pmd.lang.plsql.ast;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
import net.sourceforge.pmd.lang.ast.test.BaseTreeDumpTest;
import net.sourceforge.pmd.lang.ast.test.RelevantAttributePrinter;
import net.sourceforge.pmd.lang.plsql.PlsqlParsingHelper;
-public class PlsqlTreeDumpTest extends BaseTreeDumpTest {
+class PlsqlTreeDumpTest extends BaseTreeDumpTest {
- public PlsqlTreeDumpTest() {
+ PlsqlTreeDumpTest() {
super(new RelevantAttributePrinter(), ".pls");
}
@@ -23,22 +23,22 @@ public class PlsqlTreeDumpTest extends BaseTreeDumpTest {
}
@Test
- public void sqlPlusLexicalVariables() {
+ void sqlPlusLexicalVariables() {
doTest("SqlPlusLexicalVariablesIssue195");
}
@Test
- public void parseParsingExclusion() {
+ void parseParsingExclusion() {
doTest("ParsingExclusion");
}
@Test
- public void parseOpenForStatement() {
+ void parseOpenForStatement() {
doTest("OpenForStatement");
}
@Test
- public void parseSelectIntoAssociativeArrayType() {
+ void parseSelectIntoAssociativeArrayType() {
doTest("SelectIntoArray");
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/RecordTypeTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/RecordTypeTest.java
index 0d8235820d..413c2c34f3 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/RecordTypeTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/RecordTypeTest.java
@@ -4,14 +4,14 @@
package net.sourceforge.pmd.lang.plsql.ast;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class RecordTypeTest extends AbstractPLSQLParserTst {
+class RecordTypeTest extends AbstractPLSQLParserTst {
@Test
- public void parseRecordType() {
+ void parseRecordType() {
plsql.parseResource("RecordType.pls");
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectExpressionsTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectExpressionsTest.java
index fe7344edb0..8c267d18b2 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectExpressionsTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectExpressionsTest.java
@@ -4,41 +4,43 @@
package net.sourceforge.pmd.lang.plsql.ast;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class SelectExpressionsTest extends AbstractPLSQLParserTst {
+class SelectExpressionsTest extends AbstractPLSQLParserTst {
@Test
- public void parseSelectExpression() {
+ void parseSelectExpression() {
plsql.parseResource("SelectExpressions.pls");
}
@Test
- public void parseSelectSimpleExpression() {
+ void parseSelectSimpleExpression() {
ASTInput input = plsql.parseResource("SelectSimpleExpression.pls");
- Assert.assertNotNull(input);
+ assertNotNull(input);
List simpleExpressions = input.findDescendantsOfType(ASTSimpleExpression.class);
- Assert.assertEquals(1, simpleExpressions.size());
+ assertEquals(1, simpleExpressions.size());
ASTSimpleExpression exp = simpleExpressions.get(0);
- Assert.assertEquals("e.first_name", exp.getImage());
- Assert.assertEquals(2, exp.getNumChildren());
- Assert.assertEquals(ASTTableName.class, exp.getChild(0).getClass());
- Assert.assertEquals(ASTColumn.class, exp.getChild(1).getClass());
+ assertEquals("e.first_name", exp.getImage());
+ assertEquals(2, exp.getNumChildren());
+ assertEquals(ASTTableName.class, exp.getChild(0).getClass());
+ assertEquals(ASTColumn.class, exp.getChild(1).getClass());
}
@Test
- public void parseSelectCount() {
+ void parseSelectCount() {
plsql.parseResource("SelectCount.pls");
}
@Test
- public void parseSelectSubqueryExpression() {
+ void parseSelectSubqueryExpression() {
plsql.parseResource("SelectSubqueryExpressions.pls");
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectForUpdateTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectForUpdateTest.java
index 812e706928..be6aa456cf 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectForUpdateTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectForUpdateTest.java
@@ -4,30 +4,32 @@
package net.sourceforge.pmd.lang.plsql.ast;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class SelectForUpdateTest extends AbstractPLSQLParserTst {
+class SelectForUpdateTest extends AbstractPLSQLParserTst {
@Test
- public void parseSelectForUpdateWait() {
+ void parseSelectForUpdateWait() {
ASTInput input = plsql.parseResource("SelectForUpdateWait.pls");
- Assert.assertNotNull(input);
- Assert.assertEquals(5, input.findDescendantsOfType(ASTForUpdateClause.class).size());
+ assertNotNull(input);
+ assertEquals(5, input.findDescendantsOfType(ASTForUpdateClause.class).size());
}
@Test
- public void parseSelectForUpdate() {
+ void parseSelectForUpdate() {
ASTInput input = plsql.parseResource("SelectForUpdate.pls");
- Assert.assertNotNull(input);
+ assertNotNull(input);
List forUpdateClauses = input.findDescendantsOfType(ASTForUpdateClause.class);
- Assert.assertEquals(2, forUpdateClauses.size());
- Assert.assertEquals(2, forUpdateClauses.get(1).getNumChildren());
- Assert.assertEquals("e", forUpdateClauses.get(1).getChild(0).getImage());
- Assert.assertEquals("salary", forUpdateClauses.get(1).getChild(1).getImage());
+ assertEquals(2, forUpdateClauses.size());
+ assertEquals(2, forUpdateClauses.get(1).getNumChildren());
+ assertEquals("e", forUpdateClauses.get(1).getChild(0).getImage());
+ assertEquals("salary", forUpdateClauses.get(1).getChild(1).getImage());
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectHierarchicalTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectHierarchicalTest.java
index 7af37055ca..d871b7d4f6 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectHierarchicalTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectHierarchicalTest.java
@@ -4,14 +4,14 @@
package net.sourceforge.pmd.lang.plsql.ast;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class SelectHierarchicalTest extends AbstractPLSQLParserTst {
+class SelectHierarchicalTest extends AbstractPLSQLParserTst {
@Test
- public void parseSelectHierarchicalQueries() {
+ void parseSelectHierarchicalQueries() {
plsql.parseResource("SelectHierarchical.pls");
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectIntoStatementTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectIntoStatementTest.java
index 3245220b35..0daf6349b0 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectIntoStatementTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectIntoStatementTest.java
@@ -6,55 +6,55 @@ package net.sourceforge.pmd.lang.plsql.ast;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.ast.ParseException;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class SelectIntoStatementTest extends AbstractPLSQLParserTst {
+class SelectIntoStatementTest extends AbstractPLSQLParserTst {
@Test
- public void testParsingComplex() {
+ void testParsingComplex() {
plsql.parseResource("SelectIntoStatement.pls");
}
@Test
- public void testParsingExample1() {
+ void testParsingExample1() {
plsql.parseResource("SelectIntoStatementExample1.pls");
}
@Test
- public void testParsingExample2() {
+ void testParsingExample2() {
plsql.parseResource("SelectIntoStatementExample2.pls");
}
@Test
- public void testParsingExample3() {
+ void testParsingExample3() {
plsql.parseResource("SelectIntoStatementExample3.pls");
}
@Test
- public void testParsingExample4() {
+ void testParsingExample4() {
plsql.parseResource("SelectIntoStatementExample4.pls");
}
@Test
- public void testParsingExample5() {
+ void testParsingExample5() {
plsql.parseResource("SelectIntoStatementExample5.pls");
}
@Test
- public void testParsingExample6Invalid() {
+ void testParsingExample6Invalid() {
assertThrows(ParseException.class, () -> plsql.parseResource("SelectIntoStatementExample6Invalid.pls"));
}
@Test
- public void testParsingWithFunctionCall() {
+ void testParsingWithFunctionCall() {
plsql.parseResource("SelectIntoStatementFunctionCall.pls");
}
@Test
- public void testParsingIntoRecordField() {
+ void testParsingIntoRecordField() {
plsql.parseResource("SelectIntoStatementRecordField.pls");
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectIntoWithGroupByTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectIntoWithGroupByTest.java
index 08e02e2de9..06285c0416 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectIntoWithGroupByTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectIntoWithGroupByTest.java
@@ -4,45 +4,47 @@
package net.sourceforge.pmd.lang.plsql.ast;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class SelectIntoWithGroupByTest extends AbstractPLSQLParserTst {
+class SelectIntoWithGroupByTest extends AbstractPLSQLParserTst {
@Test
- public void testExample1() {
+ void testExample1() {
ASTInput input = plsql.parseResource("SelectIntoWithGroupBy1.pls");
ASTGroupByClause groupByClause = input.getFirstDescendantOfType(ASTGroupByClause.class);
- Assert.assertNotNull(groupByClause);
+ assertNotNull(groupByClause);
}
@Test
- public void testExample2() {
+ void testExample2() {
ASTInput input = plsql.parseResource("SelectIntoWithGroupBy2.pls");
ASTGroupByClause groupByClause = input.getFirstDescendantOfType(ASTGroupByClause.class);
- Assert.assertNotNull(groupByClause);
+ assertNotNull(groupByClause);
}
@Test
- public void testExample3WithCube() {
+ void testExample3WithCube() {
ASTInput input = plsql.parseResource("SelectIntoWithGroupBy3.pls");
ASTRollupCubeClause cubeClause = input.getFirstDescendantOfType(ASTRollupCubeClause.class);
- Assert.assertNotNull(cubeClause);
- Assert.assertEquals("CUBE", cubeClause.getImage());
+ assertNotNull(cubeClause);
+ assertEquals("CUBE", cubeClause.getImage());
}
@Test
- public void testExample4WithGroupingSets() {
+ void testExample4WithGroupingSets() {
ASTInput input = plsql.parseResource("SelectIntoWithGroupBy4.pls");
ASTGroupingSetsClause groupingSetsClause = input.getFirstDescendantOfType(ASTGroupingSetsClause.class);
- Assert.assertNotNull(groupingSetsClause);
+ assertNotNull(groupingSetsClause);
List fromClauses = input.findDescendantsOfType(ASTFromClause.class);
- Assert.assertEquals(1, fromClauses.size());
- Assert.assertEquals(5, fromClauses.get(0).getNumChildren());
+ assertEquals(1, fromClauses.size());
+ assertEquals(5, fromClauses.get(0).getNumChildren());
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectUnionTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectUnionTest.java
index d213f4883c..26a2f873e3 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectUnionTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectUnionTest.java
@@ -4,14 +4,14 @@
package net.sourceforge.pmd.lang.plsql.ast;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class SelectUnionTest extends AbstractPLSQLParserTst {
+class SelectUnionTest extends AbstractPLSQLParserTst {
@Test
- public void parseSelectUnion() {
+ void parseSelectUnion() {
plsql.parseResource("SelectUnion.pls");
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SlashAsDivisionTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SlashAsDivisionTest.java
index fe182fc25a..c9d7d9e45c 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SlashAsDivisionTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SlashAsDivisionTest.java
@@ -4,14 +4,14 @@
package net.sourceforge.pmd.lang.plsql.ast;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class SlashAsDivisionTest extends AbstractPLSQLParserTst {
+class SlashAsDivisionTest extends AbstractPLSQLParserTst {
@Test
- public void parseSlashAsDivision() {
+ void parseSlashAsDivision() {
plsql.parseResource("SlashAsDivision.sql");
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/StringLiteralsTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/StringLiteralsTest.java
index 9a23c02b56..d7c0bd93df 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/StringLiteralsTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/StringLiteralsTest.java
@@ -4,21 +4,23 @@
package net.sourceforge.pmd.lang.plsql.ast;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class StringLiteralsTest extends AbstractPLSQLParserTst {
+class StringLiteralsTest extends AbstractPLSQLParserTst {
@Test
- public void parseStringLiterals() throws Exception {
+ void parseStringLiterals() throws Exception {
ASTInput input = plsql.parseResource("StringLiterals.pls");
List strings = input.findDescendantsOfType(ASTStringLiteral.class);
- Assert.assertEquals(20, strings.size());
+ assertEquals(20, strings.size());
assertString("'Hello'", "Hello", 0, strings);
assertString("N'nchar literal'", "nchar literal", 4, strings);
@@ -30,16 +32,16 @@ public class StringLiteralsTest extends AbstractPLSQLParserTst {
}
@Test
- public void parseMultilineVarchar() throws Exception {
+ void parseMultilineVarchar() throws Exception {
ASTInput input = plsql.parseResource("MultilineVarchar.pls");
List strings = input.findDescendantsOfType(ASTStringLiteral.class);
- Assert.assertEquals(1, strings.size());
- Assert.assertTrue(normalizeEol(strings.get(0).getString()).startsWith("\ncreate or replace and"));
+ assertEquals(1, strings.size());
+ assertTrue(normalizeEol(strings.get(0).getString()).startsWith("\ncreate or replace and"));
}
private static void assertString(String quoted, String plain, int index, List strings) {
- Assert.assertEquals(quoted, normalizeEol(strings.get(index).getImage()));
- Assert.assertEquals(plain, normalizeEol(strings.get(index).getString()));
+ assertEquals(quoted, normalizeEol(strings.get(index).getImage()));
+ assertEquals(plain, normalizeEol(strings.get(index).getString()));
}
private static String normalizeEol(String s) {
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/TableCollectionExpressionTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/TableCollectionExpressionTest.java
index 51172989cf..622af81ee7 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/TableCollectionExpressionTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/TableCollectionExpressionTest.java
@@ -4,19 +4,19 @@
package net.sourceforge.pmd.lang.plsql.ast;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class TableCollectionExpressionTest extends AbstractPLSQLParserTst {
+class TableCollectionExpressionTest extends AbstractPLSQLParserTst {
@Test
- public void testExamples() {
+ void testExamples() {
plsql.parseResource("TableCollectionExpressionExamples.pls");
}
@Test
- public void testIssue1526() {
+ void testIssue1526() {
plsql.parseResource("TableCollectionExpressionIssue1526.pls");
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/TriggerTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/TriggerTest.java
index 073d87274a..ec54030944 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/TriggerTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/TriggerTest.java
@@ -5,13 +5,15 @@
package net.sourceforge.pmd.lang.plsql.ast;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class TriggerTest extends AbstractPLSQLParserTst {
+class TriggerTest extends AbstractPLSQLParserTst {
/**
* Parsing a trigger should not result in a NPE.
@@ -19,10 +21,10 @@ public class TriggerTest extends AbstractPLSQLParserTst {
* @see #2325 [plsql] NullPointerException while running parsing test for CREATE TRIGGER
*/
@Test
- public void parseCreateTrigger() {
+ void parseCreateTrigger() {
ASTInput input = plsql.parseResource("TriggerUnit.pls");
PLSQLNode trigger = input.getChild(0);
- Assert.assertEquals(ASTTriggerUnit.class, trigger.getClass());
- Assert.assertNotNull(trigger.getScope());
+ assertEquals(ASTTriggerUnit.class, trigger.getClass());
+ assertNotNull(trigger.getScope());
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/TrimWithRecordTypeTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/TrimWithRecordTypeTest.java
index 9715fa9918..204d8056b2 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/TrimWithRecordTypeTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/TrimWithRecordTypeTest.java
@@ -4,14 +4,14 @@
package net.sourceforge.pmd.lang.plsql.ast;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class TrimWithRecordTypeTest extends AbstractPLSQLParserTst {
+class TrimWithRecordTypeTest extends AbstractPLSQLParserTst {
@Test
- public void parseTrimWithRecordType() {
+ void parseTrimWithRecordType() {
plsql.parseResource("TrimWithRecordType.pls");
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/UpdateStatementTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/UpdateStatementTest.java
index 9a56a576ec..95cd2f30ed 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/UpdateStatementTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/UpdateStatementTest.java
@@ -4,32 +4,34 @@
package net.sourceforge.pmd.lang.plsql.ast;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class UpdateStatementTest extends AbstractPLSQLParserTst {
+class UpdateStatementTest extends AbstractPLSQLParserTst {
@Test
- public void parseUpdateStatementExample() {
+ void parseUpdateStatementExample() {
ASTInput input = plsql.parseResource("UpdateStatementExample.pls");
List updateStatements = input.findDescendantsOfType(ASTUpdateStatement.class);
- Assert.assertEquals(2, updateStatements.size());
- Assert.assertEquals(2, updateStatements.get(1).getFirstChildOfType(ASTUpdateSetClause.class)
+ assertEquals(2, updateStatements.size());
+ assertEquals(2, updateStatements.get(1).getFirstChildOfType(ASTUpdateSetClause.class)
.findChildrenOfType(ASTColumn.class).size());
}
@Test
- public void parseUpdateStatementExample2() {
+ void parseUpdateStatementExample2() {
ASTInput input = plsql.parseResource("UpdateStatementExample2.pls");
- Assert.assertNotNull(input);
+ assertNotNull(input);
}
@Test
- public void parseUpdateStatementRef() {
+ void parseUpdateStatementRef() {
ASTInput input = plsql.parseResource("UpdateStatementRef.pls");
- Assert.assertNotNull(input);
+ assertNotNull(input);
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ViewTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ViewTest.java
index e62509f89b..952d28778c 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ViewTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ViewTest.java
@@ -4,24 +4,24 @@
package net.sourceforge.pmd.lang.plsql.ast;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class ViewTest extends AbstractPLSQLParserTst {
+class ViewTest extends AbstractPLSQLParserTst {
@Test
- public void parseCreateViewIssue981() {
+ void parseCreateViewIssue981() {
plsql.parseResource("ViewIssue981.pls");
}
@Test
- public void parseCreateView() {
+ void parseCreateView() {
plsql.parseResource("CreateViewWithSubquery.pls");
}
@Test
- public void parseCreateViewWithoutSemicolon() {
+ void parseCreateViewWithoutSemicolon() {
plsql.parseResource("QueryWithoutSemicolon.sql");
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/WhereClauseTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/WhereClauseTest.java
index 3c0b724362..9e9cac1b75 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/WhereClauseTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/WhereClauseTest.java
@@ -4,90 +4,91 @@
package net.sourceforge.pmd.lang.plsql.ast;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class WhereClauseTest extends AbstractPLSQLParserTst {
+class WhereClauseTest extends AbstractPLSQLParserTst {
@Test
- public void testFunctionCall() {
+ void testFunctionCall() {
ASTInput input = plsql.parseResource("WhereClauseFunctionCall.pls");
List selectStatements = input.findDescendantsOfType(ASTSelectIntoStatement.class);
- Assert.assertEquals(4, selectStatements.size());
+ assertEquals(4, selectStatements.size());
ASTFunctionCall functionCall = selectStatements.get(0).getFirstDescendantOfType(ASTFunctionCall.class);
- Assert.assertEquals("UPPER", functionCall.getImage());
+ assertEquals("UPPER", functionCall.getImage());
ASTFunctionCall functionCall2 = selectStatements.get(2).getFirstDescendantOfType(ASTFunctionCall.class);
- Assert.assertEquals("utils.get_colname", functionCall2.getImage());
+ assertEquals("utils.get_colname", functionCall2.getImage());
}
@Test
- public void testLikeCondition() {
+ void testLikeCondition() {
plsql.parseResource("WhereClauseLike.pls");
}
@Test
- public void testNullCondition() {
+ void testNullCondition() {
plsql.parseResource("WhereClauseIsNull.pls");
}
@Test
- public void testBetweenCondition() {
+ void testBetweenCondition() {
plsql.parseResource("WhereClauseBetween.pls");
}
@Test
- public void testInCondition() {
+ void testInCondition() {
plsql.parseResource("WhereClauseIn.pls");
}
@Test
- public void testIsOfTypeCondition() {
+ void testIsOfTypeCondition() {
plsql.parseResource("WhereClauseIsOfType.pls");
}
@Test
- public void testConcatenationOperator() {
+ void testConcatenationOperator() {
plsql.parseResource("WhereClauseConcatenation.pls");
}
@Test
- public void testExistsCondition() {
+ void testExistsCondition() {
plsql.parseResource("WhereClauseExists.pls");
}
@Test
- public void testMultisetCondition() {
+ void testMultisetCondition() {
plsql.parseResource("WhereClauseMultiset.pls");
}
@Test
- public void testRegexpLikeCondition() {
+ void testRegexpLikeCondition() {
ASTInput input = plsql.parseResource("WhereClauseRegexpLike.pls");
List regexps = input.findDescendantsOfType(ASTRegexpLikeCondition.class);
- Assert.assertEquals(3, regexps.size());
- Assert.assertEquals("last_name", regexps.get(1).getSourceChar().getImage());
- Assert.assertEquals("'([aeiou])\\1'", regexps.get(1).getPattern().getImage());
- Assert.assertEquals("'i'", regexps.get(1).getMatchParam());
+ assertEquals(3, regexps.size());
+ assertEquals("last_name", regexps.get(1).getSourceChar().getImage());
+ assertEquals("'([aeiou])\\1'", regexps.get(1).getPattern().getImage());
+ assertEquals("'i'", regexps.get(1).getMatchParam());
}
@Test
- public void testSubqueries() {
+ void testSubqueries() {
plsql.parseResource("WhereClauseSubqueries.pls");
}
@Test
- public void testParentheses() {
+ void testParentheses() {
plsql.parseResource("WhereClauseParens.pls");
}
@Test
- public void testCurrentOf() {
+ void testCurrentOf() {
plsql.parseResource("WhereCurrentOf.pls");
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/XMLElementTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/XMLElementTest.java
index 76842b31b8..cec7230e7e 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/XMLElementTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/XMLElementTest.java
@@ -4,21 +4,23 @@
package net.sourceforge.pmd.lang.plsql.ast;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-public class XMLElementTest extends AbstractPLSQLParserTst {
+class XMLElementTest extends AbstractPLSQLParserTst {
@Test
- public void testParseXMLElement() {
+ void testParseXMLElement() {
ASTInput input = plsql.parseResource("XMLElement.pls");
List xmlelements = input.findDescendantsOfType(ASTXMLElement.class);
- Assert.assertEquals(10, xmlelements.size());
- Assert.assertEquals("\"Emp\"", xmlelements.get(0).getFirstChildOfType(ASTID.class).getImage());
- Assert.assertTrue(xmlelements.get(3).getChild(1) instanceof ASTXMLAttributesClause);
+ assertEquals(10, xmlelements.size());
+ assertEquals("\"Emp\"", xmlelements.get(0).getFirstChildOfType(ASTID.class).getImage());
+ assertTrue(xmlelements.get(3).getChild(1) instanceof ASTXMLAttributesClause);
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/XMLTableTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/XMLTableTest.java
index ced763b904..306fb59d76 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/XMLTableTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/XMLTableTest.java
@@ -4,30 +4,31 @@
package net.sourceforge.pmd.lang.plsql.ast;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-
-public class XMLTableTest extends AbstractPLSQLParserTst {
+class XMLTableTest extends AbstractPLSQLParserTst {
@Test
- public void testParseXMLTable() {
+ void testParseXMLTable() {
ASTInput node = plsql.parseResource("XMLTable.pls");
List functions = node.findDescendantsOfType(ASTFunctionCall.class);
ASTFunctionCall xmlforest = functions.get(functions.size() - 1);
- Assert.assertEquals("XMLFOREST", xmlforest.getImage());
- Assert.assertEquals("e.employee_id", xmlforest.getChild(1).getImage());
- Assert.assertEquals("foo", xmlforest.getChild(2).getImage());
- Assert.assertTrue(xmlforest.getChild(2) instanceof ASTID);
- Assert.assertEquals("e.last_name", xmlforest.getChild(3).getImage());
- Assert.assertEquals("last_name", xmlforest.getChild(4).getImage());
- Assert.assertTrue(xmlforest.getChild(4) instanceof ASTID);
- Assert.assertEquals("e.salary", xmlforest.getChild(5).getImage());
- Assert.assertEquals(6, xmlforest.getNumChildren());
+ assertEquals("XMLFOREST", xmlforest.getImage());
+ assertEquals("e.employee_id", xmlforest.getChild(1).getImage());
+ assertEquals("foo", xmlforest.getChild(2).getImage());
+ assertTrue(xmlforest.getChild(2) instanceof ASTID);
+ assertEquals("e.last_name", xmlforest.getChild(3).getImage());
+ assertEquals("last_name", xmlforest.getChild(4).getImage());
+ assertTrue(xmlforest.getChild(4) instanceof ASTID);
+ assertEquals("e.salary", xmlforest.getChild(5).getImage());
+ assertEquals(6, xmlforest.getNumChildren());
}
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/bestpractices/TomKytesDespairTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/bestpractices/TomKytesDespairTest.java
index 103b36337c..64a423e233 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/bestpractices/TomKytesDespairTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/bestpractices/TomKytesDespairTest.java
@@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.plsql.rule.bestpractices;
import net.sourceforge.pmd.testframework.PmdRuleTst;
-public class TomKytesDespairTest extends PmdRuleTst {
+class TomKytesDespairTest extends PmdRuleTst {
// no additional unit tests
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/AvoidTabCharacterTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/AvoidTabCharacterTest.java
index 39111e4ee7..636f854a35 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/AvoidTabCharacterTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/AvoidTabCharacterTest.java
@@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.plsql.rule.codestyle;
import net.sourceforge.pmd.testframework.PmdRuleTst;
-public class AvoidTabCharacterTest extends PmdRuleTst {
+class AvoidTabCharacterTest extends PmdRuleTst {
// no additional unit tests
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/CodeFormatTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/CodeFormatTest.java
index 7c2b877152..7f047772e5 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/CodeFormatTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/CodeFormatTest.java
@@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.plsql.rule.codestyle;
import net.sourceforge.pmd.testframework.PmdRuleTst;
-public class CodeFormatTest extends PmdRuleTst {
+class CodeFormatTest extends PmdRuleTst {
// no additional unit tests
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/ForLoopNamingTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/ForLoopNamingTest.java
index 6813920933..1d8591a22a 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/ForLoopNamingTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/ForLoopNamingTest.java
@@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.plsql.rule.codestyle;
import net.sourceforge.pmd.testframework.PmdRuleTst;
-public class ForLoopNamingTest extends PmdRuleTst {
+class ForLoopNamingTest extends PmdRuleTst {
// no additional unit tests
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/LineLengthTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/LineLengthTest.java
index d668eefb53..40c5e9de7e 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/LineLengthTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/LineLengthTest.java
@@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.plsql.rule.codestyle;
import net.sourceforge.pmd.testframework.PmdRuleTst;
-public class LineLengthTest extends PmdRuleTst {
+class LineLengthTest extends PmdRuleTst {
// no additional unit tests
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/MisplacedPragmaTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/MisplacedPragmaTest.java
index ef16e2a0a5..9b41c0468e 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/MisplacedPragmaTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/MisplacedPragmaTest.java
@@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.plsql.rule.codestyle;
import net.sourceforge.pmd.testframework.PmdRuleTst;
-public class MisplacedPragmaTest extends PmdRuleTst {
+class MisplacedPragmaTest extends PmdRuleTst {
// no additional unit tests
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/CyclomaticComplexityTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/CyclomaticComplexityTest.java
index bb124beb55..d010d2bfa2 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/CyclomaticComplexityTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/CyclomaticComplexityTest.java
@@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.plsql.rule.design;
import net.sourceforge.pmd.testframework.PmdRuleTst;
-public class CyclomaticComplexityTest extends PmdRuleTst {
+class CyclomaticComplexityTest extends PmdRuleTst {
// no additional unit tests
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveMethodLengthTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveMethodLengthTest.java
index e8d3b47693..3ebc558d4a 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveMethodLengthTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveMethodLengthTest.java
@@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.plsql.rule.design;
import net.sourceforge.pmd.testframework.PmdRuleTst;
-public class ExcessiveMethodLengthTest extends PmdRuleTst {
+class ExcessiveMethodLengthTest extends PmdRuleTst {
// no additional unit tests
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveObjectLengthTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveObjectLengthTest.java
index b29f3fd446..4c794cfaa9 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveObjectLengthTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveObjectLengthTest.java
@@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.plsql.rule.design;
import net.sourceforge.pmd.testframework.PmdRuleTst;
-public class ExcessiveObjectLengthTest extends PmdRuleTst {
+class ExcessiveObjectLengthTest extends PmdRuleTst {
// no additional unit tests
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessivePackageBodyLengthTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessivePackageBodyLengthTest.java
index 622befeac7..78adcc1eb2 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessivePackageBodyLengthTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessivePackageBodyLengthTest.java
@@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.plsql.rule.design;
import net.sourceforge.pmd.testframework.PmdRuleTst;
-public class ExcessivePackageBodyLengthTest extends PmdRuleTst {
+class ExcessivePackageBodyLengthTest extends PmdRuleTst {
// no additional unit tests
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessivePackageSpecificationLengthTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessivePackageSpecificationLengthTest.java
index 0640ce86eb..b8a642a1b5 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessivePackageSpecificationLengthTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessivePackageSpecificationLengthTest.java
@@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.plsql.rule.design;
import net.sourceforge.pmd.testframework.PmdRuleTst;
-public class ExcessivePackageSpecificationLengthTest extends PmdRuleTst {
+class ExcessivePackageSpecificationLengthTest extends PmdRuleTst {
// no additional unit tests
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveParameterListTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveParameterListTest.java
index fb04705feb..fda74a8d80 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveParameterListTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveParameterListTest.java
@@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.plsql.rule.design;
import net.sourceforge.pmd.testframework.PmdRuleTst;
-public class ExcessiveParameterListTest extends PmdRuleTst {
+class ExcessiveParameterListTest extends PmdRuleTst {
// no additional unit tests
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveTypeLengthTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveTypeLengthTest.java
index 6be7fb1268..3d96d024ba 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveTypeLengthTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveTypeLengthTest.java
@@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.plsql.rule.design;
import net.sourceforge.pmd.testframework.PmdRuleTst;
-public class ExcessiveTypeLengthTest extends PmdRuleTst {
+class ExcessiveTypeLengthTest extends PmdRuleTst {
// no additional unit tests
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/NPathComplexityTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/NPathComplexityTest.java
index 5a3ba94273..6714824a8a 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/NPathComplexityTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/NPathComplexityTest.java
@@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.plsql.rule.design;
import net.sourceforge.pmd.testframework.PmdRuleTst;
-public class NPathComplexityTest extends PmdRuleTst {
+class NPathComplexityTest extends PmdRuleTst {
// no additional unit tests
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/NcssMethodCountTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/NcssMethodCountTest.java
index 34d7cccbf2..f8032c9396 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/NcssMethodCountTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/NcssMethodCountTest.java
@@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.plsql.rule.design;
import net.sourceforge.pmd.testframework.PmdRuleTst;
-public class NcssMethodCountTest extends PmdRuleTst {
+class NcssMethodCountTest extends PmdRuleTst {
// no additional unit tests
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/NcssObjectCountTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/NcssObjectCountTest.java
index 4f2a218923..8075fbd624 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/NcssObjectCountTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/NcssObjectCountTest.java
@@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.plsql.rule.design;
import net.sourceforge.pmd.testframework.PmdRuleTst;
-public class NcssObjectCountTest extends PmdRuleTst {
+class NcssObjectCountTest extends PmdRuleTst {
// no additional unit tests
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/TooManyFieldsTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/TooManyFieldsTest.java
index ba987410de..36126a01f5 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/TooManyFieldsTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/TooManyFieldsTest.java
@@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.plsql.rule.design;
import net.sourceforge.pmd.testframework.PmdRuleTst;
-public class TooManyFieldsTest extends PmdRuleTst {
+class TooManyFieldsTest extends PmdRuleTst {
// no additional unit tests
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/TooManyMethodsTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/TooManyMethodsTest.java
index 391b08d111..17e3237791 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/TooManyMethodsTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/TooManyMethodsTest.java
@@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.plsql.rule.design;
import net.sourceforge.pmd.testframework.PmdRuleTst;
-public class TooManyMethodsTest extends PmdRuleTst {
+class TooManyMethodsTest extends PmdRuleTst {
// no additional unit tests
}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/errorprone/ToDateToCharTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/errorprone/ToDateToCharTest.java
index 046bbab1ad..430413de15 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/errorprone/ToDateToCharTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/errorprone/ToDateToCharTest.java
@@ -10,7 +10,7 @@ import java.util.List;
import net.sourceforge.pmd.Rule;
import net.sourceforge.pmd.testframework.PmdRuleTst;
-public class ToDateToCharTest extends PmdRuleTst {
+class ToDateToCharTest extends PmdRuleTst {
// No additional unit tests
@Override
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/errorprone/ToDateWithoutDateFormatTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/errorprone/ToDateWithoutDateFormatTest.java
index ef77054422..ffa7b579e6 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/errorprone/ToDateWithoutDateFormatTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/errorprone/ToDateWithoutDateFormatTest.java
@@ -10,7 +10,7 @@ import java.util.List;
import net.sourceforge.pmd.Rule;
import net.sourceforge.pmd.testframework.PmdRuleTst;
-public class ToDateWithoutDateFormatTest extends PmdRuleTst {
+class ToDateWithoutDateFormatTest extends PmdRuleTst {
// No additional unit tests
@Override
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/errorprone/ToTimestampWithoutDateFormatTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/errorprone/ToTimestampWithoutDateFormatTest.java
index 5c0b4fe312..fbe970e5af 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/errorprone/ToTimestampWithoutDateFormatTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/errorprone/ToTimestampWithoutDateFormatTest.java
@@ -10,7 +10,7 @@ import java.util.List;
import net.sourceforge.pmd.Rule;
import net.sourceforge.pmd.testframework.PmdRuleTst;
-public class ToTimestampWithoutDateFormatTest extends PmdRuleTst {
+class ToTimestampWithoutDateFormatTest extends PmdRuleTst {
// No additional unit tests
@Override