fix tests

This commit is contained in:
Maxim.Medvedev
2011-11-01 12:13:44 +04:00
parent 5bd57348f4
commit cd7f0ec05c
4 changed files with 21 additions and 23 deletions
@@ -30,6 +30,16 @@ class FileGenerationTest extends LightGroovyTestCase {
}
private void doTest() {
myFixture.addClass("""package java.util;
public class LinkedHashMap<K,V> extends HashMap<K,V> implements Map<K,V> {
public LinkedHashMap(int initialCapacity, float loadFactor) {}
public LinkedHashMap(int initialCapacity) {}
public LinkedHashMap() {}
public LinkedHashMap(Map<? extends K, ? extends V> 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()}
+2 -2
View File
@@ -2,7 +2,7 @@ print (/abc/)
print (<error descr="Multi-line slashy strings are not allowed in Groovy <no version>">/ab
c/</error>)
print (<error descr="Slashy strings with injetcions are not allowd in Groovy <no version>">/abc${false}def/</error>)
print (<error descr="Slashy strings with injections are not allowed in Groovy <no version>">/abc${false}def/</error>)
print (<error descr="Slashy strings with injetcions are not allowd in Groovy <no version>">/abc${false}d
print (<error descr="Slashy strings with injections are not allowed in Groovy <no version>">/abc${false}d
ef/</error>)
@@ -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<java.lang.String, java.lang.Integer> map = new java.util.LinkedHashMap<java.lang.String, java.lang.Integer>(1);
java.util.LinkedHashMap<java.lang.String, java.lang.Integer> map = new java.util.LinkedHashMap<java.lang.String, java.lang.Integer>(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";
@@ -1,8 +1,8 @@
public class X extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
public java.util.Map<java.lang.String, java.lang.Integer> getField() {
public java.util.LinkedHashMap<java.lang.String, java.lang.Integer> getField() {
return field;
}
public void setField(java.util.Map<java.lang.String, java.lang.Integer> field) {
public void setField(java.util.LinkedHashMap<java.lang.String, java.lang.Integer> field) {
this.field = field;
}
public java.util.ArrayList<java.lang.Integer> getSecond() {
@@ -23,10 +23,10 @@ public java.lang.Integer getB() {
public void setB(java.lang.Integer b) {
this.b = b;
}
public java.util.Map<java.lang.String, java.lang.Integer> getC() {
public java.util.LinkedHashMap<java.lang.String, java.lang.Integer> getC() {
return c;
}
public void setC(java.util.Map<java.lang.String, java.lang.Integer> c) {
public void setC(java.util.LinkedHashMap<java.lang.String, java.lang.Integer> c) {
this.c = c;
}
public java.lang.Integer getD() {
@@ -42,19 +42,19 @@ public void setX(int x) {
this.x = x;
}
{
java.util.Map<java.lang.String, java.lang.Integer> map = new java.util.Map<java.lang.String, java.lang.Integer>(2);
java.util.LinkedHashMap<java.lang.String, java.lang.Integer> map = new java.util.LinkedHashMap<java.lang.String, java.lang.Integer>(2);
map.put("1", 2);
map.put("3", 4);
field = map;}
private java.util.Map<java.lang.String, java.lang.Integer> field;
private java.util.LinkedHashMap<java.lang.String, java.lang.Integer> field;
private java.util.ArrayList<java.lang.Integer> second = new java.util.ArrayList<java.lang.Integer>(java.util.Arrays.asList(1, 2, 3));
private java.lang.Integer a = 5;
private java.lang.Integer b = 3;
{
java.util.Map<java.lang.String, java.lang.Integer> map = new java.util.Map<java.lang.String, java.lang.Integer>(1);
java.util.LinkedHashMap<java.lang.String, java.lang.Integer> map = new java.util.LinkedHashMap<java.lang.String, java.lang.Integer>(1);
map.put("1", 2);
c = map;}
private java.util.Map<java.lang.String, java.lang.Integer> c;
private java.util.LinkedHashMap<java.lang.String, java.lang.Integer> c;
private java.lang.Integer d = 5;
private int x;
}