Skip to content

Commit b36dac0

Browse files
authored
Remove unneeded API in pluggable storage (#171)
1 parent d7d76b4 commit b36dac0

File tree

3 files changed

+2
-104
lines changed

3 files changed

+2
-104
lines changed

src/main/java/hudson/tasks/junit/ClassResult.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -132,15 +132,7 @@ public CaseResult getCaseResult(String name) {
132132

133133
@Override
134134
public Object getDynamic(String name, StaplerRequest req, StaplerResponse rsp) {
135-
JunitTestResultStorage storage = JunitTestResultStorage.find();
136-
CaseResult c;
137-
if (!(storage instanceof FileJunitTestResultStorage)) {
138-
Run<?, ?> run = Stapler.getCurrentRequest().findAncestorObject(Run.class);
139-
TestResultImpl pluggableStorage = storage.load(run.getParent().getFullName(), run.getNumber());
140-
c = pluggableStorage.getCaseResult(name);
141-
} else {
142-
c = getCaseResult(name);
143-
}
135+
CaseResult c = getCaseResult(name);
144136
if (c != null) {
145137
return c;
146138
} else {

src/main/java/io/jenkins/plugins/junit/storage/TestResultImpl.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,7 @@ public interface TestResultImpl {
105105
*/
106106
@CheckForNull
107107
TestResult getPreviousResult();
108-
109-
// These methods don't take into account context of packages
110-
// so could easily lookup the wrong test
111-
// they are used in the classic view for test results
112-
ClassResult getClassResult(String name);
113-
CaseResult getCaseResult(String name);
114-
115108
SuiteResult getSuite(String name);
116109

117-
// end dodgy methods with no context
118-
119110
float getTotalTestDuration();
120111
}

src/test/java/io/jenkins/plugins/junit/storage/TestResultStorageJunitTest.java

Lines changed: 1 addition & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -485,50 +485,7 @@ public PackageResult getPackageResult(String packageName) {
485485
});
486486

487487
}
488-
489-
@Override
490-
public ClassResult getClassResult(String name) {
491-
return query(connection -> {
492-
try (PreparedStatement statement = connection.prepareStatement("SELECT suite, package, testname, classname, errordetails, skipped, duration, stdout, stderr, stacktrace FROM " + Impl.CASE_RESULTS_TABLE + " WHERE job = ? AND build = ? AND classname = ?")) {
493-
statement.setString(1, job);
494-
statement.setInt(2, build);
495-
statement.setString(3, name);
496-
try (ResultSet result = statement.executeQuery()) {
497-
498-
ClassResult classResult = null;
499-
TestResult parent = new TestResult(this);
500-
while (result.next()) {
501-
String testName = result.getString("testname");
502-
String packageName = result.getString("package");
503-
String errorDetails = result.getString("errordetails");
504-
String suite = result.getString("suite");
505-
String className = result.getString("classname");
506-
String skipped = result.getString("skipped");
507-
String stdout = result.getString("stdout");
508-
String stderr = result.getString("stderr");
509-
String stacktrace = result.getString("stacktrace");
510-
float duration = result.getFloat("duration");
511-
512-
if (classResult == null) {
513-
classResult = new ClassResult(new PackageResult(new TestResult(this), packageName), className);
514-
}
515-
516-
SuiteResult suiteResult = new SuiteResult(suite, null, null, null);
517-
suiteResult.setParent(parent);
518-
CaseResult caseResult = new CaseResult(suiteResult, className, testName, errorDetails, skipped, duration, stdout, stderr, stacktrace);
519-
classResult.add(caseResult);
520-
caseResult.setClass(classResult);
521-
}
522-
if (classResult != null) {
523-
classResult.tally();
524-
}
525-
return classResult;
526-
}
527-
}
528-
});
529-
530-
}
531-
488+
532489
@Override
533490
public Run<?, ?> getFailedSinceRun(CaseResult caseResult) {
534491
return query(connection -> {
@@ -644,48 +601,6 @@ private List<CaseResult> getCaseResults(String column) {
644601
return retrieveCaseResult(column + " IS NOT NULL");
645602
}
646603

647-
@Override
648-
public CaseResult getCaseResult(String testName) {
649-
return query(connection -> {
650-
try (PreparedStatement statement = connection.prepareStatement("SELECT suite, testname, package, classname, errordetails, skipped, duration, stdout, stderr, stacktrace FROM " + Impl.CASE_RESULTS_TABLE + " WHERE job = ? AND build = ? AND testname = ?")) {
651-
statement.setString(1, job);
652-
statement.setInt(2, build);
653-
statement.setString(3, testName);
654-
try (ResultSet result = statement.executeQuery()) {
655-
656-
CaseResult caseResult = null;
657-
658-
if (result.next()) {
659-
String resultTestName = result.getString("testname");
660-
String errorDetails = result.getString("errordetails");
661-
String packageName = result.getString("package");
662-
String suite = result.getString("suite");
663-
String className = result.getString("classname");
664-
String skipped = result.getString("skipped");
665-
String stdout = result.getString("stdout");
666-
String stderr = result.getString("stderr");
667-
String stacktrace = result.getString("stacktrace");
668-
float duration = result.getFloat("duration");
669-
670-
SuiteResult suiteResult = new SuiteResult(suite, null, null, null);
671-
suiteResult.setParent(new TestResult(this));
672-
caseResult = new CaseResult(suiteResult, className, resultTestName, errorDetails, skipped, duration, stdout, stderr, stacktrace);
673-
PackageResult packageResult = new PackageResult(new TestResult(this), packageName);
674-
ClassResult classResult = new ClassResult(packageResult, className);
675-
classResult.add(caseResult);
676-
packageResult.add(caseResult);
677-
packageResult.tally();
678-
caseResult.tally();
679-
caseResult.setClass(classResult);
680-
}
681-
return caseResult;
682-
}
683-
}
684-
});
685-
686-
687-
}
688-
689604
@Override
690605
public SuiteResult getSuite(String name) {
691606
return query(connection -> {

0 commit comments

Comments
 (0)