From 26fcc753232c0147aedf22bb264be63b8e60588b Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Fri, 13 Jul 2018 13:18:16 +0200
Subject: [PATCH] Always check for empty solution in tests.

---
 .../inf/st/mquat/solving/HandwrittenTestSuite.java         | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/jastadd-mquat-solver/src/test/java/de/tudresden/inf/st/mquat/solving/HandwrittenTestSuite.java b/jastadd-mquat-solver/src/test/java/de/tudresden/inf/st/mquat/solving/HandwrittenTestSuite.java
index d4ee2f2..dbae9d3 100644
--- a/jastadd-mquat-solver/src/test/java/de/tudresden/inf/st/mquat/solving/HandwrittenTestSuite.java
+++ b/jastadd-mquat-solver/src/test/java/de/tudresden/inf/st/mquat/solving/HandwrittenTestSuite.java
@@ -91,6 +91,9 @@ public abstract class HandwrittenTestSuite {
 
   private void assertValidSolution(Tuple<Root, Solution> modelAndSolution) {
 //    Assert.assertTrue("Solution is not valid", modelAndSolution.getSecondElement().isValid());
+    if (modelAndSolution.getSecondElement().getNumAssignment() == 0) {
+      logger.warn("Solution is empty");
+    }
     collector.checkThat("Solution is not valid", true,
         equalTo(modelAndSolution.getSecondElement().isValid()));
   }
@@ -98,19 +101,19 @@ public abstract class HandwrittenTestSuite {
   @Test
   public void test_01() throws IOException, Parser.Exception, SolvingException {
     Tuple<Root, Solution> modelAndSolution = loadAndSolve("test_01.txt");
+    assertValidSolution(modelAndSolution);
     Assignment config_0i0m0 = assertAssignment(modelAndSolution, 0, "config_0i0m0", "r0");
     Assignment config_1i0m0 = assertAssignment(modelAndSolution, 0, "config_1i0m0", "r1");
     assertComponentRequirement(config_0i0m0,"other", config_1i0m0);
-    assertValidSolution(modelAndSolution);
   }
 
   @Test
   public void test_02() throws IOException, Parser.Exception, SolvingException {
     Tuple<Root, Solution> modelAndSolution = loadAndSolve("test_02.txt");
+    assertValidSolution(modelAndSolution);
     Assignment config_0i0m0 = assertAssignment(modelAndSolution, 0, "config_0i0m0", "r0");
     Assignment config_1i0m0 = assertAssignment(modelAndSolution, 0, "config_1i0m0", "r1");
     assertComponentRequirement(config_0i0m0,"other", config_1i0m0);
-    assertValidSolution(modelAndSolution);
   }
 
   @Test
-- 
GitLab