fix flaky test

src/test/java/de/strullerbaumann/visualee/dependency/boundary/DependencyContainerTest.java

@@ -21,6 +21,7 @@
  */
 import de.strullerbaumann.visualee.dependency.entity.Dependency;
 import de.strullerbaumann.visualee.dependency.entity.DependencyType;
+import de.strullerbaumann.visualee.filter.boundary.FilterContainer;
 import de.strullerbaumann.visualee.source.boundary.*;
 import de.strullerbaumann.visualee.source.entity.JavaSource;
 import de.strullerbaumann.visualee.source.entity.JavaSourceFactory;
@@ -44,6 +45,8 @@ public DependencyContainerTest() {
    @Before
    public void init() {
       DependencyContainer.getInstance().clear();
+      FilterContainer.getInstance().clear();
+      JavaSourceContainer.getInstance().clear();
    }
 
    @Test

src/test/java/de/strullerbaumann/visualee/examiner/JavaSourceInspectorTest.java

@@ -20,10 +20,14 @@
  * #L%
  */
 import de.strullerbaumann.visualee.dependency.boundary.DependencyContainer;
+import de.strullerbaumann.visualee.examiner.cdi.ExaminerEJB;
+import de.strullerbaumann.visualee.filter.boundary.FilterContainer;
 import de.strullerbaumann.visualee.source.boundary.JavaSourceContainer;
 import de.strullerbaumann.visualee.source.entity.JavaSource;
 import de.strullerbaumann.visualee.source.entity.JavaSourceFactory;
 import static org.junit.Assert.*;
+
+import org.junit.Before;
 import org.junit.Test;
 
 /**
@@ -35,6 +39,12 @@ public class JavaSourceInspectorTest {
    public JavaSourceInspectorTest() {
    }
 
+   @Before
+   public void init() {
+      DependencyContainer.getInstance().clear();
+      FilterContainer.getInstance().clear();
+      JavaSourceContainer.getInstance().clear();
+   }
    @Test
    public void testFindAndSetAttributesIgnoreComments() {
       JavaSource javaSource;

src/test/java/de/strullerbaumann/visualee/examiner/cdi/ExaminerEJBTest.java

@@ -22,6 +22,8 @@
 import de.strullerbaumann.visualee.dependency.boundary.DependencyContainer;
 import de.strullerbaumann.visualee.dependency.entity.Dependency;
 import de.strullerbaumann.visualee.dependency.entity.DependencyType;
+import de.strullerbaumann.visualee.filter.boundary.FilterContainer;
+import de.strullerbaumann.visualee.source.boundary.JavaSourceContainer;
 import de.strullerbaumann.visualee.source.entity.JavaSource;
 import de.strullerbaumann.visualee.source.entity.JavaSourceFactory;
 import static org.junit.Assert.*;
@@ -43,6 +45,8 @@ public ExaminerEJBTest() {
    public void init() {
       examiner = new ExaminerEJB();
       DependencyContainer.getInstance().clear();
+      FilterContainer.getInstance().clear();
+      JavaSourceContainer.getInstance().clear();
    }
 
    @Test

src/test/java/de/strullerbaumann/visualee/examiner/cdi/ExaminerEventTest.java

@@ -22,6 +22,8 @@
 import de.strullerbaumann.visualee.dependency.boundary.DependencyContainer;
 import de.strullerbaumann.visualee.dependency.entity.Dependency;
 import de.strullerbaumann.visualee.dependency.entity.DependencyType;
+import de.strullerbaumann.visualee.filter.boundary.FilterContainer;
+import de.strullerbaumann.visualee.source.boundary.JavaSourceContainer;
 import de.strullerbaumann.visualee.source.entity.JavaSource;
 import de.strullerbaumann.visualee.source.entity.JavaSourceFactory;
 import static org.junit.Assert.*;
@@ -42,6 +44,9 @@ public ExaminerEventTest() {
    @Before
    public void init() {
       examiner = new ExaminerEvent();
+      DependencyContainer.getInstance().clear();
+      FilterContainer.getInstance().clear();
+      JavaSourceContainer.getInstance().clear();
    }
 
    @Test

src/test/java/de/strullerbaumann/visualee/examiner/cdi/ExaminerInjectTest.java

@@ -22,6 +22,7 @@
 import de.strullerbaumann.visualee.dependency.boundary.DependencyContainer;
 import de.strullerbaumann.visualee.dependency.entity.Dependency;
 import de.strullerbaumann.visualee.dependency.entity.DependencyType;
+import de.strullerbaumann.visualee.filter.boundary.FilterContainer;
 import de.strullerbaumann.visualee.source.entity.JavaSource;
 import de.strullerbaumann.visualee.source.entity.JavaSourceFactory;
 import static org.junit.Assert.assertEquals;
@@ -46,6 +47,7 @@ public ExaminerInjectTest() {
    public void init() {
       examiner = new ExaminerInject();
       DependencyContainer.getInstance().clear();
+      FilterContainer.getInstance().clear();
    }
 
    @Test

src/test/java/de/strullerbaumann/visualee/examiner/cdi/ExaminerInstanceTest.java

@@ -22,6 +22,8 @@
 import de.strullerbaumann.visualee.dependency.boundary.DependencyContainer;
 import de.strullerbaumann.visualee.dependency.entity.Dependency;
 import de.strullerbaumann.visualee.dependency.entity.DependencyType;
+import de.strullerbaumann.visualee.filter.boundary.FilterContainer;
+import de.strullerbaumann.visualee.source.boundary.JavaSourceContainer;
 import de.strullerbaumann.visualee.source.entity.JavaSource;
 import de.strullerbaumann.visualee.source.entity.JavaSourceFactory;
 import static org.junit.Assert.*;
@@ -43,6 +45,8 @@ public ExaminerInstanceTest() {
    public void init() {
       examiner = new ExaminerInstance();
       DependencyContainer.getInstance().clear();
+      FilterContainer.getInstance().clear();
+      JavaSourceContainer.getInstance().clear();
    }
 
    @Test

src/test/java/de/strullerbaumann/visualee/examiner/cdi/ExaminerObservesTest.java

@@ -22,6 +22,8 @@
 import de.strullerbaumann.visualee.dependency.boundary.DependencyContainer;
 import de.strullerbaumann.visualee.dependency.entity.Dependency;
 import de.strullerbaumann.visualee.dependency.entity.DependencyType;
+import de.strullerbaumann.visualee.filter.boundary.FilterContainer;
+import de.strullerbaumann.visualee.source.boundary.JavaSourceContainer;
 import de.strullerbaumann.visualee.source.entity.JavaSource;
 import de.strullerbaumann.visualee.source.entity.JavaSourceFactory;
 import de.strullerbaumann.visualee.testdata.TestDataProvider;
@@ -44,6 +46,8 @@ public ExaminerObservesTest() {
    public void init() {
       examiner = new ExaminerObserves();
       DependencyContainer.getInstance().clear();
+      FilterContainer.getInstance().clear();
+      JavaSourceContainer.getInstance().clear();
    }
 
    @Test

src/test/java/de/strullerbaumann/visualee/examiner/cdi/ExaminerProducesTest.java

@@ -22,6 +22,8 @@
 import de.strullerbaumann.visualee.dependency.boundary.DependencyContainer;
 import de.strullerbaumann.visualee.dependency.entity.Dependency;
 import de.strullerbaumann.visualee.dependency.entity.DependencyType;
+import de.strullerbaumann.visualee.filter.boundary.FilterContainer;
+import de.strullerbaumann.visualee.source.boundary.JavaSourceContainer;
 import de.strullerbaumann.visualee.source.entity.JavaSource;
 import de.strullerbaumann.visualee.source.entity.JavaSourceFactory;
 import static org.junit.Assert.assertEquals;
@@ -45,6 +47,8 @@ public ExaminerProducesTest() {
    public void init() {
       examiner = new ExaminerProduces();
       DependencyContainer.getInstance().clear();
+      FilterContainer.getInstance().clear();
+      JavaSourceContainer.getInstance().clear();
    }
 
    @Test

src/test/java/de/strullerbaumann/visualee/examiner/cdi/ExaminerResourceTest.java

@@ -22,6 +22,8 @@
 import de.strullerbaumann.visualee.dependency.boundary.DependencyContainer;
 import de.strullerbaumann.visualee.dependency.entity.Dependency;
 import de.strullerbaumann.visualee.dependency.entity.DependencyType;
+import de.strullerbaumann.visualee.filter.boundary.FilterContainer;
+import de.strullerbaumann.visualee.source.boundary.JavaSourceContainer;
 import de.strullerbaumann.visualee.source.entity.JavaSource;
 import de.strullerbaumann.visualee.source.entity.JavaSourceFactory;
 import static org.junit.Assert.*;
@@ -43,6 +45,8 @@ public ExaminerResourceTest() {
    public void init() {
       examiner = new ExaminerResource();
       DependencyContainer.getInstance().clear();
+      FilterContainer.getInstance().clear();
+      JavaSourceContainer.getInstance().clear();
    }
 
    @Test

src/test/java/de/strullerbaumann/visualee/examiner/jpa/JPAExaminerTest.java

@@ -22,10 +22,13 @@
 import de.strullerbaumann.visualee.dependency.boundary.DependencyContainer;
 import de.strullerbaumann.visualee.dependency.entity.Dependency;
 import de.strullerbaumann.visualee.dependency.entity.DependencyType;
+import de.strullerbaumann.visualee.filter.boundary.FilterContainer;
+import de.strullerbaumann.visualee.source.boundary.JavaSourceContainer;
 import de.strullerbaumann.visualee.source.entity.JavaSource;
 import de.strullerbaumann.visualee.source.entity.JavaSourceFactory;
 import de.strullerbaumann.visualee.testdata.TestDataProvider;
 import static org.junit.Assert.*;
+import org.junit.Before;
 import org.junit.Test;
 
 /**
@@ -37,6 +40,12 @@ public class JPAExaminerTest {
    public JPAExaminerTest() {
    }
 
+   @Before
+   public void init() {
+      DependencyContainer.getInstance().clear();
+      FilterContainer.getInstance().clear();
+      JavaSourceContainer.getInstance().clear();
+   }
    @Test
    public void testIsRelevantType() {
       ExaminerJPA jpaExaminer = new ExaminerJPA();

src/test/java/de/strullerbaumann/visualee/filter/boundary/FilterContainerTest.java

@@ -34,7 +34,10 @@
  * limitations under the License.
  * #L%
  */
+import de.strullerbaumann.visualee.dependency.boundary.DependencyContainer;
+import de.strullerbaumann.visualee.examiner.cdi.ExaminerEJB;
 import de.strullerbaumann.visualee.filter.entity.SourcecodeFilter;
+import de.strullerbaumann.visualee.source.boundary.JavaSourceContainer;
 import de.strullerbaumann.visualee.source.entity.JavaSource;
 import de.strullerbaumann.visualee.source.entity.JavaSourceFactory;
 import org.junit.After;
@@ -82,6 +85,9 @@ public static void tearDownClass() {
 
    @Before
    public void init() {
+      DependencyContainer.getInstance().clear();
+      FilterContainer.getInstance().clear();
+      JavaSourceContainer.getInstance().clear();
    }
 
    @After

src/test/java/de/strullerbaumann/visualee/filter/entity/ClassFilterTest.java

@@ -34,7 +34,9 @@
  * limitations under the License.
  * #L%
  */
+import de.strullerbaumann.visualee.dependency.boundary.DependencyContainer;
 import de.strullerbaumann.visualee.filter.boundary.FilterContainer;
+import de.strullerbaumann.visualee.source.boundary.JavaSourceContainer;
 import de.strullerbaumann.visualee.source.entity.JavaSource;
 import de.strullerbaumann.visualee.source.entity.JavaSourceFactory;
 import org.junit.After;
@@ -77,10 +79,14 @@ public static void setUpClass() {
 
    @AfterClass
    public static void tearDownClass() {
+      FilterContainer.getInstance().clear();
    }
 
    @Before
    public void setUp() {
+      DependencyContainer.getInstance().clear();
+      FilterContainer.getInstance().clear();
+      JavaSourceContainer.getInstance().clear();
    }
 
    @After

src/test/java/de/strullerbaumann/visualee/filter/entity/PackageFilterTest.java

@@ -35,7 +35,9 @@
  * #L%
  */
 
+import de.strullerbaumann.visualee.dependency.boundary.DependencyContainer;
 import de.strullerbaumann.visualee.filter.boundary.FilterContainer;
+import de.strullerbaumann.visualee.source.boundary.JavaSourceContainer;
 import de.strullerbaumann.visualee.source.entity.JavaSource;
 import de.strullerbaumann.visualee.source.entity.JavaSourceFactory;
 import org.junit.After;
@@ -54,7 +56,11 @@ public class PackageFilterTest {
 
    private static JavaSource javaSource;
 
-   public PackageFilterTest() {
+   @Before
+   public void init() {
+      DependencyContainer.getInstance().clear();
+      FilterContainer.getInstance().clear();
+      JavaSourceContainer.getInstance().clear();
    }
 
    @BeforeClass

src/test/java/de/strullerbaumann/visualee/filter/entity/SourcecodeFilterTest.java

@@ -35,7 +35,9 @@
  * #L%
  */
 
+import de.strullerbaumann.visualee.dependency.boundary.DependencyContainer;
 import de.strullerbaumann.visualee.filter.boundary.FilterContainer;
+import de.strullerbaumann.visualee.source.boundary.JavaSourceContainer;
 import de.strullerbaumann.visualee.source.entity.JavaSource;
 import de.strullerbaumann.visualee.source.entity.JavaSourceFactory;
 import org.junit.After;
@@ -57,6 +59,12 @@ public class SourcecodeFilterTest {
    public SourcecodeFilterTest() {
    }
 
+   @Before
+   public void init() {
+      DependencyContainer.getInstance().clear();
+      FilterContainer.getInstance().clear();
+      JavaSourceContainer.getInstance().clear();
+   }
    @BeforeClass
    public static void setUpClass() {
       FilterContainer.getInstance().clear();

src/test/java/de/strullerbaumann/visualee/source/boundary/JavaSourceContainerTest.java

@@ -20,6 +20,7 @@
  * #L%
  */
 import de.strullerbaumann.visualee.dependency.boundary.DependencyContainer;
+import de.strullerbaumann.visualee.filter.boundary.FilterContainer;
 import de.strullerbaumann.visualee.source.entity.JavaSource;
 import de.strullerbaumann.visualee.source.entity.JavaSourceFactory;
 import static org.junit.Assert.*;
@@ -38,6 +39,8 @@ public JavaSourceContainerTest() {
    @Before
    public void init() {
       DependencyContainer.getInstance().clear();
+      FilterContainer.getInstance().clear();
+      JavaSourceContainer.getInstance().clear();
    }
 
    @Test

src/test/java/de/strullerbaumann/visualee/source/entity/JavaSourceTest.java

@@ -22,10 +22,14 @@
 import de.strullerbaumann.visualee.dependency.boundary.DependencyContainer;
 import de.strullerbaumann.visualee.dependency.entity.Dependency;
 import de.strullerbaumann.visualee.dependency.entity.DependencyType;
+import de.strullerbaumann.visualee.filter.boundary.FilterContainer;
+import de.strullerbaumann.visualee.source.boundary.JavaSourceContainer;
 import de.strullerbaumann.visualee.testdata.TestDataProvider;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import static org.junit.Assert.assertEquals;
+
+import org.junit.Before;
 import org.junit.Test;
 
 /**
@@ -37,6 +41,12 @@ public class JavaSourceTest {
    public JavaSourceTest() {
    }
 
+   @Before
+   public void init() {
+      DependencyContainer.getInstance().clear();
+      FilterContainer.getInstance().clear();
+      JavaSourceContainer.getInstance().clear();
+   }
    @Test
    public void testConstructor() {
       String expected = "test2myTestJavaFile";

src/test/java/de/strullerbaumann/visualee/ui/graph/boundary/GraphCreatorTest.java

@@ -22,6 +22,8 @@
 import de.strullerbaumann.visualee.dependency.boundary.DependencyContainer;
 import de.strullerbaumann.visualee.dependency.boundary.DependencyFilter;
 import de.strullerbaumann.visualee.dependency.entity.DependencyType;
+import de.strullerbaumann.visualee.examiner.cdi.ExaminerEJB;
+import de.strullerbaumann.visualee.filter.boundary.FilterContainer;
 import de.strullerbaumann.visualee.source.boundary.JavaSourceContainer;
 import de.strullerbaumann.visualee.source.entity.JavaSource;
 import de.strullerbaumann.visualee.source.entity.JavaSourceFactory;
@@ -30,6 +32,8 @@
 import javax.json.JsonObject;
 import javax.json.JsonObjectBuilder;
 import static org.junit.Assert.*;
+
+import org.junit.Before;
 import org.junit.Test;
 
 /**
@@ -38,6 +42,12 @@
  */
 public class GraphCreatorTest {
 
+   @Before
+   public void init() {
+      DependencyContainer.getInstance().clear();
+      FilterContainer.getInstance().clear();
+      JavaSourceContainer.getInstance().clear();
+   }
    public GraphCreatorTest() {
    }
 

src/test/java/de/strullerbaumann/visualee/ui/graph/control/DescriptionTest.java

@@ -25,12 +25,15 @@
 import de.strullerbaumann.visualee.examiner.JavaSourceInspector;
 import de.strullerbaumann.visualee.examiner.cdi.ExaminerInject;
 import de.strullerbaumann.visualee.examiner.cdi.ExaminerProduces;
+import de.strullerbaumann.visualee.filter.boundary.FilterContainer;
 import de.strullerbaumann.visualee.source.boundary.JavaSourceContainer;
 import de.strullerbaumann.visualee.source.entity.JavaSource;
 import de.strullerbaumann.visualee.source.entity.JavaSourceFactory;
 import java.util.ArrayList;
 import java.util.List;
 import static org.junit.Assert.*;
+
+import org.junit.Before;
 import org.junit.Test;
 
 /**
@@ -39,6 +42,12 @@
  */
 public class DescriptionTest {
 
+   @Before
+   public void init() {
+      DependencyContainer.getInstance().clear();
+      FilterContainer.getInstance().clear();
+      JavaSourceContainer.getInstance().clear();
+   }
    public DescriptionTest() {
    }