src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/TypedNodeIteratorTest.java

*** 60,71 ****
          }
      }
  
      @Test
      public void singleNodeTest() {
!         getOptions();
!         Graph graph = new Graph(getOptions());
          graph.add(new TestNode("a"));
          assertTrue(graph.hasNode(TestNode.TYPE));
          assertEquals("a", toString(graph.getNodes(TestNode.TYPE)));
      }
  
--- 60,71 ----
          }
      }
  
      @Test
      public void singleNodeTest() {
!         OptionValues options = getOptions();
!         Graph graph = new Graph(options, getDebug(options));
          graph.add(new TestNode("a"));
          assertTrue(graph.hasNode(TestNode.TYPE));
          assertEquals("a", toString(graph.getNodes(TestNode.TYPE)));
      }
  
*** 74,104 ****
      }
  
      @Test
      public void deletingNodeTest() {
          TestNode testNode = new TestNode("a");
!         Graph graph = new Graph(getOptions());
          graph.add(testNode);
          testNode.safeDelete();
          assertEquals("", toString(graph.getNodes(TestNode.TYPE)));
      }
  
      @Test
      public void deleteAndAddTest() {
          TestNode testNode = new TestNode("b");
!         Graph graph = new Graph(getOptions());
          graph.add(new TestNode("a"));
          graph.add(testNode);
          testNode.safeDelete();
          assertEquals("a", toString(graph.getNodes(TestNode.TYPE)));
          graph.add(new TestNode("c"));
          assertEquals("ac", toString(graph.getNodes(TestNode.TYPE)));
      }
  
      @Test
      public void iteratorBehaviorTest() {
!         Graph graph = new Graph(getOptions());
          graph.add(new TestNode("a"));
          Iterator<TestNode> iterator = graph.getNodes(TestNode.TYPE).iterator();
          assertTrue(iterator.hasNext());
          assertEquals("a", iterator.next().getName());
          assertFalse(iterator.hasNext());
--- 74,107 ----
      }
  
      @Test
      public void deletingNodeTest() {
          TestNode testNode = new TestNode("a");
!         OptionValues options = getOptions();
!         Graph graph = new Graph(options, getDebug(options));
          graph.add(testNode);
          testNode.safeDelete();
          assertEquals("", toString(graph.getNodes(TestNode.TYPE)));
      }
  
      @Test
      public void deleteAndAddTest() {
          TestNode testNode = new TestNode("b");
!         OptionValues options = getOptions();
!         Graph graph = new Graph(options, getDebug(options));
          graph.add(new TestNode("a"));
          graph.add(testNode);
          testNode.safeDelete();
          assertEquals("a", toString(graph.getNodes(TestNode.TYPE)));
          graph.add(new TestNode("c"));
          assertEquals("ac", toString(graph.getNodes(TestNode.TYPE)));
      }
  
      @Test
      public void iteratorBehaviorTest() {
!         OptionValues options = getOptions();
!         Graph graph = new Graph(options, getDebug(options));
          graph.add(new TestNode("a"));
          Iterator<TestNode> iterator = graph.getNodes(TestNode.TYPE).iterator();
          assertTrue(iterator.hasNext());
          assertEquals("a", iterator.next().getName());
          assertFalse(iterator.hasNext());
*** 113,123 ****
          assertFalse(iterator.hasNext());
      }
  
      @Test
      public void complicatedIterationTest() {
!         Graph graph = new Graph(getOptions());
          graph.add(new TestNode("a"));
          for (TestNode tn : graph.getNodes(TestNode.TYPE)) {
              String name = tn.getName();
              for (int i = 0; i < name.length(); ++i) {
                  char c = name.charAt(i);
--- 116,127 ----
          assertFalse(iterator.hasNext());
      }
  
      @Test
      public void complicatedIterationTest() {
!         OptionValues options = getOptions();
!         Graph graph = new Graph(options, getDebug(options));
          graph.add(new TestNode("a"));
          for (TestNode tn : graph.getNodes(TestNode.TYPE)) {
              String name = tn.getName();
              for (int i = 0; i < name.length(); ++i) {
                  char c = name.charAt(i);
*** 152,162 ****
          assertEquals("dddd", toString(graph.getNodes(TestNode.TYPE)));
      }
  
      @Test
      public void addingNodeDuringIterationTest() {
!         Graph graph = new Graph(getOptions());
          graph.add(new TestNode("a"));
          StringBuilder sb = new StringBuilder();
          int z = 0;
          for (TestNode tn : graph.getNodes(TestNode.TYPE)) {
              if (z == 0) {
--- 156,167 ----
          assertEquals("dddd", toString(graph.getNodes(TestNode.TYPE)));
      }
  
      @Test
      public void addingNodeDuringIterationTest() {
!         OptionValues options = getOptions();
!         Graph graph = new Graph(options, getDebug(options));
          graph.add(new TestNode("a"));
          StringBuilder sb = new StringBuilder();
          int z = 0;
          for (TestNode tn : graph.getNodes(TestNode.TYPE)) {
              if (z == 0) {