Generate all surround with tests to one file

2013-02-15 16:30:06 +04:00
parent 7c360a0ede
commit 9bbfc788ea
12 changed files with 314 additions and 629 deletions
@@ -225,71 +225,17 @@ public class GenerateTests {

        generateTest(
                "idea/tests/",
-                "SurroundWithIfTestGenerated",
-                AbstractSurroundWithTest.class,
-                testModel("idea/testData/codeInsight/surroundWith/if", "doTestWithIfSurrounder")
-        );
-
-        generateTest(
-                "idea/tests/",
-                "SurroundWithIfElseTestGenerated",
-                AbstractSurroundWithTest.class,
-                testModel("idea/testData/codeInsight/surroundWith/ifElse", "doTestWithIfElseSurrounder")
-        );
-
-        generateTest(
-                "idea/tests/",
-                "SurroundWithNotTestGenerated",
-                AbstractSurroundWithTest.class,
-                testModel("idea/testData/codeInsight/surroundWith/not", "doTestWithNotSurrounder")
-        );
-
-        generateTest(
-                "idea/tests/",
-                "SurroundWithParenthesesTestGenerated",
-                AbstractSurroundWithTest.class,
-                testModel("idea/testData/codeInsight/surroundWith/parentheses", "doTestWithParenthesesSurrounder")
-        );
-
-        generateTest(
-                "idea/tests/",
-                "SurroundWithStringTemplateTestGenerated",
-                AbstractSurroundWithTest.class,
-                testModel("idea/testData/codeInsight/surroundWith/stringTemplate", "doTestWithStringTemplateSurrounder")
-        );
-
-        generateTest(
-                "idea/tests/",
-                "SurroundWithWhenTestGenerated",
-                AbstractSurroundWithTest.class,
-                testModel("idea/testData/codeInsight/surroundWith/when", "doTestWithWhenSurrounder")
-        );
-
-        generateTest(
-                "idea/tests/",
-                "SurroundWithTryCatchTestGenerated",
-                AbstractSurroundWithTest.class,
-                testModel("idea/testData/codeInsight/surroundWith/tryCatch", "doTestWithTryCatchSurrounder")
-        );
-
-        generateTest(
-                "idea/tests/",
-                "SurroundWithTryCatchFinallyTestGenerated",
-                AbstractSurroundWithTest.class,
-                testModel("idea/testData/codeInsight/surroundWith/tryCatchFinally", "doTestWithTryCatchFinallySurrounder")
-        );
-
-        generateTest(
-                "idea/tests/",
-                "SurroundWithTryFinallyTestGenerated",
-                AbstractSurroundWithTest.class,
-                testModel("idea/testData/codeInsight/surroundWith/tryFinally", "doTestWithTryFinallySurrounder")
-        );
-
-        generateTest(
-                "idea/tests/",
-                "SurroundWithFunctionLiteralTestGenerated",
+                "SurroundWithTestGenerated",
                AbstractSurroundWithTest.class,
+                testModel("idea/testData/codeInsight/surroundWith/if", "doTestWithIfSurrounder"),
+                testModel("idea/testData/codeInsight/surroundWith/ifElse", "doTestWithIfElseSurrounder"),
+                testModel("idea/testData/codeInsight/surroundWith/not", "doTestWithNotSurrounder"),
+                testModel("idea/testData/codeInsight/surroundWith/parentheses", "doTestWithParenthesesSurrounder"),
+                testModel("idea/testData/codeInsight/surroundWith/stringTemplate", "doTestWithStringTemplateSurrounder"),
+                testModel("idea/testData/codeInsight/surroundWith/when", "doTestWithWhenSurrounder"),
+                testModel("idea/testData/codeInsight/surroundWith/tryCatch", "doTestWithTryCatchSurrounder"),
+                testModel("idea/testData/codeInsight/surroundWith/tryCatchFinally", "doTestWithTryCatchFinallySurrounder"),
+                testModel("idea/testData/codeInsight/surroundWith/tryFinally", "doTestWithTryFinallySurrounder"),
                testModel("idea/testData/codeInsight/surroundWith/functionLiteral", "doTestWithFunctionLiteralSurrounder")
        );
    }
