From cd7f0ec05ca1eae12ac2a4667c5354eb4588e9e8 Mon Sep 17 00:00:00 2001 From: "Maxim.Medvedev" Date: Tue, 1 Nov 2011 12:11:28 +0400 Subject: [PATCH] fix tests --- .../convertToJava/FileGenerationTest.groovy | 22 +++++++++---------- .../highlighting/SlashyStrings.groovy | 4 ++-- .../file/dynamicMethodsAccess.java | 2 +- .../convertGroovyToJava/file/field.java | 16 +++++++------- 4 files changed, 21 insertions(+), 23 deletions(-) diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/convertToJava/FileGenerationTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/convertToJava/FileGenerationTest.groovy index e38ea2baa44a..38e9795aa04d 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/convertToJava/FileGenerationTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/convertToJava/FileGenerationTest.groovy @@ -30,6 +30,16 @@ class FileGenerationTest extends LightGroovyTestCase { } private void doTest() { + myFixture.addClass("""package java.util; + +public class LinkedHashMap extends HashMap implements Map { + public LinkedHashMap(int initialCapacity, float loadFactor) {} + public LinkedHashMap(int initialCapacity) {} + public LinkedHashMap() {} + public LinkedHashMap(Map m) {} + public LinkedHashMap(int initialCapacity, float loadFactor, boolean accessOrder) {} +}""") + final String testName = getTestName(true) final PsiFile file = myFixture.configureByFile("${testName}.groovy"); assertInstanceOf file, GroovyFile @@ -39,18 +49,6 @@ class FileGenerationTest extends LightGroovyTestCase { myFixture.checkResultByFile("${testName}.java") } - def length - @Override - protected void setUp() { - super.setUp() - length = System.currentTimeMillis() - } - - @Override - protected void tearDown() { - super.tearDown() - } - void testEnum() {doTest()} void testGrScript() {doTest()} diff --git a/plugins/groovy/testdata/highlighting/SlashyStrings.groovy b/plugins/groovy/testdata/highlighting/SlashyStrings.groovy index dd38683c28f0..b5d4295aaeb3 100644 --- a/plugins/groovy/testdata/highlighting/SlashyStrings.groovy +++ b/plugins/groovy/testdata/highlighting/SlashyStrings.groovy @@ -2,7 +2,7 @@ print (/abc/) print (/ab c/) -print (/abc${false}def/) +print (/abc${false}def/) -print (/abc${false}d +print (/abc${false}d ef/) \ No newline at end of file diff --git a/plugins/groovy/testdata/refactoring/convertGroovyToJava/file/dynamicMethodsAccess.java b/plugins/groovy/testdata/refactoring/convertGroovyToJava/file/dynamicMethodsAccess.java index 37da97df6f28..71865d71fd0f 100644 --- a/plugins/groovy/testdata/refactoring/convertGroovyToJava/file/dynamicMethodsAccess.java +++ b/plugins/groovy/testdata/refactoring/convertGroovyToJava/file/dynamicMethodsAccess.java @@ -1,7 +1,7 @@ public class Abc extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject { public java.lang.Object foo() { invokeMethod("bar", new java.lang.Object[]{2}); -java.util.Map map = new java.util.LinkedHashMap(1); +java.util.LinkedHashMap map = new java.util.LinkedHashMap(1); map.put("s", 4); org.codehaus.groovy.runtime.DefaultGroovyMethods.print(Abc.this, invokeMethod("bar", new java.lang.Object[]{map, 3})); java.lang.String s = "a"; diff --git a/plugins/groovy/testdata/refactoring/convertGroovyToJava/file/field.java b/plugins/groovy/testdata/refactoring/convertGroovyToJava/file/field.java index c8c84edb5f22..8776e76f1711 100644 --- a/plugins/groovy/testdata/refactoring/convertGroovyToJava/file/field.java +++ b/plugins/groovy/testdata/refactoring/convertGroovyToJava/file/field.java @@ -1,8 +1,8 @@ public class X extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject { -public java.util.Map getField() { +public java.util.LinkedHashMap getField() { return field; } -public void setField(java.util.Map field) { +public void setField(java.util.LinkedHashMap field) { this.field = field; } public java.util.ArrayList getSecond() { @@ -23,10 +23,10 @@ public java.lang.Integer getB() { public void setB(java.lang.Integer b) { this.b = b; } -public java.util.Map getC() { +public java.util.LinkedHashMap getC() { return c; } -public void setC(java.util.Map c) { +public void setC(java.util.LinkedHashMap c) { this.c = c; } public java.lang.Integer getD() { @@ -42,19 +42,19 @@ public void setX(int x) { this.x = x; } { -java.util.Map map = new java.util.Map(2); +java.util.LinkedHashMap map = new java.util.LinkedHashMap(2); map.put("1", 2); map.put("3", 4); field = map;} -private java.util.Map field; +private java.util.LinkedHashMap field; private java.util.ArrayList second = new java.util.ArrayList(java.util.Arrays.asList(1, 2, 3)); private java.lang.Integer a = 5; private java.lang.Integer b = 3; { -java.util.Map map = new java.util.Map(1); +java.util.LinkedHashMap map = new java.util.LinkedHashMap(1); map.put("1", 2); c = map;} -private java.util.Map c; +private java.util.LinkedHashMap c; private java.lang.Integer d = 5; private int x; }