Mercurial > hg > truffle

changeset 22425:b39b603e2a1e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Organize imports after rename.
author Christian Humer <christian.humer@oracle.com>
date Wed, 02 Dec 2015 15:21:01 +0100
parents fec62e298245
children 0e9c0a0fdb40
files truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/ArgumentsTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/CallTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/ChildNodeTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/ChildrenNodesTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/FinalFieldTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/FrameSlotTypeSpecializationTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/FrameTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/InterfaceChildFieldTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/ReplaceTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/ReturnTypeSpecializationTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/RootNodeTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/TestingLanguage.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/ThreadSafetyTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/TruffleRuntimeTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/instrument/EvalInstrumentTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/instrument/InstrumentationTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/instrument/InstrumentationTestNodes.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/instrument/InstrumentationTestingLanguage.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/interop/ForeignAccessSingleThreadedTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/interop/ForeignAccessToStringTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/interop/MessageStringTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/nodes/NodeUtilTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/nodes/SafeReplaceTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/source/BytesSourceSectionTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/source/SourceSectionTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/source/SourceTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/source/SourceTextTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/AlwaysValidAssumptionTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/AssumedValueTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/BinaryConditionProfileTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/BranchProfileTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/CountingConditionProfileTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/CyclicAssumptionTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/ExactClassValueProfileTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/IdentityValueProfileTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/NeverValidAssumptionTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/PrimitiveValueProfileTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/UnionAssumptionTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/AccessorTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/ArrayTruffleObject.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/EngineAsynchTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/EngineSingleThreadedTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/EngineTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/ExceptionDuringParsingTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/GlobalSymbolAsynchTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/GlobalSymbolTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/HashLanguage.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/ImplicitExplicitExportTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/InitializationTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/ToStringTest.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/ValueTest.java
diffstat 51 files changed, 158 insertions(+), 232 deletions(-) [+]
line wrap: on
line diff
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/ArgumentsTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/ArgumentsTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -27,9 +27,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.TruffleRuntime;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/CallTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/CallTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -27,9 +27,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.TruffleRuntime;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.utilities.InstrumentationTestMode;
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/ChildNodeTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/ChildNodeTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,15 +22,6 @@
  */
 package com.oracle.truffle.api;
 
-import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.TruffleRuntime;
-import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.nodes.Node;
-import com.oracle.truffle.api.nodes.Node.Child;
-import com.oracle.truffle.api.nodes.RootNode;
-import com.oracle.truffle.api.utilities.InstrumentationTestMode;
-
 import java.util.Iterator;
 
 import org.junit.After;
@@ -38,6 +29,12 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.nodes.Node.Child;
+import com.oracle.truffle.api.nodes.RootNode;
+import com.oracle.truffle.api.utilities.InstrumentationTestMode;
+
 /**
  * <h3>Creating a Child Node</h3>
  *
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/ChildrenNodesTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/ChildrenNodesTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,14 +22,6 @@
  */
 package com.oracle.truffle.api;
 
-import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.TruffleRuntime;
-import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.nodes.Node;
-import com.oracle.truffle.api.nodes.RootNode;
-import com.oracle.truffle.api.utilities.InstrumentationTestMode;
-
 import java.util.Iterator;
 
 import org.junit.After;
@@ -37,6 +29,11 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.nodes.RootNode;
+import com.oracle.truffle.api.utilities.InstrumentationTestMode;
+
 /**
  * <h3>Creating an Array of Children Nodes</h3>
  *
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/FinalFieldTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/FinalFieldTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,19 +22,16 @@
  */
 package com.oracle.truffle.api;
 
-import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.TruffleRuntime;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.utilities.InstrumentationTestMode;
 
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
 /**
  * <h3>Using Final Fields in Node Classes</h3>
  *
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/FrameSlotTypeSpecializationTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/FrameSlotTypeSpecializationTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,9 +22,11 @@
  */
 package com.oracle.truffle.api;
 
-import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.TruffleRuntime;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.FrameSlot;
 import com.oracle.truffle.api.frame.FrameSlotKind;
