Skip to content

Commit c7a282a

Browse files
PhilippSalvisbergPhilippSalvisberg
committed
refactor tests to address warnings in IntelliJ
1 parent bfe7ffe commit c7a282a

11 files changed

+55
-42
lines changed

‎sqldev/src/test/java/org/utplsql/sqldev/test/AbstractJdbcTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@
3131
import oracle.dbtools.worksheet.scriptparser.sqlplus.SQLPlusScriptParser;
3232

3333
public abstract class AbstractJdbcTest {
34-
protected static SingleConnectionDataSource dataSource;
35-
protected static JdbcTemplate jdbcTemplate;
36-
protected static SingleConnectionDataSource sysDataSource;
37-
protected static JdbcTemplate sysJdbcTemplate;
34+
protected static final SingleConnectionDataSource dataSource;
35+
protected static final JdbcTemplate jdbcTemplate;
36+
protected static final SingleConnectionDataSource sysDataSource;
37+
protected static final JdbcTemplate sysJdbcTemplate;
3838

3939
static {
4040
final Properties p = new Properties();
4141
try {
42-
p.load(AbstractJdbcTest.class.getClass().getResourceAsStream("/test.properties"));
42+
p.load(AbstractJdbcTest.class.getResourceAsStream("/test.properties"));
4343
} catch (IOException e) {
4444
throw new GenericRuntimeException("Cannot read test.properties", e);
4545
}

‎sqldev/src/test/java/org/utplsql/sqldev/test/PrefixToolsTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package org.utplsql.sqldev.test;
1717

1818
import java.util.Arrays;
19+
import java.util.Collections;
1920

2021
import org.junit.Assert;
2122
import org.junit.Test;
@@ -31,14 +32,14 @@ public void two() {
3132

3233
@Test
3334
public void oneWithDot() {
34-
final String actual = PrefixTools.commonPrefix(Arrays.asList("junit.test.a"));
35+
final String actual = PrefixTools.commonPrefix(Collections.singletonList("junit.test.a"));
3536
final String expected = "junit.test.";
3637
Assert.assertEquals(expected, actual);
3738
}
3839

3940
@Test
4041
public void oneWithoutDot() {
41-
final String actual = PrefixTools.commonPrefix(Arrays.asList("junit-test-a"));
42+
final String actual = PrefixTools.commonPrefix(Collections.singletonList("junit-test-a"));
4243
final String expected = "";
4344
Assert.assertEquals(expected, actual);
4445
}

‎sqldev/src/test/java/org/utplsql/sqldev/test/coverage/CodeCoverageReporterDialogTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package org.utplsql.sqldev.test.coverage;
1717

1818
import java.util.Arrays;
19+
import java.util.Collections;
1920

2021
import org.junit.Assert;
2122
import org.junit.Test;
@@ -29,7 +30,7 @@ public class CodeCoverageReporterDialogTest extends AbstractJdbcTest {
2930

3031
@Test
3132
public void layout() {
32-
final CodeCoverageReporter reporter = new CodeCoverageReporter(Arrays.asList("SCOTT"),
33+
final CodeCoverageReporter reporter = new CodeCoverageReporter(Collections.singletonList("SCOTT"),
3334
Arrays.asList("a", "b", "c"), DatabaseTools.getConnection(dataSource));
3435
reporter.showParameterWindow();
3536
SystemTools.sleep(4 * 1000);

‎sqldev/src/test/java/org/utplsql/sqldev/test/coverage/CodeCoverageReporterTest.java

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@
2020
import java.nio.charset.StandardCharsets;
2121
import java.nio.file.Files;
2222
import java.nio.file.Path;
23-
import java.util.Arrays;
24-
import java.util.Comparator;
25-
import java.util.List;
26-
import java.util.Optional;
23+
import java.util.*;
2724

2825
import org.junit.After;
2926
import org.junit.Assert;
@@ -96,8 +93,8 @@ private Path getNewestOutputFile() {
9693

9794
@Test
9895
public void produceReportAndCloseConnection() {
99-
final List<String> pathList = Arrays.asList(":test_f");
100-
final List<String> includeObjectList = Arrays.asList("f");
96+
final List<String> pathList = Collections.singletonList(":test_f");
97+
final List<String> includeObjectList = Collections.singletonList("f");
10198
final CodeCoverageReporter reporter = new CodeCoverageReporter(pathList, includeObjectList, DatabaseTools.getConnection(dataSource));
10299
final Thread run = reporter.runAsync();
103100
SystemTools.waitForThread(run, 20000);
@@ -113,28 +110,28 @@ public void produceReportAndCloseConnection() {
113110

114111
@Test
115112
public void defaultSchemaCalculationMixedCase() {
116-
final CodeCoverageReporter reporter = new CodeCoverageReporter(Arrays.asList(":something"),
113+
final CodeCoverageReporter reporter = new CodeCoverageReporter(Collections.singletonList(":something"),
117114
Arrays.asList("scott.a", "scott.b", "hR.a", "HR.B", "hr.c"), DatabaseTools.getConnection(dataSource));
118115
Assert.assertEquals("HR, SCOTT", reporter.getSchemas());
119116
}
120117

121118
@Test
122119
public void defaultSchemaCalculationWithoutIncludeObjects() {
123-
final CodeCoverageReporter reporter = new CodeCoverageReporter(Arrays.asList(":something"),
124-
Arrays.asList(), DatabaseTools.getConnection(dataSource));
125-
Assert.assertEquals(null, reporter.getSchemas());
120+
final CodeCoverageReporter reporter = new CodeCoverageReporter(Collections.singletonList(":something"),
121+
Collections.emptyList(), DatabaseTools.getConnection(dataSource));
122+
Assert.assertNull(reporter.getSchemas());
126123
}
127124

128125
@Test
129126
public void defaultSchemaCalculationWithoutOwnerInformation() {
130-
final CodeCoverageReporter reporter = new CodeCoverageReporter(Arrays.asList(":something"),
127+
final CodeCoverageReporter reporter = new CodeCoverageReporter(Collections.singletonList(":something"),
131128
Arrays.asList("a", "b", "c"), DatabaseTools.getConnection(dataSource));
132129
Assert.assertEquals("", reporter.getSchemas());
133130
}
134131

135132
@Test
136133
public void defaultSchemaCalculationWithJustOneOwner() {
137-
final CodeCoverageReporter reporter = new CodeCoverageReporter(Arrays.asList(":something"),
134+
final CodeCoverageReporter reporter = new CodeCoverageReporter(Collections.singletonList(":something"),
138135
Arrays.asList("a", "b", "scott.c"), DatabaseTools.getConnection(dataSource));
139136
Assert.assertEquals("SCOTT", reporter.getSchemas());
140137
}

‎sqldev/src/test/java/org/utplsql/sqldev/test/dal/DalTest.java

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@
1515
*/
1616
package org.utplsql.sqldev.test.dal;
1717

18-
import java.util.ArrayList;
19-
import java.util.Arrays;
20-
import java.util.HashMap;
21-
import java.util.List;
18+
import java.util.*;
2219

2320
import org.junit.After;
2421
import org.junit.Assert;
@@ -60,7 +57,7 @@ public void isDbaViewAccessibleAsSys() {
6057
public void utplsqlSchemaWithoutPublicSynonym() {
6158
sysJdbcTemplate.execute("DROP PUBLIC SYNONYM ut");
6259
final UtplsqlDao dao = new UtplsqlDao(DatabaseTools.getConnection(dataSource));
63-
Assert.assertEquals(null, dao.getUtplsqlSchema());
60+
Assert.assertNull(dao.getUtplsqlSchema());
6461
}
6562

6663
@Test
@@ -172,7 +169,7 @@ private void annotations(final String utPlsqlVersion) {
172169
sb.append("END junit_utplsql_test_pkg;");
173170
jdbcTemplate.execute(sb.toString());
174171
final List<Annotation> actual = dao.annotations("scott", "junit_utplsql_test_pkg");
175-
final ArrayList<Annotation> expected = new ArrayList<Annotation>();
172+
final ArrayList<Annotation> expected = new ArrayList<>();
176173
final Annotation suite = new Annotation();
177174
suite.setObjectOwner("SCOTT");
178175
suite.setObjectName("JUNIT_UTPLSQL_TEST_PKG");
@@ -387,6 +384,7 @@ public void testablesProcedures318() {
387384

388385
public void runnables(final String utPlsqlVersion) {
389386
final UtplsqlDao dao = new UtplsqlDao(DatabaseTools.getConnection(dataSource));
387+
dao.setUtPlsqlVersion(utPlsqlVersion);
390388
StringBuilder sb = new StringBuilder();
391389
sb.append("CREATE OR REPLACE PACKAGE junit_utplsql_test_pkg IS\n");
392390
sb.append(" -- %suite\n");
@@ -411,17 +409,17 @@ public void runnables(final String utPlsqlVersion) {
411409
jdbcTemplate.execute(sb.toString());
412410
final List<Node> actualNodes = dao.runnables();
413411
Assert.assertEquals(16, actualNodes.size());
414-
final HashMap<String, String> actual = new HashMap<String, String>();
412+
final HashMap<String, String> actual = new HashMap<>();
415413
for (final Node node : actualNodes) {
416414
actual.put(node.getId(), node.getParentId());
417415
}
418-
Assert.assertEquals(null, actual.get("SUITE"));
416+
Assert.assertNull(actual.get("SUITE"));
419417
Assert.assertEquals("SUITE", actual.get("SCOTT.JUNIT_UTPLSQL_TEST_PKG"));
420418
Assert.assertEquals("SCOTT.JUNIT_UTPLSQL_TEST_PKG", actual.get("SCOTT.JUNIT_UTPLSQL_TEST_PKG.T0"));
421419
Assert.assertEquals("SCOTT.JUNIT_UTPLSQL_TEST_PKG", actual.get("SCOTT.JUNIT_UTPLSQL_TEST_PKG.T1"));
422420
Assert.assertEquals("SCOTT.JUNIT_UTPLSQL_TEST_PKG", actual.get("SCOTT.JUNIT_UTPLSQL_TEST_PKG.T2"));
423421
Assert.assertEquals("SCOTT.JUNIT_UTPLSQL_TEST_PKG", actual.get("SCOTT.JUNIT_UTPLSQL_TEST_PKG.T3"));
424-
Assert.assertEquals(null, actual.get("SUITEPATH"));
422+
Assert.assertNull(actual.get("SUITEPATH"));
425423
Assert.assertEquals("SUITEPATH", actual.get("SCOTT:a"));
426424
Assert.assertEquals("SCOTT:a", actual.get("SCOTT:a.b"));
427425
Assert.assertEquals("SCOTT:a.b", actual.get("SCOTT:a.b.c"));
@@ -474,11 +472,26 @@ public void dbmsOutput() {
474472
Assert.assertEquals(expected, actual);
475473
}
476474

475+
@Test
476+
public void disableDbmsOutput() {
477+
final UtplsqlDao dao = new UtplsqlDao(DatabaseTools.getConnection(dataSource));
478+
dao.enableDbmsOutput();
479+
StringBuilder sb = new StringBuilder();
480+
sb.append("BEGIN\n");
481+
sb.append(" sys.dbms_output.put_line('line1');\n");
482+
sb.append("END;");
483+
jdbcTemplate.execute(sb.toString());
484+
Assert.assertEquals("line1\n", dao.getDbmsOutput());
485+
dao.disableDbmsOutput();
486+
jdbcTemplate.execute(sb.toString());
487+
Assert.assertEquals("", dao.getDbmsOutput());
488+
}
489+
477490
@Test
478491
public void htmlCodeCoverage() {
479492
final UtplsqlDao dao = new UtplsqlDao(DatabaseTools.getConnection(dataSource));
480-
final String actual = dao.htmlCodeCoverage(Arrays.asList("SCOTT"), Arrays.asList("scott"), Arrays.asList(),
481-
Arrays.asList(), null);
493+
final String actual = dao.htmlCodeCoverage(Collections.singletonList("SCOTT"), Collections.singletonList("scott"), Collections.emptyList(),
494+
Collections.emptyList(), null);
482495
Assert.assertTrue(actual.startsWith("<!DOCTYPE html>"));
483496
Assert.assertTrue(actual.trim().endsWith("</html>"));
484497
// default assets accessed via internet
@@ -514,7 +527,7 @@ public void includes() {
514527
jdbcTemplate.execute(sb.toString());
515528
final UtplsqlDao dao = new UtplsqlDao(DatabaseTools.getConnection(dataSource));
516529
final List<String> actualEmpty = dao.includes("SCOTT", "TEST_F1");
517-
Assert.assertEquals(Arrays.asList(), actualEmpty);
530+
Assert.assertEquals(Collections.emptyList(), actualEmpty);
518531
final List<String> actual = dao.includes("SCOTT", "junit_utplsql_test_pkg");
519532
Assert.assertTrue(actual.stream().anyMatch(it -> it.equals("SCOTT.JUNIT_UTPLSQL_TEST_PKG")));
520533
Assert.assertTrue(actual.stream().anyMatch(it -> it.equals("SCOTT.JUNIT_F")));
@@ -558,7 +571,7 @@ public void utPlsqlVersion() {
558571
final UtplsqlDao dao = new UtplsqlDao(DatabaseTools.getConnection(dataSource));
559572
final String actual = dao.getUtPlsqlVersion();
560573
final String sql = "SELECT ut.version FROM DUAL";
561-
final String expected = jdbcTemplate.<String>queryForObject(sql, String.class);
574+
final String expected = jdbcTemplate.queryForObject(sql, String.class);
562575
Assert.assertEquals(expected, actual);
563576
}
564577

@@ -616,6 +629,6 @@ public void getObjectType() {
616629
public void normalizedUtPlsqlVersion() {
617630
final UtplsqlDao dao = new UtplsqlDao(DatabaseTools.getConnection(dataSource));
618631
final String version = dao.normalizedUtPlsqlVersion();
619-
Assert.assertTrue(version != null);
632+
Assert.assertNotNull(version);
620633
}
621634
}

‎sqldev/src/test/java/org/utplsql/sqldev/test/dal/RealtimeReporterFetchSizeTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package org.utplsql.sqldev.test.dal;
1717

18-
import java.util.Arrays;
18+
import java.util.Collections;
1919
import java.util.UUID;
2020
import java.util.logging.Logger;
2121

@@ -95,7 +95,7 @@ private void delayFreeStreamingConsumtionProducer(final String reporterId) {
9595
ds.setUsername(dataSource.getUsername());
9696
ds.setPassword(dataSource.getPassword());
9797
final RealtimeReporterDao dao = new RealtimeReporterDao(DatabaseTools.getConnection(ds));
98-
dao.produceReport(reporterId, Arrays.asList("junit_utplsql_fetch_size_pkg"));
98+
dao.produceReport(reporterId, Collections.singletonList("junit_utplsql_fetch_size_pkg"));
9999
}
100100

101101
@Test

‎sqldev/src/test/java/org/utplsql/sqldev/test/dal/RealtimeReporterTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package org.utplsql.sqldev.test.dal;
1717

1818
import java.util.Arrays;
19+
import java.util.Collections;
1920
import java.util.UUID;
2021
import java.util.logging.Logger;
2122

@@ -179,7 +180,7 @@ public void produceAndConsumeWithCoverage() {
179180
final String realtimeReporterId = UUID.randomUUID().toString().replace("-", "");
180181
final String coverageReporterId = UUID.randomUUID().toString().replace("-", "");
181182
final TestRealtimerReporterEventConsumer consumer = new TestRealtimerReporterEventConsumer();
182-
dao.produceReportWithCoverage(realtimeReporterId, coverageReporterId, Arrays.asList(":test_f"), null, null, null, null);
183+
dao.produceReportWithCoverage(realtimeReporterId, coverageReporterId, Collections.singletonList(":test_f"), null, null, null, null);
183184
dao.consumeReport(realtimeReporterId, consumer);
184185
logger.fine(consumer.getConsumedList().toString());
185186
Assert.assertEquals(6, consumer.getConsumedList().size());

‎sqldev/src/test/java/org/utplsql/sqldev/test/parser/UtplsqlParserTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ public void unknown() {
209209
sb.append("/\n");
210210
final String plsql = sb.toString();
211211
final UtplsqlParser parser = new UtplsqlParser(plsql);
212-
Assert.assertEquals(null, parser.getObjectAt(0));
212+
Assert.assertNull(parser.getObjectAt(0));
213213
}
214214

215215
@Test

‎sqldev/src/test/java/org/utplsql/sqldev/test/preference/PreferenceModelTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void defaultValues() {
5353
Assert.assertEquals(3, model.getIndentSpaces());
5454
Assert.assertTrue(model.isGenerateFiles());
5555
Assert.assertEquals(PreferenceModel.DEFAULT_OUTPUT_DIRECTORY, model.getOutputDirectory());
56-
Assert.assertEquals(false, model.isDeleteExistingFiles());
56+
Assert.assertFalse(model.isDeleteExistingFiles());
5757
Assert.assertEquals("utPLSQL", model.getRootFolderInOddgenView());
5858
}
5959
}

‎sqldev/src/test/java/org/utplsql/sqldev/test/runner/ExpectationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ private Expectation getExpectationWithoutDescription() {
3939
@Test
4040
public void failedExpectationCallerLine() {
4141
final Integer actual = getExpectationWithDescription().getCallerLine();
42-
final Integer expected = Integer.valueOf(14);
42+
final Integer expected = 14;
4343
Assert.assertEquals(expected, actual);
4444
}
4545

‎sqldev/src/test/java/org/utplsql/sqldev/test/runner/SmartTimeTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ public class SmartTimeTest {
2424
@Test
2525
public void null_default() {
2626
final String effective = new SmartTime(null, false).toString();
27-
Assert.assertEquals(null, effective);
27+
Assert.assertNull(effective);
2828
}
2929

3030
@Test
3131
public void null_smart() {
3232
final String effective = new SmartTime(null, true).toString();
33-
Assert.assertEquals(null, effective);
33+
Assert.assertNull(effective);
3434
}
3535

3636
@Test

0 commit comments

Comments
 (0)