@@ -1,49 +0,0 @@
-/*
- * Copyright 2010-2013 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.plugin.codeInsight.surroundWith;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import java.io.File;
-import java.util.regex.Pattern;
-import org.jetbrains.jet.JetTestUtils;
-import org.jetbrains.jet.test.InnerTestClasses;
-import org.jetbrains.jet.test.TestMetadata;
-
-import org.jetbrains.jet.plugin.codeInsight.surroundWith.AbstractSurroundWithTest;
-
-/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("idea/testData/codeInsight/surroundWith/functionLiteral")
-public class SurroundWithFunctionLiteralTestGenerated extends AbstractSurroundWithTest {
-    public void testAllFilesPresentInFunctionLiteral() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/surroundWith/functionLiteral"), Pattern.compile("^(.+)\\.kt$"), true);
-    }
-    
-    @TestMetadata("multiStatement.kt")
-    public void testMultiStatement() throws Exception {
-        doTestWithFunctionLiteralSurrounder("idea/testData/codeInsight/surroundWith/functionLiteral/multiStatement.kt");
-    }
-    
-    @TestMetadata("singleStatement.kt")
-    public void testSingleStatement() throws Exception {
-        doTestWithFunctionLiteralSurrounder("idea/testData/codeInsight/surroundWith/functionLiteral/singleStatement.kt");
-    }
-    
-}
@@ -1,64 +0,0 @@
-/*
- * Copyright 2010-2013 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.plugin.codeInsight.surroundWith;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import java.io.File;
-import java.util.regex.Pattern;
-import org.jetbrains.jet.JetTestUtils;
-import org.jetbrains.jet.test.InnerTestClasses;
-import org.jetbrains.jet.test.TestMetadata;
-
-import org.jetbrains.jet.plugin.codeInsight.surroundWith.AbstractSurroundWithTest;
-
-/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("idea/testData/codeInsight/surroundWith/ifElse")
-public class SurroundWithIfElseTestGenerated extends AbstractSurroundWithTest {
-    public void testAllFilesPresentInIfElse() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/surroundWith/ifElse"), Pattern.compile("^(.+)\\.kt$"), true);
-    }
-    
-    @TestMetadata("block.kt")
-    public void testBlock() throws Exception {
-        doTestWithIfElseSurrounder("idea/testData/codeInsight/surroundWith/ifElse/block.kt");
-    }
-    
-    @TestMetadata("severalStatements.kt")
-    public void testSeveralStatements() throws Exception {
-        doTestWithIfElseSurrounder("idea/testData/codeInsight/surroundWith/ifElse/severalStatements.kt");
-    }
-    
-    @TestMetadata("singleStatement.kt")
-    public void testSingleStatement() throws Exception {
-        doTestWithIfElseSurrounder("idea/testData/codeInsight/surroundWith/ifElse/singleStatement.kt");
-    }
-    
-    @TestMetadata("singleStatementAtCaret.kt")
-    public void testSingleStatementAtCaret() throws Exception {
-        doTestWithIfElseSurrounder("idea/testData/codeInsight/surroundWith/ifElse/singleStatementAtCaret.kt");
-    }
-    
-    @TestMetadata("variable.kt")
-    public void testVariable() throws Exception {
-        doTestWithIfElseSurrounder("idea/testData/codeInsight/surroundWith/ifElse/variable.kt");
-    }
-    
-}
@@ -1,64 +0,0 @@
-/*
- * Copyright 2010-2013 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.plugin.codeInsight.surroundWith;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import java.io.File;
-import java.util.regex.Pattern;
-import org.jetbrains.jet.JetTestUtils;
-import org.jetbrains.jet.test.InnerTestClasses;
-import org.jetbrains.jet.test.TestMetadata;
-
-import org.jetbrains.jet.plugin.codeInsight.surroundWith.AbstractSurroundWithTest;
-
-/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("idea/testData/codeInsight/surroundWith/if")
-public class SurroundWithIfTestGenerated extends AbstractSurroundWithTest {
-    public void testAllFilesPresentInIf() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/surroundWith/if"), Pattern.compile("^(.+)\\.kt$"), true);
-    }
-    
-    @TestMetadata("block.kt")
-    public void testBlock() throws Exception {
-        doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/block.kt");
-    }
-    
-    @TestMetadata("severalStatements.kt")
-    public void testSeveralStatements() throws Exception {
-        doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/severalStatements.kt");
-    }
-    
-    @TestMetadata("singleStatement.kt")
-    public void testSingleStatement() throws Exception {
-        doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/singleStatement.kt");
-    }
-    
-    @TestMetadata("singleStatementAtCaret.kt")
-    public void testSingleStatementAtCaret() throws Exception {
-        doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/singleStatementAtCaret.kt");
-    }
-    
-    @TestMetadata("variable.kt")
-    public void testVariable() throws Exception {
-        doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/variable.kt");
-    }
-    
-}
@@ -1,74 +0,0 @@
-/*
- * Copyright 2010-2013 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.plugin.codeInsight.surroundWith;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import java.io.File;
-import java.util.regex.Pattern;
-import org.jetbrains.jet.JetTestUtils;
-import org.jetbrains.jet.test.InnerTestClasses;
-import org.jetbrains.jet.test.TestMetadata;
-
-import org.jetbrains.jet.plugin.codeInsight.surroundWith.AbstractSurroundWithTest;
-
-/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("idea/testData/codeInsight/surroundWith/not")
-public class SurroundWithNotTestGenerated extends AbstractSurroundWithTest {
-    public void testAllFilesPresentInNot() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/surroundWith/not"), Pattern.compile("^(.+)\\.kt$"), true);
-    }
-    
-    @TestMetadata("booleanExpr.kt")
-    public void testBooleanExpr() throws Exception {
-        doTestWithNotSurrounder("idea/testData/codeInsight/surroundWith/not/booleanExpr.kt");
-    }
-    
-    @TestMetadata("booleanExprAtCaret.kt")
-    public void testBooleanExprAtCaret() throws Exception {
-        doTestWithNotSurrounder("idea/testData/codeInsight/surroundWith/not/booleanExprAtCaret.kt");
-    }
-    
-    @TestMetadata("expressionInIf.kt")
-    public void testExpressionInIf() throws Exception {
-        doTestWithNotSurrounder("idea/testData/codeInsight/surroundWith/not/expressionInIf.kt");
-    }
-    
-    @TestMetadata("notExpression.kt")
-    public void testNotExpression() throws Exception {
-        doTestWithNotSurrounder("idea/testData/codeInsight/surroundWith/not/notExpression.kt");
-    }
-    
-    @TestMetadata("severalExpr.kt")
-    public void testSeveralExpr() throws Exception {
-        doTestWithNotSurrounder("idea/testData/codeInsight/surroundWith/not/severalExpr.kt");
-    }
-    
-    @TestMetadata("severalExprAtCaret.kt")
-    public void testSeveralExprAtCaret() throws Exception {
-        doTestWithNotSurrounder("idea/testData/codeInsight/surroundWith/not/severalExprAtCaret.kt");
-    }
-    
-    @TestMetadata("variable.kt")
-    public void testVariable() throws Exception {
-        doTestWithNotSurrounder("idea/testData/codeInsight/surroundWith/not/variable.kt");
-    }
-    
-}
@@ -1,54 +0,0 @@
-/*
- * Copyright 2010-2013 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.plugin.codeInsight.surroundWith;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import java.io.File;
-import java.util.regex.Pattern;
-import org.jetbrains.jet.JetTestUtils;
-import org.jetbrains.jet.test.InnerTestClasses;
-import org.jetbrains.jet.test.TestMetadata;
-
-import org.jetbrains.jet.plugin.codeInsight.surroundWith.AbstractSurroundWithTest;
-
-/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("idea/testData/codeInsight/surroundWith/parentheses")
-public class SurroundWithParenthesesTestGenerated extends AbstractSurroundWithTest {
-    public void testAllFilesPresentInParentheses() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/surroundWith/parentheses"), Pattern.compile("^(.+)\\.kt$"), true);
-    }
-    
-    @TestMetadata("expr.kt")
-    public void testExpr() throws Exception {
-        doTestWithParenthesesSurrounder("idea/testData/codeInsight/surroundWith/parentheses/expr.kt");
-    }
-    
-    @TestMetadata("inIf.kt")
-    public void testInIf() throws Exception {
-        doTestWithParenthesesSurrounder("idea/testData/codeInsight/surroundWith/parentheses/inIf.kt");
-    }
-    
-    @TestMetadata("partOfExpr.kt")
-    public void testPartOfExpr() throws Exception {
-        doTestWithParenthesesSurrounder("idea/testData/codeInsight/surroundWith/parentheses/partOfExpr.kt");
-    }
-    
-}
@@ -1,59 +0,0 @@
-/*
- * Copyright 2010-2013 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.plugin.codeInsight.surroundWith;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import java.io.File;
-import java.util.regex.Pattern;
-import org.jetbrains.jet.JetTestUtils;
-import org.jetbrains.jet.test.InnerTestClasses;
-import org.jetbrains.jet.test.TestMetadata;
-
-import org.jetbrains.jet.plugin.codeInsight.surroundWith.AbstractSurroundWithTest;
-
-/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("idea/testData/codeInsight/surroundWith/stringTemplate")
-public class SurroundWithStringTemplateTestGenerated extends AbstractSurroundWithTest {
-    public void testAllFilesPresentInStringTemplate() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/surroundWith/stringTemplate"), Pattern.compile("^(.+)\\.kt$"), true);
-    }
-    
-    @TestMetadata("multiExpression.kt")
-    public void testMultiExpression() throws Exception {
-        doTestWithStringTemplateSurrounder("idea/testData/codeInsight/surroundWith/stringTemplate/multiExpression.kt");
-    }
-    
-    @TestMetadata("multiExpressionConstant.kt")
-    public void testMultiExpressionConstant() throws Exception {
-        doTestWithStringTemplateSurrounder("idea/testData/codeInsight/surroundWith/stringTemplate/multiExpressionConstant.kt");
-    }
-    
-    @TestMetadata("singleConstant.kt")
-    public void testSingleConstant() throws Exception {
-        doTestWithStringTemplateSurrounder("idea/testData/codeInsight/surroundWith/stringTemplate/singleConstant.kt");
-    }
-    
-    @TestMetadata("singleExpression.kt")
-    public void testSingleExpression() throws Exception {
-        doTestWithStringTemplateSurrounder("idea/testData/codeInsight/surroundWith/stringTemplate/singleExpression.kt");
-    }
-    
-}
@@ -0,0 +1,304 @@
+/*
+ * Copyright 2010-2013 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.plugin.codeInsight.surroundWith;
+
+import junit.framework.Assert;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import java.io.File;
+import java.util.regex.Pattern;
+import org.jetbrains.jet.JetTestUtils;
+import org.jetbrains.jet.test.InnerTestClasses;
+import org.jetbrains.jet.test.TestMetadata;
+
+import org.jetbrains.jet.plugin.codeInsight.surroundWith.AbstractSurroundWithTest;
+
+/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */
+@SuppressWarnings("all")
+@InnerTestClasses({SurroundWithTestGenerated.If.class, SurroundWithTestGenerated.IfElse.class, SurroundWithTestGenerated.Not.class, SurroundWithTestGenerated.Parentheses.class, SurroundWithTestGenerated.StringTemplate.class, SurroundWithTestGenerated.When.class, SurroundWithTestGenerated.TryCatch.class, SurroundWithTestGenerated.TryCatchFinally.class, SurroundWithTestGenerated.TryFinally.class, SurroundWithTestGenerated.FunctionLiteral.class})
+public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
+    @TestMetadata("idea/testData/codeInsight/surroundWith/if")
+    public static class If extends AbstractSurroundWithTest {
+        public void testAllFilesPresentInIf() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/surroundWith/if"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+        
+        @TestMetadata("block.kt")
+        public void testBlock() throws Exception {
+            doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/block.kt");
+        }
+        
+        @TestMetadata("severalStatements.kt")
+        public void testSeveralStatements() throws Exception {
+            doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/severalStatements.kt");
+        }
+        
+        @TestMetadata("singleStatement.kt")
+        public void testSingleStatement() throws Exception {
+            doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/singleStatement.kt");
+        }
+        
+        @TestMetadata("singleStatementAtCaret.kt")
+        public void testSingleStatementAtCaret() throws Exception {
+            doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/singleStatementAtCaret.kt");
+        }
+        
+        @TestMetadata("variable.kt")
+        public void testVariable() throws Exception {
+            doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/variable.kt");
+        }
+        
+    }
+    
+    @TestMetadata("idea/testData/codeInsight/surroundWith/ifElse")
+    public static class IfElse extends AbstractSurroundWithTest {
+        public void testAllFilesPresentInIfElse() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/surroundWith/ifElse"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+        
+        @TestMetadata("block.kt")
+        public void testBlock() throws Exception {
+            doTestWithIfElseSurrounder("idea/testData/codeInsight/surroundWith/ifElse/block.kt");
+        }
+        
+        @TestMetadata("severalStatements.kt")
+        public void testSeveralStatements() throws Exception {
+            doTestWithIfElseSurrounder("idea/testData/codeInsight/surroundWith/ifElse/severalStatements.kt");
+        }
+        
+        @TestMetadata("singleStatement.kt")
+        public void testSingleStatement() throws Exception {
+            doTestWithIfElseSurrounder("idea/testData/codeInsight/surroundWith/ifElse/singleStatement.kt");
+        }
+        
+        @TestMetadata("singleStatementAtCaret.kt")
+        public void testSingleStatementAtCaret() throws Exception {
+            doTestWithIfElseSurrounder("idea/testData/codeInsight/surroundWith/ifElse/singleStatementAtCaret.kt");
+        }
+        
+        @TestMetadata("variable.kt")
+        public void testVariable() throws Exception {
+            doTestWithIfElseSurrounder("idea/testData/codeInsight/surroundWith/ifElse/variable.kt");
+        }
+        
+    }
+    
+    @TestMetadata("idea/testData/codeInsight/surroundWith/not")
+    public static class Not extends AbstractSurroundWithTest {
+        public void testAllFilesPresentInNot() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/surroundWith/not"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+        
+        @TestMetadata("booleanExpr.kt")
+        public void testBooleanExpr() throws Exception {
+            doTestWithNotSurrounder("idea/testData/codeInsight/surroundWith/not/booleanExpr.kt");
+        }
+        
+        @TestMetadata("booleanExprAtCaret.kt")
+        public void testBooleanExprAtCaret() throws Exception {
+            doTestWithNotSurrounder("idea/testData/codeInsight/surroundWith/not/booleanExprAtCaret.kt");
+        }
+        
+        @TestMetadata("expressionInIf.kt")
+        public void testExpressionInIf() throws Exception {
+            doTestWithNotSurrounder("idea/testData/codeInsight/surroundWith/not/expressionInIf.kt");
+        }
+        
+        @TestMetadata("notExpression.kt")
+        public void testNotExpression() throws Exception {
+            doTestWithNotSurrounder("idea/testData/codeInsight/surroundWith/not/notExpression.kt");
+        }
+        
+        @TestMetadata("severalExpr.kt")
+        public void testSeveralExpr() throws Exception {
+            doTestWithNotSurrounder("idea/testData/codeInsight/surroundWith/not/severalExpr.kt");
+        }
+        
+        @TestMetadata("severalExprAtCaret.kt")
+        public void testSeveralExprAtCaret() throws Exception {
+            doTestWithNotSurrounder("idea/testData/codeInsight/surroundWith/not/severalExprAtCaret.kt");
+        }
+        
+        @TestMetadata("variable.kt")
+        public void testVariable() throws Exception {
+            doTestWithNotSurrounder("idea/testData/codeInsight/surroundWith/not/variable.kt");
+        }
+        
+    }
+    
+    @TestMetadata("idea/testData/codeInsight/surroundWith/parentheses")
+    public static class Parentheses extends AbstractSurroundWithTest {
+        public void testAllFilesPresentInParentheses() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/surroundWith/parentheses"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+        
+        @TestMetadata("expr.kt")
+        public void testExpr() throws Exception {
+            doTestWithParenthesesSurrounder("idea/testData/codeInsight/surroundWith/parentheses/expr.kt");
+        }
+        
+        @TestMetadata("inIf.kt")
+        public void testInIf() throws Exception {
+            doTestWithParenthesesSurrounder("idea/testData/codeInsight/surroundWith/parentheses/inIf.kt");
+        }
+        
+        @TestMetadata("partOfExpr.kt")
+        public void testPartOfExpr() throws Exception {
+            doTestWithParenthesesSurrounder("idea/testData/codeInsight/surroundWith/parentheses/partOfExpr.kt");
+        }
+        
+    }
+    
+    @TestMetadata("idea/testData/codeInsight/surroundWith/stringTemplate")
+    public static class StringTemplate extends AbstractSurroundWithTest {
+        public void testAllFilesPresentInStringTemplate() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/surroundWith/stringTemplate"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+        
+        @TestMetadata("multiExpression.kt")
+        public void testMultiExpression() throws Exception {
+            doTestWithStringTemplateSurrounder("idea/testData/codeInsight/surroundWith/stringTemplate/multiExpression.kt");
+        }
+        
+        @TestMetadata("multiExpressionConstant.kt")
+        public void testMultiExpressionConstant() throws Exception {
+            doTestWithStringTemplateSurrounder("idea/testData/codeInsight/surroundWith/stringTemplate/multiExpressionConstant.kt");
+        }
+        
+        @TestMetadata("singleConstant.kt")
+        public void testSingleConstant() throws Exception {
+            doTestWithStringTemplateSurrounder("idea/testData/codeInsight/surroundWith/stringTemplate/singleConstant.kt");
+        }
+        
+        @TestMetadata("singleExpression.kt")
+        public void testSingleExpression() throws Exception {
+            doTestWithStringTemplateSurrounder("idea/testData/codeInsight/surroundWith/stringTemplate/singleExpression.kt");
+        }
+        
+    }
+    
+    @TestMetadata("idea/testData/codeInsight/surroundWith/when")
+    public static class When extends AbstractSurroundWithTest {
+        public void testAllFilesPresentInWhen() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/surroundWith/when"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+        
+        @TestMetadata("enum.kt")
+        public void testEnum() throws Exception {
+            doTestWithWhenSurrounder("idea/testData/codeInsight/surroundWith/when/enum.kt");
+        }
+        
+        @TestMetadata("multiExpression.kt")
+        public void testMultiExpression() throws Exception {
+            doTestWithWhenSurrounder("idea/testData/codeInsight/surroundWith/when/multiExpression.kt");
+        }
+        
+        @TestMetadata("singleExpression.kt")
+        public void testSingleExpression() throws Exception {
+            doTestWithWhenSurrounder("idea/testData/codeInsight/surroundWith/when/singleExpression.kt");
+        }
+        
+    }
+    
+    @TestMetadata("idea/testData/codeInsight/surroundWith/tryCatch")
+    public static class TryCatch extends AbstractSurroundWithTest {
+        public void testAllFilesPresentInTryCatch() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/surroundWith/tryCatch"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+        
+        @TestMetadata("multiExpression.kt")
+        public void testMultiExpression() throws Exception {
+            doTestWithTryCatchSurrounder("idea/testData/codeInsight/surroundWith/tryCatch/multiExpression.kt");
+        }
+        
+        @TestMetadata("singleExpression.kt")
+        public void testSingleExpression() throws Exception {
+            doTestWithTryCatchSurrounder("idea/testData/codeInsight/surroundWith/tryCatch/singleExpression.kt");
+        }
+        
+    }
+    
+    @TestMetadata("idea/testData/codeInsight/surroundWith/tryCatchFinally")
+    public static class TryCatchFinally extends AbstractSurroundWithTest {
+        public void testAllFilesPresentInTryCatchFinally() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/surroundWith/tryCatchFinally"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+        
+        @TestMetadata("multiExpression.kt")
+        public void testMultiExpression() throws Exception {
+            doTestWithTryCatchFinallySurrounder("idea/testData/codeInsight/surroundWith/tryCatchFinally/multiExpression.kt");
+        }
+        
+        @TestMetadata("singleExpression.kt")
+        public void testSingleExpression() throws Exception {
+            doTestWithTryCatchFinallySurrounder("idea/testData/codeInsight/surroundWith/tryCatchFinally/singleExpression.kt");
+        }
+        
+    }
+    
+    @TestMetadata("idea/testData/codeInsight/surroundWith/tryFinally")
+    public static class TryFinally extends AbstractSurroundWithTest {
+        public void testAllFilesPresentInTryFinally() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/surroundWith/tryFinally"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+        
+        @TestMetadata("multiExpression.kt")
+        public void testMultiExpression() throws Exception {
+            doTestWithTryFinallySurrounder("idea/testData/codeInsight/surroundWith/tryFinally/multiExpression.kt");
+        }
+        
+        @TestMetadata("singleExpression.kt")
+        public void testSingleExpression() throws Exception {
+            doTestWithTryFinallySurrounder("idea/testData/codeInsight/surroundWith/tryFinally/singleExpression.kt");
+        }
+        
+    }
+    
+    @TestMetadata("idea/testData/codeInsight/surroundWith/functionLiteral")
+    public static class FunctionLiteral extends AbstractSurroundWithTest {
+        public void testAllFilesPresentInFunctionLiteral() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/surroundWith/functionLiteral"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+        
+        @TestMetadata("multiStatement.kt")
+        public void testMultiStatement() throws Exception {
+            doTestWithFunctionLiteralSurrounder("idea/testData/codeInsight/surroundWith/functionLiteral/multiStatement.kt");
+        }
+        
+        @TestMetadata("singleStatement.kt")
+        public void testSingleStatement() throws Exception {
+            doTestWithFunctionLiteralSurrounder("idea/testData/codeInsight/surroundWith/functionLiteral/singleStatement.kt");
+        }
+        
+    }
+    
+    public static Test suite() {
+        TestSuite suite = new TestSuite("SurroundWithTestGenerated");
+        suite.addTestSuite(If.class);
+        suite.addTestSuite(IfElse.class);
+        suite.addTestSuite(Not.class);
+        suite.addTestSuite(Parentheses.class);
+        suite.addTestSuite(StringTemplate.class);
+        suite.addTestSuite(When.class);
+        suite.addTestSuite(TryCatch.class);
+        suite.addTestSuite(TryCatchFinally.class);
+        suite.addTestSuite(TryFinally.class);
+        suite.addTestSuite(FunctionLiteral.class);
+        return suite;
+    }
+}
@@ -1,49 +0,0 @@
-/*
- * Copyright 2010-2013 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.plugin.codeInsight.surroundWith;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import java.io.File;
-import java.util.regex.Pattern;
-import org.jetbrains.jet.JetTestUtils;
-import org.jetbrains.jet.test.InnerTestClasses;
-import org.jetbrains.jet.test.TestMetadata;
-
-import org.jetbrains.jet.plugin.codeInsight.surroundWith.AbstractSurroundWithTest;
-
-/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("idea/testData/codeInsight/surroundWith/tryCatchFinally")
-public class SurroundWithTryCatchFinallyTestGenerated extends AbstractSurroundWithTest {
-    public void testAllFilesPresentInTryCatchFinally() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/surroundWith/tryCatchFinally"), Pattern.compile("^(.+)\\.kt$"), true);
-    }
-    
-    @TestMetadata("multiExpression.kt")
-    public void testMultiExpression() throws Exception {
-        doTestWithTryCatchFinallySurrounder("idea/testData/codeInsight/surroundWith/tryCatchFinally/multiExpression.kt");
-    }
-    
-    @TestMetadata("singleExpression.kt")
-    public void testSingleExpression() throws Exception {
-        doTestWithTryCatchFinallySurrounder("idea/testData/codeInsight/surroundWith/tryCatchFinally/singleExpression.kt");
-    }
-    
-}
@@ -1,49 +0,0 @@
-/*
- * Copyright 2010-2013 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.plugin.codeInsight.surroundWith;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import java.io.File;
-import java.util.regex.Pattern;
-import org.jetbrains.jet.JetTestUtils;
-import org.jetbrains.jet.test.InnerTestClasses;
-import org.jetbrains.jet.test.TestMetadata;
-
-import org.jetbrains.jet.plugin.codeInsight.surroundWith.AbstractSurroundWithTest;
-
-/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("idea/testData/codeInsight/surroundWith/tryCatch")
-public class SurroundWithTryCatchTestGenerated extends AbstractSurroundWithTest {
-    public void testAllFilesPresentInTryCatch() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/surroundWith/tryCatch"), Pattern.compile("^(.+)\\.kt$"), true);
-    }
-    
-    @TestMetadata("multiExpression.kt")
-    public void testMultiExpression() throws Exception {
-        doTestWithTryCatchSurrounder("idea/testData/codeInsight/surroundWith/tryCatch/multiExpression.kt");
-    }
-    
-    @TestMetadata("singleExpression.kt")
-    public void testSingleExpression() throws Exception {
-        doTestWithTryCatchSurrounder("idea/testData/codeInsight/surroundWith/tryCatch/singleExpression.kt");
-    }
-    
-}
@@ -1,49 +0,0 @@
-/*
- * Copyright 2010-2013 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.plugin.codeInsight.surroundWith;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import java.io.File;
-import java.util.regex.Pattern;
-import org.jetbrains.jet.JetTestUtils;
-import org.jetbrains.jet.test.InnerTestClasses;
-import org.jetbrains.jet.test.TestMetadata;
-
-import org.jetbrains.jet.plugin.codeInsight.surroundWith.AbstractSurroundWithTest;
-
-/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("idea/testData/codeInsight/surroundWith/tryFinally")
-public class SurroundWithTryFinallyTestGenerated extends AbstractSurroundWithTest {
-    public void testAllFilesPresentInTryFinally() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/surroundWith/tryFinally"), Pattern.compile("^(.+)\\.kt$"), true);
-    }
-    
-    @TestMetadata("multiExpression.kt")
-    public void testMultiExpression() throws Exception {
-        doTestWithTryFinallySurrounder("idea/testData/codeInsight/surroundWith/tryFinally/multiExpression.kt");
-    }
-    
-    @TestMetadata("singleExpression.kt")
-    public void testSingleExpression() throws Exception {
-        doTestWithTryFinallySurrounder("idea/testData/codeInsight/surroundWith/tryFinally/singleExpression.kt");
-    }
-    
-}
@@ -1,54 +0,0 @@
-/*
- * Copyright 2010-2013 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.plugin.codeInsight.surroundWith;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import java.io.File;
-import java.util.regex.Pattern;
-import org.jetbrains.jet.JetTestUtils;
-import org.jetbrains.jet.test.InnerTestClasses;
-import org.jetbrains.jet.test.TestMetadata;
-
-import org.jetbrains.jet.plugin.codeInsight.surroundWith.AbstractSurroundWithTest;
-
-/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("idea/testData/codeInsight/surroundWith/when")
-public class SurroundWithWhenTestGenerated extends AbstractSurroundWithTest {
-    public void testAllFilesPresentInWhen() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/surroundWith/when"), Pattern.compile("^(.+)\\.kt$"), true);
-    }
-    
-    @TestMetadata("enum.kt")
-    public void testEnum() throws Exception {
-        doTestWithWhenSurrounder("idea/testData/codeInsight/surroundWith/when/enum.kt");
-    }
-    
-    @TestMetadata("multiExpression.kt")
-    public void testMultiExpression() throws Exception {
-        doTestWithWhenSurrounder("idea/testData/codeInsight/surroundWith/when/multiExpression.kt");
-    }
-    
-    @TestMetadata("singleExpression.kt")
-    public void testSingleExpression() throws Exception {
-        doTestWithWhenSurrounder("idea/testData/codeInsight/surroundWith/when/singleExpression.kt");
-    }
-    
-}