@@ -34,11 +36,6 @@
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.utilities.InstrumentationTestMode;
 
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
 /**
  * <h3>Specializing Frame Slot Types</h3>
  *
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/FrameTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/FrameTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -30,9 +30,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.TruffleRuntime;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.FrameInstance;
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/InterfaceChildFieldTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/InterfaceChildFieldTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,9 +22,13 @@
  */
 package com.oracle.truffle.api;
 
-import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.TruffleRuntime;
+import java.util.Iterator;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.NodeInterface;
@@ -32,13 +36,6 @@
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.utilities.InstrumentationTestMode;
 
-import java.util.Iterator;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
 /**
  * Test child fields declared with interface types instead of {@link Node} subclasses.
  */
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/ReplaceTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/ReplaceTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,23 +22,19 @@
  */
 package com.oracle.truffle.api;
 
-import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.TruffleRuntime;
-import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.nodes.Node;
-import com.oracle.truffle.api.nodes.RootNode;
-import com.oracle.truffle.api.utilities.InstrumentationTestMode;
+import static org.junit.Assert.assertEquals;
 
 import java.util.Iterator;
 
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.nodes.RootNode;
+import com.oracle.truffle.api.utilities.InstrumentationTestMode;
 
 /**
  * <h3>Replacing Nodes at Run Time</h3>
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/ReturnTypeSpecializationTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/ReturnTypeSpecializationTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,9 +22,11 @@
  */
 package com.oracle.truffle.api;
 
-import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.TruffleRuntime;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.FrameSlot;
 import com.oracle.truffle.api.frame.FrameSlotKind;
@@ -35,11 +37,6 @@
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.utilities.InstrumentationTestMode;
 
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
 /**
  * <h3>Specializing Return Types</h3>
  *
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/RootNodeTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/RootNodeTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,18 +22,15 @@
  */
 package com.oracle.truffle.api;
 
-import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.TruffleRuntime;
-import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.nodes.RootNode;
-import com.oracle.truffle.api.utilities.InstrumentationTestMode;
-
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.nodes.RootNode;
+import com.oracle.truffle.api.utilities.InstrumentationTestMode;
+
 /**
  * <h3>Creating a Root Node</h3>
  *
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/TestingLanguage.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/TestingLanguage.java	Wed Dec 02 15:21:01 2015 +0100
@@ -24,8 +24,6 @@
 
 import java.io.IOException;
 
-import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.MaterializedFrame;
 import com.oracle.truffle.api.instrument.Visualizer;
 import com.oracle.truffle.api.instrument.WrapperNode;
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/ThreadSafetyTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/ThreadSafetyTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,23 +22,23 @@
  */
 package com.oracle.truffle.api;
 
-import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.TruffleRuntime;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Random;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.DirectCallNode;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.NodeUtil;
 import com.oracle.truffle.api.nodes.RootNode;
