From 218b6e689521046d7d460813a1884bfb1d04d87a Mon Sep 17 00:00:00 2001 From: hneemann Date: Mon, 3 Jul 2017 10:50:05 +0200 Subject: [PATCH] refactored test result to new data structure --- .../digital/{testing => data}/Value.java | 30 ++++++++- .../de/neemann/digital/data/ValueTable.java | 67 +++++++++++++++++++ .../ValueTableModel.java} | 24 +++---- .../de/neemann/digital/data/package-info.java | 5 ++ .../components/testing/TestResultDialog.java | 36 +++++----- .../testing/LineListenerResolveDontCare.java | 7 +- .../neemann/digital/testing/MatchedValue.java | 13 +++- .../{TestResult.java => TestExecuter.java} | 48 +++---------- .../neemann/digital/testing/Transitions.java | 1 + .../testing/parser/LineEmitterSimple.java | 2 +- .../digital/testing/parser/LineListener.java | 2 +- .../digital/testing/parser/Parser.java | 2 +- .../digital/testing/parser/ValueAppender.java | 2 +- .../testing/parser/ValueAppenderBits.java | 2 +- .../neemann/digital/core/pld/DiodeTest.java | 2 +- .../digital/integration/TestExamples.java | 4 +- .../digital/testing/TestResultTest.java | 38 ++++++----- .../de/neemann/digital/testing/ValueTest.java | 2 +- .../digital/testing/parser/LineCollector.java | 2 +- .../testing/parser/ParserLoopTest.java | 2 +- .../digital/testing/parser/ParserTest.java | 2 +- 21 files changed, 193 insertions(+), 100 deletions(-) rename src/main/java/de/neemann/digital/{testing => data}/Value.java (87%) create mode 100644 src/main/java/de/neemann/digital/data/ValueTable.java rename src/main/java/de/neemann/digital/{gui/components/testing/TestResultModel.java => data/ValueTableModel.java} (65%) create mode 100644 src/main/java/de/neemann/digital/data/package-info.java rename src/main/java/de/neemann/digital/testing/{TestResult.java => TestExecuter.java} (86%) diff --git a/src/main/java/de/neemann/digital/testing/Value.java b/src/main/java/de/neemann/digital/data/Value.java similarity index 87% rename from src/main/java/de/neemann/digital/testing/Value.java rename to src/main/java/de/neemann/digital/data/Value.java index 1425852e9..43b20f3fe 100644 --- a/src/main/java/de/neemann/digital/testing/Value.java +++ b/src/main/java/de/neemann/digital/data/Value.java @@ -1,4 +1,4 @@ -package de.neemann.digital.testing; +package de.neemann.digital.data; import de.neemann.digital.core.ObservableValue; @@ -10,7 +10,7 @@ import de.neemann.digital.core.ObservableValue; public class Value { /** - * Types of values + * Types of value */ public enum Type { /** @@ -31,6 +31,25 @@ public class Value { CLOCK } + /** + * state of value + */ + public enum State { + /** + * a normals value + */ + NORMAL, + /** + * value is a passed test + */ + PASS, + /** + * value is a failed test + */ + FAIL + + } + private final long value; private final Type type; @@ -135,6 +154,13 @@ public class Value { return type; } + /** + * @return the state of this value + */ + public State getState() { + return State.NORMAL; + } + /** * @return true if value is a high Z value */ diff --git a/src/main/java/de/neemann/digital/data/ValueTable.java b/src/main/java/de/neemann/digital/data/ValueTable.java new file mode 100644 index 000000000..6528c75c6 --- /dev/null +++ b/src/main/java/de/neemann/digital/data/ValueTable.java @@ -0,0 +1,67 @@ +package de.neemann.digital.data; + +import java.util.ArrayList; + +/** + * Stores values in a table + * Created by hneemann on 03.07.17. + */ +public class ValueTable { + + private final ArrayList names; + private final ArrayList values; + + /** + * Creates a new table. + * + * @param names the cignal names + */ + public ValueTable(ArrayList names) { + this.names = names; + values = new ArrayList<>(); + } + + /** + * @return number of rows + */ + public int getRows() { + return values.size(); + } + + /** + * add values without copying them + * + * @param row a row to insert, values are not copied! + */ + public void add(Value[] row) { + values.add(row); + } + + /** + * provides the values + * + * @param rowIndex the wow + * @param columnIndex the column + * @return the value stored at the given position + */ + public Value getValue(int rowIndex, int columnIndex) { + return values.get(rowIndex)[columnIndex]; + } + + /** + * the number of signals + * @return the column count + */ + public int getColumns() { + return names.size(); + } + + /** + * Returns the column names + * @param col the column + * @return the name + */ + public String getColumnName(int col) { + return names.get(col); + } +} diff --git a/src/main/java/de/neemann/digital/gui/components/testing/TestResultModel.java b/src/main/java/de/neemann/digital/data/ValueTableModel.java similarity index 65% rename from src/main/java/de/neemann/digital/gui/components/testing/TestResultModel.java rename to src/main/java/de/neemann/digital/data/ValueTableModel.java index 0aad91759..9ab2f9571 100644 --- a/src/main/java/de/neemann/digital/gui/components/testing/TestResultModel.java +++ b/src/main/java/de/neemann/digital/data/ValueTableModel.java @@ -1,8 +1,6 @@ -package de.neemann.digital.gui.components.testing; +package de.neemann.digital.data; import de.neemann.digital.lang.Lang; -import de.neemann.digital.testing.MatchedValue; -import de.neemann.digital.testing.TestResult; import javax.swing.event.TableModelListener; import javax.swing.table.TableModel; @@ -12,27 +10,27 @@ import javax.swing.table.TableModel; *

* Created by hneemann on 24.08.16. */ -public class TestResultModel implements TableModel { +public class ValueTableModel implements TableModel { - private final TestResult testResult; + private final ValueTable values; /** * Creates a new table model * - * @param testResult the testresult to wrap + * @param values the values to wrap */ - public TestResultModel(TestResult testResult) { - this.testResult = testResult; + public ValueTableModel(ValueTable values) { + this.values = values; } @Override public int getRowCount() { - return testResult.getRows(); + return values.getRows(); } @Override public int getColumnCount() { - return testResult.getSignalCount() + 1; + return values.getColumns() + 1; } @Override @@ -40,7 +38,7 @@ public class TestResultModel implements TableModel { if (columnIndex == 0) return Lang.get("number"); else - return testResult.getSignalName(columnIndex - 1); + return values.getColumnName(columnIndex - 1); } @Override @@ -48,7 +46,7 @@ public class TestResultModel implements TableModel { if (columnIndex == 0) return Integer.class; else - return MatchedValue.class; + return Value.class; } @Override @@ -61,7 +59,7 @@ public class TestResultModel implements TableModel { if (columnIndex == 0) return rowIndex; else - return testResult.getResultValue(rowIndex, columnIndex - 1); + return values.getValue(rowIndex, columnIndex - 1); } diff --git a/src/main/java/de/neemann/digital/data/package-info.java b/src/main/java/de/neemann/digital/data/package-info.java new file mode 100644 index 000000000..8b2b10fa1 --- /dev/null +++ b/src/main/java/de/neemann/digital/data/package-info.java @@ -0,0 +1,5 @@ +/** + * Classes to store signal data + * Created by hneemann on 03.07.17. + */ +package de.neemann.digital.data; diff --git a/src/main/java/de/neemann/digital/gui/components/testing/TestResultDialog.java b/src/main/java/de/neemann/digital/gui/components/testing/TestResultDialog.java index 186a98e7b..3bdf23f37 100644 --- a/src/main/java/de/neemann/digital/gui/components/testing/TestResultDialog.java +++ b/src/main/java/de/neemann/digital/gui/components/testing/TestResultDialog.java @@ -2,6 +2,8 @@ package de.neemann.digital.gui.components.testing; import de.neemann.digital.core.Model; import de.neemann.digital.core.NodeException; +import de.neemann.digital.data.ValueTableModel; +import de.neemann.digital.data.Value; import de.neemann.digital.draw.elements.Circuit; import de.neemann.digital.draw.elements.PinException; import de.neemann.digital.draw.library.ElementLibrary; @@ -54,13 +56,13 @@ public class TestResultDialog extends JDialog { for (TestSet ts : tsl) { Model model = new ModelCreator(circuit, library).createModel(false); - TestResult tr = new TestResult(ts.data).create(model); + TestExecuter testExecuter = new TestExecuter(ts.data).create(model); - if (tr.getException() != null) - SwingUtilities.invokeLater(new ErrorMessage(Lang.get("msg_errorWhileExecutingTests_N0", ts.name)).addCause(tr.getException()).setComponent(this)); + if (testExecuter.getException() != null) + SwingUtilities.invokeLater(new ErrorMessage(Lang.get("msg_errorWhileExecutingTests_N0", ts.name)).addCause(testExecuter.getException()).setComponent(this)); - JTable table = new JTable(new TestResultModel(tr)); - table.setDefaultRenderer(MatchedValue.class, new MatchedValueRenderer()); + JTable table = new JTable(new ValueTableModel(testExecuter.getResult())); + table.setDefaultRenderer(Value.class, new ValueRenderer()); table.setDefaultRenderer(Integer.class, new NumberRenderer()); final Font font = table.getFont(); table.getColumnModel().getColumn(0).setMaxWidth(font.getSize()*4); @@ -68,7 +70,7 @@ public class TestResultDialog extends JDialog { String tabName; Icon tabIcon; - if (tr.allPassed()) { + if (testExecuter.allPassed()) { tabName = Lang.get("msg_test_N_Passed", ts.name); tabIcon = ICON_PASSED; } else { @@ -76,11 +78,11 @@ public class TestResultDialog extends JDialog { tabIcon = ICON_FAILED; errorTabIndex = i; } - if (tr.toManyResults()) + if (testExecuter.toManyResults()) tabName += " " + Lang.get("msg_test_missingLines"); tp.addTab(tabName, tabIcon, new JScrollPane(table)); - if (tr.toManyResults()) + if (testExecuter.toManyResults()) tp.setToolTipTextAt(i, new LineBreaker().toHTML().breakLines(Lang.get("msg_test_missingLines_tt"))); i++; } @@ -134,7 +136,7 @@ public class TestResultDialog extends JDialog { } } - private static class MatchedValueRenderer extends DefaultTableCellRenderer { + private static class ValueRenderer extends DefaultTableCellRenderer { @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { @@ -144,13 +146,17 @@ public class TestResultDialog extends JDialog { comp.setText(v.toString()); comp.setHorizontalAlignment(JLabel.CENTER); - if (v instanceof MatchedValue) { - if (((MatchedValue) v).isPassed()) - comp.setBackground(PASSED_COLOR); - else + switch (((Value) value).getState()) { + case NORMAL: + comp.setBackground(Color.WHITE); + break; + case FAIL: comp.setBackground(FAILED_COLOR); - } else - comp.setBackground(Color.WHITE); + break; + case PASS: + comp.setBackground(PASSED_COLOR); + break; + } } return comp; } diff --git a/src/main/java/de/neemann/digital/testing/LineListenerResolveDontCare.java b/src/main/java/de/neemann/digital/testing/LineListenerResolveDontCare.java index 68a2b4deb..22e328e04 100644 --- a/src/main/java/de/neemann/digital/testing/LineListenerResolveDontCare.java +++ b/src/main/java/de/neemann/digital/testing/LineListenerResolveDontCare.java @@ -1,5 +1,6 @@ package de.neemann.digital.testing; +import de.neemann.digital.data.Value; import de.neemann.digital.testing.parser.LineListener; import java.util.ArrayList; @@ -11,7 +12,7 @@ import java.util.ArrayList; public class LineListenerResolveDontCare implements LineListener { private final LineListener parent; - private final ArrayList inputs; + private final ArrayList inputs; /** * Create a new instance @@ -19,7 +20,7 @@ public class LineListenerResolveDontCare implements LineListener { * @param parent the parent listener * @param inputs the input test signals */ - public LineListenerResolveDontCare(LineListener parent, ArrayList inputs) { + public LineListenerResolveDontCare(LineListener parent, ArrayList inputs) { this.parent = parent; this.inputs = inputs; } @@ -27,7 +28,7 @@ public class LineListenerResolveDontCare implements LineListener { @Override public void add(Value[] rowWithDontCare) { ArrayList dcIndex = null; - for (TestResult.TestSignal in : inputs) { + for (TestExecuter.TestSignal in : inputs) { if (rowWithDontCare[in.getIndex()].getType() == Value.Type.DONTCARE) { if (dcIndex == null) dcIndex = new ArrayList<>(); diff --git a/src/main/java/de/neemann/digital/testing/MatchedValue.java b/src/main/java/de/neemann/digital/testing/MatchedValue.java index 7241c2fe7..eb833b7a6 100644 --- a/src/main/java/de/neemann/digital/testing/MatchedValue.java +++ b/src/main/java/de/neemann/digital/testing/MatchedValue.java @@ -1,6 +1,7 @@ package de.neemann.digital.testing; import de.neemann.digital.core.ObservableValue; +import de.neemann.digital.data.Value; import de.neemann.digital.lang.Lang; /** @@ -18,7 +19,7 @@ public class MatchedValue extends Value { * @param expected the expected value * @param found the found value */ - public MatchedValue(Value expected, ObservableValue found) { + MatchedValue(Value expected, ObservableValue found) { super(found); this.expected = expected; } @@ -26,7 +27,7 @@ public class MatchedValue extends Value { /** * @return true if test is passed */ - public boolean isPassed() { + boolean isPassed() { return isEqualTo(expected); } @@ -37,4 +38,12 @@ public class MatchedValue extends Value { else return Lang.get("msg_testExp_N0_found_N1", expected, super.toString()); } + + @Override + public State getState() { + if (isPassed()) + return State.PASS; + else + return State.FAIL; + } } diff --git a/src/main/java/de/neemann/digital/testing/TestResult.java b/src/main/java/de/neemann/digital/testing/TestExecuter.java similarity index 86% rename from src/main/java/de/neemann/digital/testing/TestResult.java rename to src/main/java/de/neemann/digital/testing/TestExecuter.java index 8ed3e1e9a..f5894c4ee 100644 --- a/src/main/java/de/neemann/digital/testing/TestResult.java +++ b/src/main/java/de/neemann/digital/testing/TestExecuter.java @@ -5,6 +5,8 @@ import de.neemann.digital.core.NodeException; import de.neemann.digital.core.ObservableValue; import de.neemann.digital.core.Signal; import de.neemann.digital.core.wiring.Clock; +import de.neemann.digital.data.Value; +import de.neemann.digital.data.ValueTable; import de.neemann.digital.lang.Lang; import de.neemann.digital.testing.parser.Context; import de.neemann.digital.testing.parser.LineEmitter; @@ -19,13 +21,13 @@ import java.util.HashSet; * * @author hneemann */ -public class TestResult { +public class TestExecuter { private static final int MAX_RESULTS = 1 << 10; private static final int ERR_RESULTS = MAX_RESULTS * 2; private final ArrayList names; private final LineEmitter lines; - private final ArrayList results; + private final ValueTable results; private boolean allPassed; private Exception exception; private boolean toManyResults = false; @@ -38,10 +40,10 @@ public class TestResult { * @param testData the testing data * @throws TestingDataException DataException */ - public TestResult(TestData testData) throws TestingDataException { + public TestExecuter(TestData testData) throws TestingDataException { names = testData.getNames(); + results = new ValueTable(names); lines = testData.getLines(); - results = new ArrayList<>(); } /** @@ -52,7 +54,7 @@ public class TestResult { * @throws TestingDataException DataException * @throws NodeException NodeException */ - public TestResult create(Model model) throws TestingDataException, NodeException { + public TestExecuter create(Model model) throws TestingDataException, NodeException { allPassed = true; HashSet usedSignals = new HashSet<>(); @@ -162,7 +164,7 @@ public class TestResult { } } - if (results.size() < (ok ? MAX_RESULTS : ERR_RESULTS)) + if (results.getRows() < (ok ? MAX_RESULTS : ERR_RESULTS)) results.add(res); else toManyResults = true; @@ -199,38 +201,10 @@ public class TestResult { } /** - * @return the number of rows + * @return return the result */ - public int getRows() { - return results.size(); - } - - /** - * @return the number of signals - */ - public int getSignalCount() { - return names.size(); - } - - /** - * returns a signal name - * - * @param index the index of the requested signals name - * @return the signals name - */ - public String getSignalName(int index) { - return names.get(index); - } - - /** - * Returns the typed value - * - * @param rowIndex rowIndex - * @param columnIndex columnIndex - * @return the value - */ - public Value getResultValue(int rowIndex, int columnIndex) { - return results.get(rowIndex)[columnIndex]; + public ValueTable getResult() { + return results; } /** diff --git a/src/main/java/de/neemann/digital/testing/Transitions.java b/src/main/java/de/neemann/digital/testing/Transitions.java index e6dfa135a..9a225d6ca 100644 --- a/src/main/java/de/neemann/digital/testing/Transitions.java +++ b/src/main/java/de/neemann/digital/testing/Transitions.java @@ -1,6 +1,7 @@ package de.neemann.digital.testing; import de.neemann.digital.core.element.PinDescription; +import de.neemann.digital.data.Value; import de.neemann.digital.testing.parser.Context; import de.neemann.digital.testing.parser.Parser; import de.neemann.digital.testing.parser.ParserException; diff --git a/src/main/java/de/neemann/digital/testing/parser/LineEmitterSimple.java b/src/main/java/de/neemann/digital/testing/parser/LineEmitterSimple.java index a00bc8971..2cecaef9d 100644 --- a/src/main/java/de/neemann/digital/testing/parser/LineEmitterSimple.java +++ b/src/main/java/de/neemann/digital/testing/parser/LineEmitterSimple.java @@ -1,7 +1,7 @@ package de.neemann.digital.testing.parser; import de.neemann.digital.lang.Lang; -import de.neemann.digital.testing.Value; +import de.neemann.digital.data.Value; import java.util.ArrayList; diff --git a/src/main/java/de/neemann/digital/testing/parser/LineListener.java b/src/main/java/de/neemann/digital/testing/parser/LineListener.java index 06e7e9345..854fce96e 100644 --- a/src/main/java/de/neemann/digital/testing/parser/LineListener.java +++ b/src/main/java/de/neemann/digital/testing/parser/LineListener.java @@ -1,6 +1,6 @@ package de.neemann.digital.testing.parser; -import de.neemann.digital.testing.Value; +import de.neemann.digital.data.Value; /** * Listener for truth table lines diff --git a/src/main/java/de/neemann/digital/testing/parser/Parser.java b/src/main/java/de/neemann/digital/testing/parser/Parser.java index eec58085d..5a77a1ecf 100644 --- a/src/main/java/de/neemann/digital/testing/parser/Parser.java +++ b/src/main/java/de/neemann/digital/testing/parser/Parser.java @@ -1,7 +1,7 @@ package de.neemann.digital.testing.parser; import de.neemann.digital.lang.Lang; -import de.neemann.digital.testing.Value; +import de.neemann.digital.data.Value; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/main/java/de/neemann/digital/testing/parser/ValueAppender.java b/src/main/java/de/neemann/digital/testing/parser/ValueAppender.java index 8be832c4e..e6ed89d58 100644 --- a/src/main/java/de/neemann/digital/testing/parser/ValueAppender.java +++ b/src/main/java/de/neemann/digital/testing/parser/ValueAppender.java @@ -1,6 +1,6 @@ package de.neemann.digital.testing.parser; -import de.neemann.digital.testing.Value; +import de.neemann.digital.data.Value; import java.util.ArrayList; diff --git a/src/main/java/de/neemann/digital/testing/parser/ValueAppenderBits.java b/src/main/java/de/neemann/digital/testing/parser/ValueAppenderBits.java index f055e208d..e27a976a7 100644 --- a/src/main/java/de/neemann/digital/testing/parser/ValueAppenderBits.java +++ b/src/main/java/de/neemann/digital/testing/parser/ValueAppenderBits.java @@ -1,6 +1,6 @@ package de.neemann.digital.testing.parser; -import de.neemann.digital.testing.Value; +import de.neemann.digital.data.Value; import java.util.ArrayList; diff --git a/src/test/java/de/neemann/digital/core/pld/DiodeTest.java b/src/test/java/de/neemann/digital/core/pld/DiodeTest.java index 1b04ae125..cd2c58bb8 100644 --- a/src/test/java/de/neemann/digital/core/pld/DiodeTest.java +++ b/src/test/java/de/neemann/digital/core/pld/DiodeTest.java @@ -3,7 +3,7 @@ package de.neemann.digital.core.pld; import de.neemann.digital.core.NodeException; import de.neemann.digital.draw.elements.PinException; import de.neemann.digital.draw.library.ElementNotFoundException; -import de.neemann.digital.testing.Value; +import de.neemann.digital.data.Value; import junit.framework.TestCase; import java.io.IOException; diff --git a/src/test/java/de/neemann/digital/integration/TestExamples.java b/src/test/java/de/neemann/digital/integration/TestExamples.java index 82618ad12..920929ef4 100644 --- a/src/test/java/de/neemann/digital/integration/TestExamples.java +++ b/src/test/java/de/neemann/digital/integration/TestExamples.java @@ -5,7 +5,7 @@ import de.neemann.digital.draw.elements.VisualElement; import de.neemann.digital.draw.model.ModelCreator; import de.neemann.digital.testing.TestCaseElement; import de.neemann.digital.testing.TestData; -import de.neemann.digital.testing.TestResult; +import de.neemann.digital.testing.TestExecuter; import junit.framework.TestCase; import java.io.File; @@ -69,7 +69,7 @@ public class TestExamples extends TestCase { TestData td = el.getElementAttributes().get(TestCaseElement.TESTDATA); Model model = new ModelCreator(br.getCircuit(), br.getLibrary()).createModel(false); - TestResult tr = new TestResult(td).create(model); + TestExecuter tr = new TestExecuter(td).create(model); if (label.contains("Failing")) assertFalse(dig.getName() + ":" + label, tr.allPassed()); diff --git a/src/test/java/de/neemann/digital/testing/TestResultTest.java b/src/test/java/de/neemann/digital/testing/TestResultTest.java index 94921c412..f9ba0e8e3 100644 --- a/src/test/java/de/neemann/digital/testing/TestResultTest.java +++ b/src/test/java/de/neemann/digital/testing/TestResultTest.java @@ -7,6 +7,7 @@ import de.neemann.digital.builder.BuilderException; import de.neemann.digital.builder.circuit.CircuitBuilder; import de.neemann.digital.core.Model; import de.neemann.digital.core.NodeException; +import de.neemann.digital.data.ValueTable; import de.neemann.digital.draw.elements.Circuit; import de.neemann.digital.draw.elements.PinException; import de.neemann.digital.draw.library.ElementLibrary; @@ -42,8 +43,8 @@ public class TestResultTest extends TestCase { + "0 1 1\n" + "1 0 1\n" + "1 1 0\n"); - TestResult tr = new TestResult(data).create(model); - assertEquals(4,tr.getRows()); + TestExecuter tr = new TestExecuter(data).create(model); + assertEquals(4,tr.getResult().getRows()); assertTrue(tr.allPassed()); } @@ -55,13 +56,14 @@ public class TestResultTest extends TestCase { + "0 1 1\n" + "1 0 1\n" + "1 1 0\n"); - TestResult tr = new TestResult(data).create(model); + TestExecuter te = new TestExecuter(data).create(model); + ValueTable tr = te.getResult(); assertEquals(4,tr.getRows()); - assertFalse(tr.allPassed()); - assertEquals(true, ((MatchedValue) tr.getResultValue(0, 2)).isPassed()); - assertEquals(true, ((MatchedValue) tr.getResultValue(1, 2)).isPassed()); - assertEquals(true, ((MatchedValue) tr.getResultValue(2, 2)).isPassed()); - assertEquals(false, ((MatchedValue) tr.getResultValue(3, 2)).isPassed()); + assertFalse(te.allPassed()); + assertEquals(true, ((MatchedValue) tr.getValue(0, 2)).isPassed()); + assertEquals(true, ((MatchedValue) tr.getValue(1, 2)).isPassed()); + assertEquals(true, ((MatchedValue) tr.getValue(2, 2)).isPassed()); + assertEquals(false, ((MatchedValue) tr.getValue(3, 2)).isPassed()); } public void testResultDontCare() throws Exception { @@ -72,9 +74,10 @@ public class TestResultTest extends TestCase { + "0 1 1\n" + "1 0 1\n" + "1 1 x\n"); - TestResult tr = new TestResult(data).create(model); + TestExecuter te = new TestExecuter(data).create(model); + ValueTable tr = te.getResult(); assertEquals(4,tr.getRows()); - assertTrue(tr.allPassed()); + assertTrue(te.allPassed()); } public void testResultDontCare2() throws Exception { @@ -85,9 +88,10 @@ public class TestResultTest extends TestCase { + "0 1 1\n" + "1 0 1\n" + "1 1 1\n"); - TestResult tr = new TestResult(data).create(model); + TestExecuter te = new TestExecuter(data).create(model); + ValueTable tr = te.getResult(); assertEquals(4,tr.getRows()); - assertTrue(tr.allPassed()); + assertTrue(te.allPassed()); } public void testResultDontCareInput() throws Exception { @@ -96,9 +100,10 @@ public class TestResultTest extends TestCase { "A B Y\n" + "x 0 0\n" + "x 1 1\n"); - TestResult tr = new TestResult(data).create(model); + TestExecuter te = new TestExecuter(data).create(model); + ValueTable tr = te.getResult(); assertEquals(4,tr.getRows()); - assertTrue(tr.allPassed()); + assertTrue(te.allPassed()); } public void testResultDontCareInput2() throws Exception { @@ -107,9 +112,10 @@ public class TestResultTest extends TestCase { "A B C Y\n" + "x x 0 0\n" + "x x 1 1\n"); - TestResult tr = new TestResult(data).create(model); + TestExecuter te = new TestExecuter(data).create(model); + ValueTable tr = te.getResult(); assertEquals(8,tr.getRows()); - assertTrue(tr.allPassed()); + assertTrue(te.allPassed()); } } \ No newline at end of file diff --git a/src/test/java/de/neemann/digital/testing/ValueTest.java b/src/test/java/de/neemann/digital/testing/ValueTest.java index fdad320fd..a007a8a83 100644 --- a/src/test/java/de/neemann/digital/testing/ValueTest.java +++ b/src/test/java/de/neemann/digital/testing/ValueTest.java @@ -1,6 +1,6 @@ package de.neemann.digital.testing; -import de.neemann.digital.testing.Value; +import de.neemann.digital.data.Value; import junit.framework.TestCase; /** diff --git a/src/test/java/de/neemann/digital/testing/parser/LineCollector.java b/src/test/java/de/neemann/digital/testing/parser/LineCollector.java index ab76218de..ed61e9ddd 100644 --- a/src/test/java/de/neemann/digital/testing/parser/LineCollector.java +++ b/src/test/java/de/neemann/digital/testing/parser/LineCollector.java @@ -1,6 +1,6 @@ package de.neemann.digital.testing.parser; -import de.neemann.digital.testing.Value; +import de.neemann.digital.data.Value; import java.util.ArrayList; diff --git a/src/test/java/de/neemann/digital/testing/parser/ParserLoopTest.java b/src/test/java/de/neemann/digital/testing/parser/ParserLoopTest.java index d6e33c32b..47210a4f6 100644 --- a/src/test/java/de/neemann/digital/testing/parser/ParserLoopTest.java +++ b/src/test/java/de/neemann/digital/testing/parser/ParserLoopTest.java @@ -1,6 +1,6 @@ package de.neemann.digital.testing.parser; -import de.neemann.digital.testing.Value; +import de.neemann.digital.data.Value; import junit.framework.TestCase; import java.io.IOException; diff --git a/src/test/java/de/neemann/digital/testing/parser/ParserTest.java b/src/test/java/de/neemann/digital/testing/parser/ParserTest.java index 7cd30747f..97d63ea16 100644 --- a/src/test/java/de/neemann/digital/testing/parser/ParserTest.java +++ b/src/test/java/de/neemann/digital/testing/parser/ParserTest.java @@ -1,7 +1,7 @@ package de.neemann.digital.testing.parser; import de.neemann.digital.testing.TestingDataException; -import de.neemann.digital.testing.Value; +import de.neemann.digital.data.Value; import junit.framework.TestCase; import java.io.IOException;