From 1068890fcd54747594cac2fcfccef39fc55c63ba Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa@umich.edu>
Date: Tue, 23 Jun 2015 10:33:41 -0700
Subject: [PATCH] Moved tests to classAbstractKeyword folder

---
 tests/cases/compiler/abstractClass1.ts        | 36 -------------------
 .../compiler/abstractClassIdentifierName.ts   |  4 ---
 .../classAbstractAsIdentifier.ts              |  5 +++
 .../classAbstractInAModule.ts                 |  7 ++++
 .../classAbstractSuperCalls.ts                |  2 +-
 ...s => classAbstractUsingAbstractMethod1.ts} |  0
 .../classAbstractUsingAbstractMethods2.ts}    |  0
 .../classAbstractWithInterface.ts             |  1 +
 8 files changed, 14 insertions(+), 41 deletions(-)
 delete mode 100644 tests/cases/compiler/abstractClass1.ts
 delete mode 100644 tests/cases/compiler/abstractClassIdentifierName.ts
 create mode 100644 tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAsIdentifier.ts
 create mode 100644 tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInAModule.ts
 rename tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/{classAbstractUsingAbstractMethod.ts => classAbstractUsingAbstractMethod1.ts} (100%)
 rename tests/cases/conformance/classes/classDeclarations/{classWithAbstractMethods.ts => classAbstractKeyword/classAbstractUsingAbstractMethods2.ts} (100%)
 create mode 100644 tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractWithInterface.ts

diff --git a/tests/cases/compiler/abstractClass1.ts b/tests/cases/compiler/abstractClass1.ts
deleted file mode 100644
index 1590ee907f0..00000000000
--- a/tests/cases/compiler/abstractClass1.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-// @declaration: true
-
-abstract class Foo {
-    constructor(f: any) { }
-    public static bar(): void { }
-
-    public empty() { }
-}
-
-class Bar extends Foo {
-    constructor(f: any) {
-        super(f);
-    }
-}
-
-var a = new Foo(1); // Error
-var b = new Foo(); // Error because of invalid constructor arguments
-
-module baz {
-    export abstract class Qux {
-    }
-    export class Quz extends Qux {
-    }
-}
-
-new baz.Qux();
-
-// Valid
-var c = new Bar(1);
-c.empty();
-
-// Calling a static method on a abstract class is valid
-Foo.bar();
-
-var Copy = Foo;
-new Copy();
diff --git a/tests/cases/compiler/abstractClassIdentifierName.ts b/tests/cases/compiler/abstractClassIdentifierName.ts
deleted file mode 100644
index 09d07f16fb8..00000000000
--- a/tests/cases/compiler/abstractClassIdentifierName.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-class abstract {
-
-    abstract(): void { }
-}
diff --git a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAsIdentifier.ts b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAsIdentifier.ts
new file mode 100644
index 00000000000..4c251a03c36
--- /dev/null
+++ b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAsIdentifier.ts
@@ -0,0 +1,5 @@
+class abstract {
+    foo() { return 1; }
+}
+
+new abstract;
\ No newline at end of file
diff --git a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInAModule.ts b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInAModule.ts
new file mode 100644
index 00000000000..f31dd41436e
--- /dev/null
+++ b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInAModule.ts
@@ -0,0 +1,7 @@
+module M {
+    export abstract class A {}
+    export class B extends A {}
+}
+
+new M.A;
+new M.B;
\ No newline at end of file
diff --git a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractSuperCalls.ts b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractSuperCalls.ts
index 90fdc5cc389..e93a670b55f 100644
--- a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractSuperCalls.ts
+++ b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractSuperCalls.ts
@@ -11,7 +11,7 @@ abstract class B extends A {
 
 class C extends B {
     foo() { return 2; }
-    qux() { return super.foo(); } // error, super is abstract
+    qux() { return super.foo() || super.foo; } // 2 errors, foo is abstract
     norf() { return super.bar(); }
 }
 
diff --git a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractUsingAbstractMethod.ts b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractUsingAbstractMethod1.ts
similarity index 100%
rename from tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractUsingAbstractMethod.ts
rename to tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractUsingAbstractMethod1.ts
diff --git a/tests/cases/conformance/classes/classDeclarations/classWithAbstractMethods.ts b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractUsingAbstractMethods2.ts
similarity index 100%
rename from tests/cases/conformance/classes/classDeclarations/classWithAbstractMethods.ts
rename to tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractUsingAbstractMethods2.ts
diff --git a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractWithInterface.ts b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractWithInterface.ts
new file mode 100644
index 00000000000..17b89868943
--- /dev/null
+++ b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractWithInterface.ts
@@ -0,0 +1 @@
+abstract interface I {}
\ No newline at end of file