-import java.util.Random;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import org.junit.Ignore;
-import org.junit.Test;
 
 /**
  * Test node rewriting in a tree shared across multiple threads (run with -ea).
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/TruffleRuntimeTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/TruffleRuntimeTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -37,9 +37,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.TruffleRuntime;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.NodeUtil;
 import com.oracle.truffle.api.nodes.RootNode;
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/instrument/EvalInstrumentTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/instrument/EvalInstrumentTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -34,11 +34,6 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.instrument.EvalInstrumentListener;
-import com.oracle.truffle.api.instrument.Instrument;
-import com.oracle.truffle.api.instrument.Instrumenter;
-import com.oracle.truffle.api.instrument.Probe;
-import com.oracle.truffle.api.instrument.SyntaxTag;
 import com.oracle.truffle.api.instrument.InstrumentationTestingLanguage.InstrumentTestTag;
 import com.oracle.truffle.api.instrument.impl.DefaultProbeListener;
 import com.oracle.truffle.api.nodes.Node;
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/instrument/InstrumentationTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/instrument/InstrumentationTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -32,14 +32,6 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.instrument.ASTProber;
-import com.oracle.truffle.api.instrument.Instrumenter;
-import com.oracle.truffle.api.instrument.Probe;
-import com.oracle.truffle.api.instrument.ProbeInstrument;
-import com.oracle.truffle.api.instrument.SimpleInstrumentListener;
-import com.oracle.truffle.api.instrument.StandardInstrumentListener;
-import com.oracle.truffle.api.instrument.SyntaxTag;
-import com.oracle.truffle.api.instrument.WrapperNode;
 import com.oracle.truffle.api.instrument.InstrumentationTestNodes.TestAdditionNode;
 import com.oracle.truffle.api.instrument.InstrumentationTestNodes.TestLanguageNode;
 import com.oracle.truffle.api.instrument.InstrumentationTestNodes.TestValueNode;
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/instrument/InstrumentationTestNodes.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/instrument/InstrumentationTestNodes.java	Wed Dec 02 15:21:01 2015 +0100
@@ -24,10 +24,6 @@
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.instrument.EventHandlerNode;
-import com.oracle.truffle.api.instrument.Instrumenter;
-import com.oracle.truffle.api.instrument.Probe;
-import com.oracle.truffle.api.instrument.WrapperNode;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.NodeCost;
 import com.oracle.truffle.api.nodes.NodeInfo;
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/instrument/InstrumentationTestingLanguage.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/instrument/InstrumentationTestingLanguage.java	Wed Dec 02 15:21:01 2015 +0100
@@ -29,11 +29,6 @@
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleRuntime;
 import com.oracle.truffle.api.frame.MaterializedFrame;
-import com.oracle.truffle.api.instrument.ASTProber;
-import com.oracle.truffle.api.instrument.Instrumenter;
-import com.oracle.truffle.api.instrument.SyntaxTag;
-import com.oracle.truffle.api.instrument.Visualizer;
-import com.oracle.truffle.api.instrument.WrapperNode;
 import com.oracle.truffle.api.instrument.InstrumentationTestNodes.InstrumentationTestRootNode;
 import com.oracle.truffle.api.instrument.InstrumentationTestNodes.TestAdditionNode;
 import com.oracle.truffle.api.instrument.InstrumentationTestNodes.TestLanguageNode;
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/interop/ForeignAccessSingleThreadedTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/interop/ForeignAccessSingleThreadedTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,17 +22,16 @@
  */
 package com.oracle.truffle.api.interop;
 
