BDC/diy-layout-creator
2
0
Fork 0
mirror of https://github.com/bancika/diy-layout-creator synced 2026-11-11 01:32:08 +10:00
Code Issues Packages Projects Releases Wiki Activity

Update RegressionTestRunner.java

Browse Source
This commit is contained in:
Bane Stojkovic
2022-11-24 09:15:53 +01:00
parent a7bdac4d52
commit 58f73e7c24
1 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-swing/test/org/diylc/RegressionTestRunner.java
+23 -8
View File
@@ -210,7 +210,7 @@ public class RegressionTestRunner {
File pngInputFile = new File(inputDir.getAbsolutePath() + File.separator + "png" File pngInputFile = new File(inputDir.getAbsolutePath() + File.separator + "png"
+ File.separator + (file.getName().replace(".diy", ".png"))); + File.separator + (file.getName().replace(".diy", ".png")));
if (!pngInputFile.exists()) { if (!pngInputFile.exists()) {
return res.failed("Input image does not exist!"); res.failed("Input image does not exist!");
} }
BufferedImage expectedImage = BufferedImage expectedImage =
@@ -226,16 +226,16 @@ public class RegressionTestRunner {
new ImageComparison(expectedImage, actualImage, pngDiffFile).compareImages(); new ImageComparison(expectedImage, actualImage, pngDiffFile).compareImages();
if (ImageComparisonState.MATCH != imageComparisonResult.getImageComparisonState()) { if (ImageComparisonState.MATCH != imageComparisonResult.getImageComparisonState()) {
return res.failed("Images do not match!"); res.failed("Images do not match!");
} }
RegressionTestResult netlistResultWithSwitches = testNetlist(file, presenter, res, outputDir, inputDir, true); RegressionTestResult netlistResultWithSwitches = testNetlist(file, presenter, res, outputDir, inputDir, true);
if (netlistResultWithSwitches != null) // if (netlistResultWithSwitches != null)
return netlistResultWithSwitches; // res.merge(netlistResultWithSwitches);
RegressionTestResult netlistResultWithoutSwitches = testNetlist(file, presenter, res, outputDir, inputDir, false); RegressionTestResult netlistResultWithoutSwitches = testNetlist(file, presenter, res, outputDir, inputDir, false);
if (netlistResultWithoutSwitches != null) // if (netlistResultWithoutSwitches != null)
return netlistResultWithoutSwitches; // res.merge(netlistResultWithoutSwitches);
// List<INetlistAnalyzer> summarizers = presenter.getNetlistAnalyzers(); // List<INetlistAnalyzer> summarizers = presenter.getNetlistAnalyzers();
// if (summarizers != null) { // if (summarizers != null) {
@@ -299,6 +299,9 @@ public class RegressionTestRunner {
.reduce("", String::concat); .reduce("", String::concat);
} }
if (!res.ok)
return res;
return res.succedded(message); return res.succedded(message);
} }
@@ -335,11 +338,11 @@ public class RegressionTestRunner {
List<String> outputLines = Files.readAllLines(Paths.get(netlistOutputFile.getAbsolutePath())); List<String> outputLines = Files.readAllLines(Paths.get(netlistOutputFile.getAbsolutePath()));
if (inputLines.size() != outputLines.size()) { if (inputLines.size() != outputLines.size()) {
return res.failed("Netlists do not match"); return res.failed("Netlists do not match " + (includeSwitches ? "with switches" : "without switches"));
} }
for (int i = 0; i < inputLines.size(); i++) { for (int i = 0; i < inputLines.size(); i++) {
if (!inputLines.get(i).equals(outputLines.get(i))) { if (!inputLines.get(i).equals(outputLines.get(i))) {
return res.failed("Netlists do not match"); return res.failed("Netlists do not match " + (includeSwitches ? "with switches" : "without switches"));
} }
} }
} catch (IOException e) { } catch (IOException e) {
@@ -463,9 +466,21 @@ public class RegressionTestRunner {
public RegressionTestResult failed(String message) { public RegressionTestResult failed(String message) {
this.ok = false; this.ok = false;
if (this.message == null)
this.message = message; this.message = message;
else if (message != null)
this.message = this.message + ";" + message;
this.duration = System.currentTimeMillis() - this.startTime; this.duration = System.currentTimeMillis() - this.startTime;
return this; return this;
} }
// public void merge(RegressionTestResult other) {
// this.ok = this.ok && other.ok;
// this.duration = System.currentTimeMillis() - this.startTime;
// if (this.message == null)
// this.message = other.message;
// else if (other.message != null)
// this.message = this.message + ";" + other.message;
// }
} }
} }