diff --git a/java/java-tests/testSrc/com/intellij/slicer/SliceTreeTest.java b/java/java-tests/testSrc/com/intellij/slicer/SliceTreeTest.java index 1434a11766aa..cdb4a0e8a977 100644 --- a/java/java-tests/testSrc/com/intellij/slicer/SliceTreeTest.java +++ b/java/java-tests/testSrc/com/intellij/slicer/SliceTreeTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2015 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. @@ -229,81 +229,81 @@ public class SliceTreeTest extends SliceTestCase { checkStructure(newRoot, "Null Values\n" + " Value: o\n" + - " (6: 12) |String| |l|;\n" + - " (52: 13) |l| |=| |d|;\n" + - " (51: 21) |void| |set|(|String| |d|)| |{\n" + - " (15: 13) |set|(|o|)|;\n" + + " 6|String| |l|;\n" + + " 52|l| |=| |d|;\n" + + " 51|void| |set|(|String| |d|)| |{\n" + + " 15|set|(|o|)|;\n" + " Value: nu()\n" + - " (6: 12) |String| |l|;\n" + - " (52: 13) |l| |=| |d|;\n" + - " (51: 21) |void| |set|(|String| |d|)| |{\n" + - " (29: 13) |set|(|nu|(|)|)|;\n" + + " 6|String| |l|;\n" + + " 52|l| |=| |d|;\n" + + " 51|void| |set|(|String| |d|)| |{\n" + + " 29|set|(|nu|(|)|)|;\n" + " Value: t\n" + - " (6: 12) |String| |l|;\n" + - " (52: 13) |l| |=| |d|;\n" + - " (51: 21) |void| |set|(|String| |d|)| |{\n" + - " (46: 15) |x|.|set|(|t|)|;\n" + + " 6|String| |l|;\n" + + " 52|l| |=| |d|;\n" + + " 51|void| |set|(|String| |d|)| |{\n" + + " 46|x|.|set|(|t|)|;\n" + "NotNull Values\n" + " Value: \"\"\n" + - " (6: 12) |String| |l|;\n" + - " (52: 13) |l| |=| |d|;\n" + - " (51: 21) |void| |set|(|String| |d|)| |{\n" + - " (19: 13) |set|(|CON|)|;\n" + - " (5: 39) |private| |final| |static| |String| |CON| |=| |\"\"|;\n" + + " 6|String| |l|;\n" + + " 52|l| |=| |d|;\n" + + " 51|void| |set|(|String| |d|)| |{\n" + + " 19|set|(|CON|)|;\n" + + " 5|private| |final| |static| |String| |CON| |=| |\"\"|;\n" + " Value: \"xxx\"\n" + - " (6: 12) |String| |l|;\n" + - " (52: 13) |l| |=| |d|;\n" + - " (51: 21) |void| |set|(|String| |d|)| |{\n" + - " (10: 13) |set|(|\"xxx\"|)|;\n" + + " 6|String| |l|;\n" + + " 52|l| |=| |d|;\n" + + " 51|void| |set|(|String| |d|)| |{\n" + + " 10|set|(|\"xxx\"|)|;\n" + " Value: new String()\n" + - " (6: 12) |String| |l|;\n" + - " (52: 13) |l| |=| |d|;\n" + - " (51: 21) |void| |set|(|String| |d|)| |{\n" + - " (17: 13) |set|(|new| |String|(|)|)|;\n" + + " 6|String| |l|;\n" + + " 52|l| |=| |d|;\n" + + " 51|void| |set|(|String| |d|)| |{\n" + + " 17|set|(|new| |String|(|)|)|;\n" + " Value: nn()\n" + - " (6: 12) |String| |l|;\n" + - " (52: 13) |l| |=| |d|;\n" + - " (51: 21) |void| |set|(|String| |d|)| |{\n" + - " (18: 13) |set|(|nn|(|)|)|;\n" + + " 6|String| |l|;\n" + + " 52|l| |=| |d|;\n" + + " 51|void| |set|(|String| |d|)| |{\n" + + " 18|set|(|nn|(|)|)|;\n" + " Value: nn\n" + - " (6: 12) |String| |l|;\n" + - " (52: 13) |l| |=| |d|;\n" + - " (51: 21) |void| |set|(|String| |d|)| |{\n" + - " (21: 13) |set|(|nn|)|;\n" + + " 6|String| |l|;\n" + + " 52|l| |=| |d|;\n" + + " 51|void| |set|(|String| |d|)| |{\n" + + " 21|set|(|nn|)|;\n" + " Value: g\n" + - " (6: 12) |String| |l|;\n" + - " (52: 13) |l| |=| |d|;\n" + - " (51: 21) |void| |set|(|String| |d|)| |{\n" + - " (27: 13) |set|(|g|)|;\n" + + " 6|String| |l|;\n" + + " 52|l| |=| |d|;\n" + + " 51|void| |set|(|String| |d|)| |{\n" + + " 27|set|(|g|)|;\n" + " Value: \"null\"\n" + - " (6: 12) |String| |l|;\n" + - " (52: 13) |l| |=| |d|;\n" + - " (51: 21) |void| |set|(|String| |d|)| |{\n" + - " (48: 15) |x|.|set|(|t| |==| |null| |?| |\"null\"| |:| |t|)|;\n" + - " (48: 27) |x|.|set|(|t| |==| |null| |?| |\"null\"| |:| |t|)|;\n" + + " 6|String| |l|;\n" + + " 52|l| |=| |d|;\n" + + " 51|void| |set|(|String| |d|)| |{\n" + + " 48|x|.|set|(|t| |==| |null| |?| |\"null\"| |:| |t|)|;\n" + + " 48|x|.|set|(|t| |==| |null| |?| |\"null\"| |:| |t|)|;\n" + " Value: t\n" + - " (6: 12) |String| |l|;\n" + - " (52: 13) |l| |=| |d|;\n" + - " (51: 21) |void| |set|(|String| |d|)| |{\n" + - " (48: 15) |x|.|set|(|t| |==| |null| |?| |\"null\"| |:| |t|)|;\n" + - " (48: 36) |x|.|set|(|t| |==| |null| |?| |\"null\"| |:| |t|)|;\n" + + " 6|String| |l|;\n" + + " 52|l| |=| |d|;\n" + + " 51|void| |set|(|String| |d|)| |{\n" + + " 48|x|.|set|(|t| |==| |null| |?| |\"null\"| |:| |t|)|;\n" + + " 48|x|.|set|(|t| |==| |null| |?| |\"null\"| |:| |t|)|;\n" + " Value: d\n" + - " (6: 12) |String| |l|;\n" + - " (55: 13) |l| |=| |d|;\n" + + " 6|String| |l|;\n" + + " 55|l| |=| |d|;\n" + "Other Values\n" + " Value: private String d;\n" + - " (6: 12) |String| |l|;\n" + - " (52: 13) |l| |=| |d|;\n" + - " (51: 21) |void| |set|(|String| |d|)| |{\n" + - " (30: 13) |set|(|hz|(|)|)|;\n" + - " (42: 16) |return| |d|;\n" + - " (7: 20) |private| |String| |d|;\n" + + " 6|String| |l|;\n" + + " 52|l| |=| |d|;\n" + + " 51|void| |set|(|String| |d|)| |{\n" + + " 30|set|(|hz|(|)|)|;\n" + + " 42|return| |d|;\n" + + " 7|private| |String| |d|;\n" + " Value: String g\n" + - " (6: 12) |String| |l|;\n" + - " (52: 13) |l| |=| |d|;\n" + - " (51: 21) |void| |set|(|String| |d|)| |{\n" + - " (11: 13) |set|(|g|)|;\n" + - " (9: 21) |public| |X|(|String| |g|)| |{\n" + + " 6|String| |l|;\n" + + " 52|l| |=| |d|;\n" + + " 51|void| |set|(|String| |d|)| |{\n" + + " 11|set|(|g|)|;\n" + + " 9|public| |X|(|String| |g|)| |{\n" + ""); } @@ -354,9 +354,9 @@ public class SliceTreeTest extends SliceTestCase { checkStructure(newRoot, "Null Values\n" + " Value: null\n" + - " (2: 10) |String| |l|;\n" + - " (4: 9) |l| |=| |null|;\n" + - " (7: 9) |l| |=| |null|;\n" + + " 2|String| |l|;\n" + + " 4|l| |=| |null|;\n" + + " 7|l| |=| |null|;\n" + "" ); }