-import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.interop.ForeignAccess;
-import com.oracle.truffle.api.interop.Message;
-import com.oracle.truffle.api.interop.TruffleObject;
-import com.oracle.truffle.api.nodes.Node;
-import org.junit.After;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
+
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import com.oracle.truffle.api.CallTarget;
+import com.oracle.truffle.api.nodes.Node;
+
 public class ForeignAccessSingleThreadedTest implements ForeignAccess.Factory, TruffleObject {
     ForeignAccess fa;
     private int cnt;
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/interop/ForeignAccessToStringTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/interop/ForeignAccessToStringTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,12 +22,11 @@
  */
 package com.oracle.truffle.api.interop;
 
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.interop.ForeignAccess;
-import com.oracle.truffle.api.interop.Message;
-import com.oracle.truffle.api.interop.TruffleObject;
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
 
 public class ForeignAccessToStringTest {
     @Test
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/interop/MessageStringTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/interop/MessageStringTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -33,8 +33,6 @@
 
 import org.junit.Test;
 
-import com.oracle.truffle.api.interop.Message;
-
 public class MessageStringTest {
 
     @Test
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/nodes/NodeUtilTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/nodes/NodeUtilTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,18 +22,15 @@
  */
 package com.oracle.truffle.api.nodes;
 
-import com.oracle.truffle.api.TestingLanguage;
-import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.nodes.Node;
-import com.oracle.truffle.api.nodes.NodeUtil;
-import com.oracle.truffle.api.nodes.RootNode;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
 
 import java.util.Iterator;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import org.junit.Test;
 
-import org.junit.Test;
+import com.oracle.truffle.api.TestingLanguage;
+import com.oracle.truffle.api.frame.VirtualFrame;
 
 public class NodeUtilTest {
 
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/nodes/SafeReplaceTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/nodes/SafeReplaceTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,17 +22,15 @@
  */
 package com.oracle.truffle.api.nodes;
 
-import com.oracle.truffle.api.TestingLanguage;
-import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.nodes.Node;
-import com.oracle.truffle.api.nodes.RootNode;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
+import com.oracle.truffle.api.TestingLanguage;
+import com.oracle.truffle.api.frame.VirtualFrame;
+
 /**
  * Tests optional method for ensuring that a node replacement is type safe. Ordinary node
  * replacement is performed by unsafe assignment of a parent node's child field.
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/source/BytesSourceSectionTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/source/BytesSourceSectionTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,9 +22,10 @@
  */
 package com.oracle.truffle.api.source;
 
-import com.oracle.truffle.api.source.Source;
+import static org.junit.Assert.assertEquals;
+
 import java.nio.charset.StandardCharsets;
-import static org.junit.Assert.assertEquals;
+
 import org.junit.Test;
 
 public class BytesSourceSectionTest {
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/source/SourceSectionTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/source/SourceSectionTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -27,9 +27,6 @@
 
 import org.junit.Test;
 
-import com.oracle.truffle.api.source.Source;
-import com.oracle.truffle.api.source.SourceSection;
-
 public class SourceSectionTest {
 
     private final Source emptySource = Source.fromText("", null);
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/source/SourceTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/source/SourceTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,15 +22,16 @@
  */
 package com.oracle.truffle.api.source;
 
-import com.oracle.truffle.api.source.Source;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNull;
+
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.StringReader;
 import java.nio.charset.StandardCharsets;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNull;
+
 import org.junit.Test;
 
 public class SourceTest {
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/source/SourceTextTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/source/SourceTextTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,8 +22,8 @@
  */
 package com.oracle.truffle.api.source;
 
-import com.oracle.truffle.api.source.Source;
 import static org.junit.Assert.assertEquals;
+
 import org.junit.Test;
 
 public class SourceTextTest {
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/AlwaysValidAssumptionTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/AlwaysValidAssumptionTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,10 +22,11 @@
  */
 package com.oracle.truffle.api.utilities;
 
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
 import com.oracle.truffle.api.nodes.InvalidAssumptionException;
-import com.oracle.truffle.api.utilities.AlwaysValidAssumption;
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
 
 public class AlwaysValidAssumptionTest {
 
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/AssumedValueTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/AssumedValueTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,8 +22,8 @@
  */
 package com.oracle.truffle.api.utilities;
 
-import com.oracle.truffle.api.utilities.AssumedValue;
 import static org.junit.Assert.assertEquals;
+
 import org.junit.Test;
 
 public class AssumedValueTest {
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/BinaryConditionProfileTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/BinaryConditionProfileTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,10 +22,9 @@
  */
 package com.oracle.truffle.api.utilities;
 
-import com.oracle.truffle.api.utilities.BinaryConditionProfile;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.theories.DataPoints;
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/BranchProfileTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/BranchProfileTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,8 +22,8 @@
  */
 package com.oracle.truffle.api.utilities;
 
-import com.oracle.truffle.api.utilities.BranchProfile;
 import static org.junit.Assert.assertTrue;
+
 import org.junit.Test;
 
 public class BranchProfileTest {
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/CountingConditionProfileTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/CountingConditionProfileTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,10 +22,9 @@
  */
 package com.oracle.truffle.api.utilities;
 
-import com.oracle.truffle.api.utilities.ConditionProfile;
-import com.oracle.truffle.api.utilities.CountingConditionProfile;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.theories.DataPoints;
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/CyclicAssumptionTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/CyclicAssumptionTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,13 +22,14 @@
  */
 package com.oracle.truffle.api.utilities;
 
-import com.oracle.truffle.api.Assumption;
-import com.oracle.truffle.api.utilities.CyclicAssumption;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+
 import org.junit.Test;
 
+import com.oracle.truffle.api.Assumption;
+
 public class CyclicAssumptionTest {
 
     @Test
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/ExactClassValueProfileTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/ExactClassValueProfileTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,12 +22,13 @@
  */
 package com.oracle.truffle.api.utilities;
 
-import com.oracle.truffle.api.utilities.ValueProfile;
-import java.lang.reflect.Method;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThat;
+
+import java.lang.reflect.Method;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.theories.DataPoint;
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/IdentityValueProfileTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/IdentityValueProfileTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,11 +22,12 @@
  */
 package com.oracle.truffle.api.utilities;
 
-import com.oracle.truffle.api.utilities.ValueProfile;
-import java.lang.reflect.Method;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
+
+import java.lang.reflect.Method;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.theories.DataPoint;
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/NeverValidAssumptionTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/NeverValidAssumptionTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,12 +22,13 @@
  */
 package com.oracle.truffle.api.utilities;
 
-import com.oracle.truffle.api.nodes.InvalidAssumptionException;
-import com.oracle.truffle.api.utilities.NeverValidAssumption;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.fail;
+
 import org.junit.Test;
 
+import com.oracle.truffle.api.nodes.InvalidAssumptionException;
+
 public class NeverValidAssumptionTest {
 
     @Test
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/PrimitiveValueProfileTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/PrimitiveValueProfileTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,14 +22,13 @@
  */
 package com.oracle.truffle.api.utilities;
 
-import com.oracle.truffle.api.utilities.PrimitiveValueProfile;
-import com.oracle.truffle.api.utilities.ValueProfile;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.theories.DataPoint;
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/UnionAssumptionTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/utilities/UnionAssumptionTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,13 +22,14 @@
  */
 package com.oracle.truffle.api.utilities;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.nodes.InvalidAssumptionException;
-import com.oracle.truffle.api.utilities.UnionAssumption;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
 
 public class UnionAssumptionTest {
 
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/AccessorTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/AccessorTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,27 +22,24 @@
  */
 package com.oracle.truffle.api.vm;
 
-import com.oracle.truffle.api.TruffleLanguage;
-import com.oracle.truffle.api.impl.Accessor;
-import com.oracle.truffle.api.source.Source;
-
 import static com.oracle.truffle.api.vm.ImplicitExplicitExportTest.L1;
-
-import com.oracle.truffle.api.vm.PolyglotEngine;
-import com.oracle.truffle.api.vm.ImplicitExplicitExportTest.ExportImportLanguage1;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.concurrent.Executors;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import com.oracle.truffle.api.TruffleLanguage;
+import com.oracle.truffle.api.impl.Accessor;
+import com.oracle.truffle.api.source.Source;
+import com.oracle.truffle.api.vm.ImplicitExplicitExportTest.ExportImportLanguage1;
+
 public class AccessorTest {
     public static Accessor API;
 
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/ArrayTruffleObject.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/ArrayTruffleObject.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,6 +22,10 @@
  */
 package com.oracle.truffle.api.vm;
 
+import static org.junit.Assert.assertNotEquals;
+
+import java.util.List;
+
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
@@ -30,8 +34,6 @@
 import com.oracle.truffle.api.interop.Message;
 import com.oracle.truffle.api.interop.TruffleObject;
 import com.oracle.truffle.api.nodes.RootNode;
-import java.util.List;
-import static org.junit.Assert.assertNotEquals;
 
 final class ArrayTruffleObject implements TruffleObject, ForeignAccess.Factory10 {
     private final ForeignAccess access;
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/EngineAsynchTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/EngineAsynchTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,8 +22,8 @@
  */
 package com.oracle.truffle.api.vm;
 
-import com.oracle.truffle.api.vm.PolyglotEngine;
 import java.util.concurrent.Executors;
+
 import org.junit.Test;
 
 public class EngineAsynchTest extends EngineTest {
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/EngineSingleThreadedTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/EngineSingleThreadedTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,14 +22,15 @@
  */
 package com.oracle.truffle.api.vm;
 
-import com.oracle.truffle.api.source.Source;
-import com.oracle.truffle.api.vm.PolyglotEngine;
 import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
+
 import org.junit.Before;
 import org.junit.Test;
 
+import com.oracle.truffle.api.source.Source;
+
 public class EngineSingleThreadedTest {
     PolyglotEngine tvm;
 
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/EngineTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/EngineTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,15 +22,17 @@
  */
 package com.oracle.truffle.api.vm;
 
-import com.oracle.truffle.api.source.Source;
-import com.oracle.truffle.api.vm.PolyglotEngine;
-import java.io.IOException;
-import java.util.List;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
+
+import java.io.IOException;
+import java.util.List;
+
 import org.junit.Test;
 
+import com.oracle.truffle.api.source.Source;
+
 public class EngineTest {
     protected PolyglotEngine.Builder createBuilder() {
         return PolyglotEngine.newBuilder();
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/ExceptionDuringParsingTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/ExceptionDuringParsingTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,26 +22,22 @@
  */
 package com.oracle.truffle.api.vm;
 
-import com.oracle.truffle.api.impl.Accessor;
-import com.oracle.truffle.api.source.Source;
-
 import static com.oracle.truffle.api.vm.ImplicitExplicitExportTest.L1;
-
-import com.oracle.truffle.api.vm.PolyglotEngine;
-import com.oracle.truffle.api.vm.ImplicitExplicitExportTest.Ctx;
-
-import java.io.IOException;
-
-import org.junit.After;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import java.io.IOException;
+
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import com.oracle.truffle.api.impl.Accessor;
+import com.oracle.truffle.api.source.Source;
+import com.oracle.truffle.api.vm.ImplicitExplicitExportTest.Ctx;
+
 public class ExceptionDuringParsingTest {
     public static Accessor API;
 
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/GlobalSymbolAsynchTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/GlobalSymbolAsynchTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,8 +22,6 @@
  */
 package com.oracle.truffle.api.vm;
 
-import com.oracle.truffle.api.vm.PolyglotEngine;
-
 import java.util.concurrent.Executors;
 
 import org.junit.Test;
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/GlobalSymbolTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/GlobalSymbolTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,26 +22,23 @@
  */
 package com.oracle.truffle.api.vm;
 
-import com.oracle.truffle.api.interop.TruffleObject;
-import com.oracle.truffle.api.source.Source;
-import com.oracle.truffle.api.utilities.InstrumentationTestMode;
-
 import static com.oracle.truffle.api.vm.ImplicitExplicitExportTest.L3;
-
-import com.oracle.truffle.api.vm.PolyglotEngine;
-
-import java.io.IOException;
-import java.util.List;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
+import java.io.IOException;
+import java.util.List;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import com.oracle.truffle.api.interop.TruffleObject;
+import com.oracle.truffle.api.source.Source;
+import com.oracle.truffle.api.utilities.InstrumentationTestMode;
+
 public class GlobalSymbolTest {
 
     @Before
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/HashLanguage.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/HashLanguage.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,6 +22,8 @@
  */
 package com.oracle.truffle.api.vm;
 
+import java.io.IOException;
+
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
@@ -33,7 +35,6 @@
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.Source;
-import java.io.IOException;
 
 @TruffleLanguage.Registration(name = "Hash", mimeType = "application/x-test-hash", version = "1.0")
 public class HashLanguage extends TruffleLanguage<Env> {
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/ImplicitExplicitExportTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/ImplicitExplicitExportTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -32,6 +32,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.Executors;
@@ -50,8 +51,6 @@
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.Source;
-import com.oracle.truffle.api.vm.PolyglotEngine;
-import java.util.Objects;
 
 public class ImplicitExplicitExportTest {
     private static Thread mainThread;
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/InitializationTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/InitializationTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -53,8 +53,6 @@
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.vm.EventConsumer;
-import com.oracle.truffle.api.vm.PolyglotEngine;
 
 /**
  * Bug report validating test.
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/ToStringTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/ToStringTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,10 +22,11 @@
  */
 package com.oracle.truffle.api.vm;
 
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
 import com.oracle.truffle.api.source.Source;
-import com.oracle.truffle.api.vm.PolyglotEngine;
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
 
 public class ToStringTest {
     @Test
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/ValueTest.java	Wed Dec 02 15:16:27 2015 +0100
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/vm/ValueTest.java	Wed Dec 02 15:21:01 2015 +0100
@@ -22,20 +22,22 @@
  */
 package com.oracle.truffle.api.vm;
 
-import com.oracle.truffle.api.source.Source;
-import com.oracle.truffle.api.vm.PolyglotEngine;
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.Executor;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.Executor;
+
 import org.junit.Test;
 
+import com.oracle.truffle.api.source.Source;
+
 public class ValueTest implements Executor {
     private List<Runnable> pending = new LinkedList<>();