Fix #1075

mbastian · mbastian · commit f46bcbbd9959 · 2022-11-06T16:31:08.000+01:00
diff --git a/modules/ImportPlugin/src/main/java/org/gephi/io/importer/plugin/file/ImporterDOT.java b/modules/ImportPlugin/src/main/java/org/gephi/io/importer/plugin/file/ImporterDOT.java
@@ -163,9 +163,18 @@ protected void stmtList(StreamTokenizerWithMultilineLiterals streamTokenizer) th
     protected void stmt(StreamTokenizerWithMultilineLiterals streamTokenizer) throws Exception {
         //tk.nextToken();
 
-        if (streamTokenizer.sval == null || streamTokenizer.sval.equalsIgnoreCase("graph") ||
+        if (streamTokenizer.sval == null) {
+        } else if (streamTokenizer.sval.equalsIgnoreCase("graph") ||
             streamTokenizer.sval.equalsIgnoreCase("node")
-            || streamTokenizer.sval.equalsIgnoreCase("edge")) {
+            || streamTokenizer.sval.equalsIgnoreCase("edge")
+            || streamTokenizer.sval.equalsIgnoreCase("subgraph")) {
+
+            while (streamTokenizer.ttype != '{') {
+                streamTokenizer.nextToken();
+                if (streamTokenizer.ttype == StreamTokenizer.TT_EOF) {
+                    return;
+                }
+            }
         } else {
             String nodeId = nodeID(streamTokenizer);
             streamTokenizer.nextToken();
diff --git a/modules/ImportPlugin/src/test/java/org/gephi/io/importer/plugin/file/DOTTest.java b/modules/ImportPlugin/src/test/java/org/gephi/io/importer/plugin/file/DOTTest.java
@@ -11,16 +11,27 @@ public class DOTTest {
 
     @Test
     public void testEmptyFieldsGraph() {
-        ImporterDOT importer = new ImporterDOT();
-        importer.setReader(Utils.getReader("emptyfields.dot"));
-
-        Container container = new ImportContainerImpl();
-        importer.execute(container.getLoader());
-
+        Container container = Utils.importFile(new ImporterDOT(), "dot/emptyfields.dot");
         Assert.assertTrue(container.verify());
+        NodeDraft[] nodes = Utils.toNodesArray(container);
+        Utils.assertSameIds(nodes, "a", "b", "c");
+    }
 
+    @Test
+    public void testNamedGraph() {
+        Container container = Utils.importFile(new ImporterDOT(), "dot/namedgraph.dot");
         NodeDraft[] nodes = Utils.toNodesArray(container);
+        Utils.assertSameIds(nodes, "n");
+    }
 
-        Utils.assertSameIds(nodes, "a", "b", "c");
+    @Test
+    public void testSubgraph() {
+        Container container = Utils.importFile(new ImporterDOT(), "dot/subgraph.dot");
+
+        NodeDraft[] nodes = Utils.toNodesArray(container);
+        Assert.assertEquals(2, nodes.length);
+        Assert.assertEquals("a", nodes[0].getValue("foo"));
+        Assert.assertEquals("b", nodes[1].getValue("foo"));
+        Assert.assertEquals(1, Utils.toEdgesArray(container).length);
     }
 }
diff --git a/modules/ImportPlugin/src/test/java/org/gephi/io/importer/plugin/file/Utils.java b/modules/ImportPlugin/src/test/java/org/gephi/io/importer/plugin/file/Utils.java
@@ -12,10 +12,22 @@
 import org.gephi.io.importer.api.EdgeDraft;
 import org.gephi.io.importer.api.ElementDraft;
 import org.gephi.io.importer.api.NodeDraft;
+import org.gephi.io.importer.impl.ImportContainerImpl;
+import org.gephi.io.importer.spi.FileImporter;
+import org.gephi.io.importer.spi.Importer;
 import org.junit.Assert;
 
 public class Utils {
 
+    public static Container importFile(FileImporter importer, String path) {
+        importer.setReader(getReader(path));
+
+        Container container = new ImportContainerImpl();
+        importer.execute(container.getLoader());
+
+        return container;
+    }
+
     public static NodeDraft[] toNodesArray(Container container) {
         List<NodeDraft> result = new ArrayList<>();
         container.getUnloader().getNodes().iterator().forEachRemaining(result::add);
diff --git a/modules/ImportPlugin/src/test/resources/org/gephi/io/importer/plugin/file/dot/emptyfields.dot b/modules/ImportPlugin/src/test/resources/org/gephi/io/importer/plugin/file/dot/emptyfields.dot
diff --git a/modules/ImportPlugin/src/test/resources/org/gephi/io/importer/plugin/file/dot/namedgraph.dot b/modules/ImportPlugin/src/test/resources/org/gephi/io/importer/plugin/file/dot/namedgraph.dot
@@ -0,0 +1,3 @@
+graph test {
+    n
+}
diff --git a/modules/ImportPlugin/src/test/resources/org/gephi/io/importer/plugin/file/dot/subgraph.dot b/modules/ImportPlugin/src/test/resources/org/gephi/io/importer/plugin/file/dot/subgraph.dot
@@ -0,0 +1,7 @@
+digraph g {
+    subgraph cluster_0 {
+        n0 [foo=a];
+        n1 [foo=b];
+    }
+    n0 -> n1;
+}
