Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit141215a

Browse files
committed
tests imports optimized
refactored ReportInspectors: moved Map creation to interface default method, moved info storage and initialization to subclasses from abstract class.Fixed test failure due to wrong order of construction
1 parent6e34be6 commit141215a

File tree

10 files changed

+30
-53
lines changed

10 files changed

+30
-53
lines changed

‎src/main/java/org/utplsql/api/reporter/inspect/AbstractReporterInspector.java

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,15 @@
33
importorg.utplsql.api.reporter.ReporterFactory;
44

55
importjava.sql.Connection;
6-
importjava.sql.SQLException;
7-
importjava.util.*;
8-
importjava.util.function.Function;
9-
importjava.util.stream.Collectors;
106

117
abstractclassAbstractReporterInspectorimplementsReporterInspector {
128

139
protectedfinalReporterFactoryreporterFactory;
1410
protectedfinalConnectionconnection;
15-
protectedfinalSet<ReporterInfo>infos;
1611

17-
AbstractReporterInspector(ReporterFactoryreporterFactory,Connectionconn )throwsSQLException{
12+
AbstractReporterInspector(ReporterFactoryreporterFactory,Connectionconn ) {
1813
this.reporterFactory =reporterFactory;
1914
this.connection =conn;
20-
this.infos =loadReporterInfos();
21-
}
22-
23-
protectedabstractSet<ReporterInfo>loadReporterInfos()throwsSQLException;
24-
25-
@Override
26-
publicMap<String,ReporterInfo>getReporterInfoMap() {
27-
returninfos.stream().collect(Collectors.toMap(ReporterInfo::getName,Function.identity()));
28-
}
29-
30-
@Override
31-
publicList<ReporterInfo>getReporterInfos() {
32-
returnnewArrayList<>(infos);
3315
}
3416

3517
}

‎src/main/java/org/utplsql/api/reporter/inspect/ReporterInspector.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
importjava.sql.SQLException;
1010
importjava.util.List;
1111
importjava.util.Map;
12+
importjava.util.function.Function;
13+
importjava.util.stream.Collectors;
1214

1315
/**
1416
* Gives information about available reporters
@@ -19,7 +21,9 @@ public interface ReporterInspector {
1921

2022
List<ReporterInfo>getReporterInfos();
2123

22-
Map<String,ReporterInfo>getReporterInfoMap();
24+
defaultMap<String,ReporterInfo>getReporterInfoMap() {
25+
returngetReporterInfos().stream().collect(Collectors.toMap(ReporterInfo::getName,Function.identity()));
26+
}
2327

2428
/**
2529
* Returns a new instance of a ReporterInspector, based on the utPLSQL version used in the connection

‎src/main/java/org/utplsql/api/reporter/inspect/ReporterInspector310.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,29 @@
2020
classReporterInspector310extendsAbstractReporterInspector {
2121

2222
privatefinalMap<String,String>registeredReporterFactoryMethods;
23+
privatefinalSet<ReporterInfo>infos;
2324

2425
ReporterInspector310(ReporterFactoryreporterFactory,Connectionconn )throwsSQLException {
2526
super(reporterFactory,conn);
26-
2727
registeredReporterFactoryMethods =reporterFactory.getRegisteredReporterInfo();
2828

29-
}
30-
31-
@Override
32-
protectedSet<ReporterInfo>loadReporterInfos()throwsSQLException {
3329
Set<ReporterInfo>reporterInfos =newHashSet<>();
3430
try (PreparedStatementstmt =connection.prepareStatement("select * from table(ut_runner.get_reporters_list) order by 1")) {
3531
try (ResultSetrs =stmt.executeQuery() ) {
3632
while (rs.next())
3733
reporterInfos.add(getReporterInfo(rs.getString(1)));
3834
}
3935
}
40-
returnreporterInfos;
36+
this.infos =reporterInfos;
37+
38+
}
39+
40+
@Override
41+
publicList<ReporterInfo>getReporterInfos() {
42+
returnnewArrayList<>(infos);
4143
}
4244

43-
privateReporterInfogetReporterInfo(StringreporterNameWithOwner )throwsSQLException {
45+
privateReporterInfogetReporterInfo(StringreporterNameWithOwner )throwsSQLException {
4446
StringreporterName =reporterNameWithOwner.substring(reporterNameWithOwner.indexOf(".")+1).toUpperCase();
4547

4648
ReporterInfo.Typetype =ReporterInfo.Type.SQL;

‎src/main/java/org/utplsql/api/reporter/inspect/ReporterInspectorPre310.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,25 @@
77

88
importjava.sql.Connection;
99
importjava.sql.SQLException;
10-
importjava.util.Arrays;
11-
importjava.util.HashMap;
12-
importjava.util.Map;
13-
importjava.util.Set;
10+
importjava.util.*;
1411
importjava.util.stream.Collectors;
1512

1613
classReporterInspectorPre310extendsAbstractReporterInspector {
1714

1815
privatefinalMap<String,String>registeredReporterFactoryMethods;
1916
privatefinalMap<CoreReporters,String>descriptions =newHashMap<>();
17+
privatefinalSet<ReporterInfo>infos;
2018

2119
ReporterInspectorPre310(ReporterFactoryreporterFactory,Connectionconn)throwsSQLException {
2220
super(reporterFactory,conn);
23-
initDefaultDescriptions();
2421
registeredReporterFactoryMethods =reporterFactory.getRegisteredReporterInfo();
22+
initDefaultDescriptions();
23+
24+
VersiondatabaseVersion =newCompatibilityProxy(connection).getDatabaseVersion();
25+
this.infos =Arrays.stream(CoreReporters.values())
26+
.filter(r ->r.isAvailableFor(databaseVersion))
27+
.map(this::getReporterInfo)
28+
.collect(Collectors.toSet());
2529
}
2630

2731
privatevoidinitDefaultDescriptions() {
@@ -35,12 +39,8 @@ private void initDefaultDescriptions() {
3539
}
3640

3741
@Override
38-
protectedSet<ReporterInfo>loadReporterInfos()throwsSQLException {
39-
VersiondatabaseVersion =newCompatibilityProxy(connection).getDatabaseVersion();
40-
returnArrays.stream(CoreReporters.values())
41-
.filter(r ->r.isAvailableFor(databaseVersion))
42-
.map(this::getReporterInfo)
43-
.collect(Collectors.toSet());
42+
publicList<ReporterInfo>getReporterInfos() {
43+
returnnewArrayList<>(this.infos);
4444
}
4545

4646
privateReporterInfogetReporterInfo(CoreReportersreporter) {

‎src/test/java/org/utplsql/api/RegisterCustomReporterTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
packageorg.utplsql.api;
22

33
importorg.junit.jupiter.api.Test;
4-
importorg.utplsql.api.compatibility.CompatibilityProxy;
54
importorg.utplsql.api.reporter.DefaultReporter;
65
importorg.utplsql.api.reporter.Reporter;
76
importorg.utplsql.api.reporter.ReporterFactory;

‎src/test/java/org/utplsql/api/ReporterInspectorIT.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,18 @@
11
packageorg.utplsql.api;
22

3-
importoracle.jdbc.OracleCallableStatement;
4-
importoracle.jdbc.OracleConnection;
5-
importoracle.jdbc.OracleType;
63
importorg.junit.jupiter.api.Test;
74
importorg.utplsql.api.compatibility.CompatibilityProxy;
85
importorg.utplsql.api.exception.InvalidVersionException;
96
importorg.utplsql.api.reporter.CoreReporters;
10-
importorg.utplsql.api.reporter.Reporter;
117
importorg.utplsql.api.reporter.ReporterFactory;
128
importorg.utplsql.api.reporter.inspect.ReporterInfo;
139
importorg.utplsql.api.reporter.inspect.ReporterInspector;
1410

15-
importjava.sql.PreparedStatement;
1611
importjava.sql.SQLException;
17-
importjava.sql.SQLType;
1812
importjava.util.Comparator;
1913
importjava.util.Map;
2014

2115
importstaticorg.junit.jupiter.api.Assertions.assertEquals;
22-
importstaticorg.junit.jupiter.api.Assertions.assertNotNull;
2316

2417
publicclassReporterInspectorITextendsAbstractDatabaseTest {
2518

‎src/test/java/org/utplsql/api/TestRunnerIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
importorg.utplsql.api.compatibility.CompatibilityProxy;
66
importorg.utplsql.api.exception.InvalidVersionException;
77
importorg.utplsql.api.exception.SomeTestsFailedException;
8-
importorg.utplsql.api.reporter.*;
8+
importorg.utplsql.api.reporter.CoreReporters;
99

1010
importjava.sql.Connection;
1111
importjava.sql.SQLException;

‎src/test/java/org/utplsql/api/VersionObjectTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
importorg.junit.jupiter.api.Test;
44
importorg.utplsql.api.exception.InvalidVersionException;
55

6-
importstaticorg.junit.jupiter.api.Assertions.assertEquals;
7-
importstaticorg.junit.jupiter.api.Assertions.assertNull;
8-
importstaticorg.junit.jupiter.api.Assertions.fail;
6+
importstaticorg.junit.jupiter.api.Assertions.*;
97

108
publicclassVersionObjectTest {
119

‎src/test/java/org/utplsql/api/reporter/CoverageHTMLReporterAssetTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
importorg.junit.jupiter.api.AfterAll;
44
importorg.junit.jupiter.api.Test;
55

6-
importstaticorg.junit.jupiter.api.Assertions.*;
7-
86
importjava.io.File;
97
importjava.io.IOException;
108
importjava.nio.file.*;
119
importjava.nio.file.attribute.BasicFileAttributes;
1210

11+
importstaticorg.junit.jupiter.api.Assertions.assertTrue;
12+
1313
publicclassCoverageHTMLReporterAssetTest {
1414

1515
privatestaticfinalStringTEST_FOLDER ="__testAssets";

‎src/test/java/org/utplsql/api/testRunner/TestRunnerStatementProviderIT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
importjava.sql.SQLException;
99

1010
importstaticorg.junit.jupiter.api.Assertions.assertEquals;
11-
importstaticorg.junit.jupiter.api.Assertions.fail;
1211

1312
publicclassTestRunnerStatementProviderITextendsAbstractDatabaseTest {
1413

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp