From e31bbb06fb426a0102e404b4840ff40d806da53b Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 23 Sep 2016 14:22:41 +0300 Subject: [PATCH] Cleanup (test migrated; typos; formatting) --- .../intellij/util/graph/CachingSemiGraph.java | 21 ++++----- .../src/com/intellij/util/graph/Graph.java | 6 +-- .../intellij/util/graph/GraphGenerator.java | 13 +++--- .../util/graph/GraphGeneratorTest.java | 46 +++++++++---------- .../intellij/util/graph/GraphTestUtil.java | 18 ++++---- .../com/intellij/util/graph/TestNode.java | 6 +-- 6 files changed, 51 insertions(+), 59 deletions(-) diff --git a/platform/util/src/com/intellij/util/graph/CachingSemiGraph.java b/platform/util/src/com/intellij/util/graph/CachingSemiGraph.java index f68a0b9dd6de..3264699131c3 100644 --- a/platform/util/src/com/intellij/util/graph/CachingSemiGraph.java +++ b/platform/util/src/com/intellij/util/graph/CachingSemiGraph.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,26 +15,23 @@ */ package com.intellij.util.graph; +import com.intellij.util.containers.ContainerUtil; + import java.util.*; /** - * @author dsl + * @author dsl */ public class CachingSemiGraph implements GraphGenerator.SemiGraph { private final Set myNodes; private final Map> myIn; public CachingSemiGraph(GraphGenerator.SemiGraph original) { + myNodes = ContainerUtil.newLinkedHashSet(original.getNodes()); myIn = new LinkedHashMap>(); - myNodes = new LinkedHashSet(); - for (final Node node1 : original.getNodes()) { - myNodes.add(node1); - } - for (final Node node : myNodes) { - final Set value = new LinkedHashSet(); - for (Iterator itin = original.getIn(node); itin.hasNext();) { - value.add(itin.next()); - } + for (Node node : myNodes) { + Set value = new LinkedHashSet(); + ContainerUtil.addAll(value, original.getIn(node)); myIn.put(node, value); } } @@ -52,4 +49,4 @@ public class CachingSemiGraph implements GraphGenerator.SemiGraph { public Iterator getIn(Node n) { return myIn.get(n).iterator(); } -} +} \ No newline at end of file diff --git a/platform/util/src/com/intellij/util/graph/Graph.java b/platform/util/src/com/intellij/util/graph/Graph.java index b043f216c6a8..a192cfa7e238 100644 --- a/platform/util/src/com/intellij/util/graph/Graph.java +++ b/platform/util/src/com/intellij/util/graph/Graph.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ import java.util.Collection; import java.util.Iterator; /** - * @author dsl + * @author dsl */ public interface Graph { Collection getNodes(); @@ -27,4 +27,4 @@ public interface Graph { Iterator getIn(Node n); Iterator getOut(Node n); -} +} \ No newline at end of file diff --git a/platform/util/src/com/intellij/util/graph/GraphGenerator.java b/platform/util/src/com/intellij/util/graph/GraphGenerator.java index 9ab7b0f95479..d7a583e14188 100644 --- a/platform/util/src/com/intellij/util/graph/GraphGenerator.java +++ b/platform/util/src/com/intellij/util/graph/GraphGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,16 +18,16 @@ package com.intellij.util.graph; import java.util.*; /** - * @author dsl + * @author dsl */ -public class GraphGenerator implements Graph { - private final SemiGraph myGraph; - +public class GraphGenerator implements Graph { public interface SemiGraph { Collection getNodes(); + Iterator getIn(Node n); } + private final SemiGraph myGraph; private final Map> myOuts; public GraphGenerator(SemiGraph graph) { @@ -73,5 +73,4 @@ public class GraphGenerator implements Graph { public Iterator getOut(Node n) { return myOuts.get(n).iterator(); } - -} +} \ No newline at end of file diff --git a/platform/util/testSrc/com/intellij/util/graph/GraphGeneratorTest.java b/platform/util/testSrc/com/intellij/util/graph/GraphGeneratorTest.java index cb8e103ccd48..d041524e6014 100644 --- a/platform/util/testSrc/com/intellij/util/graph/GraphGeneratorTest.java +++ b/platform/util/testSrc/com/intellij/util/graph/GraphGeneratorTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,24 +16,23 @@ package com.intellij.util.graph; import com.intellij.util.containers.EmptyIterator; -import junit.framework.TestCase; +import org.junit.Test; -import java.util.Arrays; -import java.util.Collection; -import java.util.Iterator; -import java.util.NoSuchElementException; +import java.util.*; + +import static org.junit.Assert.assertFalse; /** - * @author dsl + * @author dsl */ -public class GraphGeneratorTest extends TestCase { - +public class GraphGeneratorTest { + @Test public void testEmptyGraph() { - final TestNode node = new TestNode("A"); - final GraphGenerator graphGenerator = new GraphGenerator<>(new GraphGenerator.SemiGraph() { + TestNode node = new TestNode("A"); + GraphGenerator graphGenerator = new GraphGenerator<>(new GraphGenerator.SemiGraph() { @Override public Collection getNodes() { - return Arrays.asList(new TestNode[]{node}); + return Collections.singletonList(node); } @Override @@ -45,16 +44,15 @@ public class GraphGeneratorTest extends TestCase { assertFalse(graphGenerator.getOut(node).hasNext()); } + @Test public void testLoop() { - final TestNode nodeA = new TestNode("A"); - final TestNode nodeB = new TestNode("B"); - final TestNode[] nodes = new TestNode[]{nodeA, nodeB}; - final TestNode[] inA = new TestNode[]{nodeB}; - final TestNode[] inB = new TestNode[] {nodeA}; - final TestNode[] outA = inA; - final TestNode[] outB = inB; + TestNode nodeA = new TestNode("A"); + TestNode nodeB = new TestNode("B"); + TestNode[] nodes = {nodeA, nodeB}; + TestNode[] inA = {nodeB}; + TestNode[] inB = {nodeA}; - final GraphGenerator graph = new GraphGenerator<>(new GraphGenerator.SemiGraph() { + GraphGenerator graph = new GraphGenerator<>(new GraphGenerator.SemiGraph() { @Override public Collection getNodes() { return Arrays.asList(nodes); @@ -67,9 +65,7 @@ public class GraphGeneratorTest extends TestCase { throw new NoSuchElementException(); } }); - GraphTestUtil.assertIteratorsEqual(Arrays.asList(outA).iterator(), graph.getOut(nodeA)); - GraphTestUtil.assertIteratorsEqual(Arrays.asList(outB).iterator(), graph.getOut(nodeB)); + GraphTestUtil.assertIteratorsEqual(Arrays.asList(inA).iterator(), graph.getOut(nodeA)); + GraphTestUtil.assertIteratorsEqual(Arrays.asList(inB).iterator(), graph.getOut(nodeB)); } - - -} +} \ No newline at end of file diff --git a/platform/util/testSrc/com/intellij/util/graph/GraphTestUtil.java b/platform/util/testSrc/com/intellij/util/graph/GraphTestUtil.java index 64d2367ae5ed..f2ff426338c5 100644 --- a/platform/util/testSrc/com/intellij/util/graph/GraphTestUtil.java +++ b/platform/util/testSrc/com/intellij/util/graph/GraphTestUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,24 +15,24 @@ */ package com.intellij.util.graph; -import junit.framework.Assert; - import java.util.Arrays; import java.util.Iterator; +import static org.junit.Assert.*; + /** - * @author dsl + * @author dsl */ public class GraphTestUtil { static void assertIteratorsEqual(Iterator expected, Iterator found) { - for (; expected.hasNext(); ) { - Assert.assertTrue(found.hasNext()); - Assert.assertEquals(expected.next(), found.next()); + while (expected.hasNext()) { + assertTrue(found.hasNext()); + assertEquals(expected.next(), found.next()); } - Assert.assertFalse(found.hasNext()); + assertFalse(found.hasNext()); } public static Iterator iteratorOfArray(TestNode[] array) { return Arrays.asList(array).iterator(); } -} +} \ No newline at end of file diff --git a/platform/util/testSrc/com/intellij/util/graph/TestNode.java b/platform/util/testSrc/com/intellij/util/graph/TestNode.java index ee31bdb7e1d1..327afcad786a 100644 --- a/platform/util/testSrc/com/intellij/util/graph/TestNode.java +++ b/platform/util/testSrc/com/intellij/util/graph/TestNode.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ package com.intellij.util.graph; /** - * @author dsl + * @author dsl */ class TestNode { private final String myMark; @@ -32,4 +32,4 @@ class TestNode { public String toString() { return myMark; } -} +} \ No newline at end of file