From 1c8ca38380ebfee820547bd510c4864adc821a49 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Mon, 13 Feb 2012 21:39:48 +0400
Subject: [PATCH] Added tests for interface and singleton.

---
 idea/testData/templates/interface.exp.kt      |  3 ++
 idea/testData/templates/interface.kt          |  1 +
 idea/testData/templates/singleton.exp.kt      |  3 ++
 idea/testData/templates/singleton.kt          |  1 +
 .../plugin/codeInsight/LiveTemplatesTest.java | 36 +++++++++++++------
 5 files changed, 34 insertions(+), 10 deletions(-)
 create mode 100644 idea/testData/templates/interface.exp.kt
 create mode 100644 idea/testData/templates/interface.kt
 create mode 100644 idea/testData/templates/singleton.exp.kt
 create mode 100644 idea/testData/templates/singleton.kt

diff --git a/idea/testData/templates/interface.exp.kt b/idea/testData/templates/interface.exp.kt
new file mode 100644
index 00000000000..581d785ebb6
--- /dev/null
+++ b/idea/testData/templates/interface.exp.kt
@@ -0,0 +1,3 @@
+trait SomeTrait {
+    <caret>
+}
diff --git a/idea/testData/templates/interface.kt b/idea/testData/templates/interface.kt
new file mode 100644
index 00000000000..81389d50841
--- /dev/null
+++ b/idea/testData/templates/interface.kt
@@ -0,0 +1 @@
+<caret>
\ No newline at end of file
diff --git a/idea/testData/templates/singleton.exp.kt b/idea/testData/templates/singleton.exp.kt
new file mode 100644
index 00000000000..05d8d27dd25
--- /dev/null
+++ b/idea/testData/templates/singleton.exp.kt
@@ -0,0 +1,3 @@
+object MySingleton {
+    <caret>
+}
\ No newline at end of file
diff --git a/idea/testData/templates/singleton.kt b/idea/testData/templates/singleton.kt
new file mode 100644
index 00000000000..81389d50841
--- /dev/null
+++ b/idea/testData/templates/singleton.kt
@@ -0,0 +1 @@
+<caret>
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/LiveTemplatesTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/LiveTemplatesTest.java
index 3379270176c..d0f3a4b3f9b 100644
--- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/LiveTemplatesTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/LiveTemplatesTest.java
@@ -42,7 +42,7 @@ public class LiveTemplatesTest extends LightCodeInsightFixtureTestCase {
         start();
         
         assertStringItems("args", "x", "y");
-        typeAndNext("y");
+        typeAndNextTab("y");
 
         checkAfter();
     }
@@ -81,9 +81,9 @@ public class LiveTemplatesTest extends LightCodeInsightFixtureTestCase {
     public void testExfun() {
         start();
 
-        typeAndNext("Int");
-        typeAndNext("foo");
-        typeAndNext("arg : Int");
+        typeAndNextTab("Int");
+        typeAndNextTab("foo");
+        typeAndNextTab("arg : Int");
         nextTab();
 
         checkAfter();
@@ -92,9 +92,9 @@ public class LiveTemplatesTest extends LightCodeInsightFixtureTestCase {
     public void testExval() {
         start();
 
-        typeAndNext("Int");
+        typeAndNextTab("Int");
         nextTab();
-        typeAndNext("Int");
+        typeAndNextTab("Int");
 
         checkAfter();
     }
@@ -102,9 +102,9 @@ public class LiveTemplatesTest extends LightCodeInsightFixtureTestCase {
     public void testExvar() {
         start();
 
-        typeAndNext("Int");
+        typeAndNextTab("Int");
         nextTab();
-        typeAndNext("Int");
+        typeAndNextTab("Int");
 
         checkAfter();
     }
@@ -112,12 +112,28 @@ public class LiveTemplatesTest extends LightCodeInsightFixtureTestCase {
     public void testClosure() {
         start();
 
-        typeAndNext("param");
+        typeAndNextTab("param");
         nextTab();
 
         checkAfter();
     }
 
+    public void testInterface() {
+        start();
+
+        typeAndNextTab("SomeTrait");
+
+        checkAfter();
+    }
+
+    public void testSingleton() {
+        start();
+
+        typeAndNextTab("MySingleton");
+
+        checkAfter();
+    }
+
     public void testIter() {
         start();
 
@@ -148,7 +164,7 @@ public class LiveTemplatesTest extends LightCodeInsightFixtureTestCase {
         myFixture.checkResultByFile(getTestName(true) + ".exp.kt");
     }
 
-    private void typeAndNext(String s) {
+    private void typeAndNextTab(String s) {
         type(s);
         nextTab();
     }