1 files changed, 8 insertions, 16 deletions
diff --git a/android/guava-tests/test/com/google/common/graph/PackageSanityTests.java b/android/guava-tests/test/com/google/common/graph/PackageSanityTests.java
index 202295244..f1526c235 100644
--- a/android/guava-tests/test/com/google/common/graph/PackageSanityTests.java
+++ b/android/guava-tests/test/com/google/common/graph/PackageSanityTests.java
@@ -35,16 +35,20 @@ public class PackageSanityTests extends AbstractPackageSanityTests {
   private static final AbstractGraphBuilder<?> GRAPH_BUILDER_B =
       ValueGraphBuilder.directed().allowsSelfLoops(true).expectedNodeCount(16);
 
-  private static final ImmutableGraph<String> IMMUTABLE_GRAPH_A = graphWithNode("A");
-  private static final ImmutableGraph<String> IMMUTABLE_GRAPH_B = graphWithNode("B");
+  private static final ImmutableGraph<String> IMMUTABLE_GRAPH_A =
+      GraphBuilder.directed().<String>immutable().addNode("A").build();
+  private static final ImmutableGraph<String> IMMUTABLE_GRAPH_B =
+      GraphBuilder.directed().<String>immutable().addNode("B").build();
 
   private static final NetworkBuilder<?, ?> NETWORK_BUILDER_A =
       NetworkBuilder.directed().allowsParallelEdges(true).expectedNodeCount(10);
   private static final NetworkBuilder<?, ?> NETWORK_BUILDER_B =
       NetworkBuilder.directed().allowsSelfLoops(true).expectedNodeCount(16);
 
-  private static final ImmutableNetwork<String, String> IMMUTABLE_NETWORK_A = networkWithNode("A");
-  private static final ImmutableNetwork<String, String> IMMUTABLE_NETWORK_B = networkWithNode("B");
+  private static final ImmutableNetwork<String, String> IMMUTABLE_NETWORK_A =
+      NetworkBuilder.directed().<String, String>immutable().addNode("A").build();
+  private static final ImmutableNetwork<String, String> IMMUTABLE_NETWORK_B =
+      NetworkBuilder.directed().<String, String>immutable().addNode("B").build();
 
   public PackageSanityTests() {
     setDistinctValues(AbstractGraphBuilder.class, GRAPH_BUILDER_A, GRAPH_BUILDER_B);
@@ -66,16 +70,4 @@ public class PackageSanityTests extends AbstractPackageSanityTests {
           .contains(ERROR_ELEMENT_NOT_IN_GRAPH);
     }
   }
-
-  private static <N> ImmutableGraph<N> graphWithNode(N node) {
-    MutableGraph<N> graph = GraphBuilder.directed().build();
-    graph.addNode(node);
-    return ImmutableGraph.copyOf(graph);
-  }
-
-  private static <N> ImmutableNetwork<N, N> networkWithNode(N node) {
-    MutableNetwork<N, N> network = NetworkBuilder.directed().build();
-    network.addNode(node);
-    return ImmutableNetwork.copyOf(network);
-  }
 }