fix tests

nidi3 · Feb 21, 2019 · e309f04 · e309f04
1 parent 5ca3b07
commit e309f04
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 17 deletions.
diff --git a/graphviz-java/src/main/java/guru/nidi/graphviz/attribute/Attributes.java b/graphviz-java/src/main/java/guru/nidi/graphviz/attribute/Attributes.java
@@ -17,6 +17,8 @@
 
 import java.util.List;
 
+import static java.util.Arrays.asList;
+
 public interface Attributes<F extends For> {
     Attributes<? super F> applyTo(MapAttributes<? super F> attrs);
 
@@ -43,11 +45,7 @@ static <F extends For> Attributes<F> attrs() {
 
     @SafeVarargs
     static <F extends For> Attributes<F> attrs(Attributes<? extends F>... attributes) {
-        final MapAttributes<F> res = new MapAttributes<>();
-        for (Attributes<? extends F> attribute : attributes) {
-            attribute.applyTo(res);
-        }
-        return res;
+        return attrs(asList(attributes));
     }
 
     static <F extends For> Attributes<F> attrs(List<Attributes<? extends F>> attributes) {

diff --git a/graphviz-java/src/main/java/guru/nidi/graphviz/model/MutableGraph.java b/graphviz-java/src/main/java/guru/nidi/graphviz/model/MutableGraph.java
@@ -20,6 +20,8 @@
 import javax.annotation.Nullable;
 import java.util.*;
 
+import static java.util.Arrays.asList;
+
 public class MutableGraph implements LinkSource, LinkTarget {
     protected boolean strict;
     protected boolean directed;
@@ -89,10 +91,7 @@ public MutableGraph setName(String name) {
     }
 
     public MutableGraph add(LinkSource... sources) {
-        for (final LinkSource source : sources) {
-            add(source);
-        }
-        return this;
+        return add(asList(sources));
     }
 
     public MutableGraph add(List<? extends LinkSource> sources) {

diff --git a/graphviz-java/src/test/java/guru/nidi/graphviz/CodeAnalysisTest.java b/graphviz-java/src/test/java/guru/nidi/graphviz/CodeAnalysisTest.java
@@ -37,14 +37,6 @@
 
 class CodeAnalysisTest extends CodeAssertJunit5Test {
 
-    //TODO un-overwrite as soon as svg salamander is available from maven
-    @Override
-    protected EnumSet<CodeAssertTestType> defaultTests() {
-        final EnumSet<CodeAssertTestType> types = super.defaultTests();
-        types.remove(CodeAssertTestType.CIRCULAR_DEPENDENCIES);
-        return types;
-    }
-
     @Test
     void dependencies() {
         assertThat(dependencyResult(), matchesRulesExactly());