From dbb2772ed8af81e0356a8da91f0bcf10a2fc92bc Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Wed, 16 Sep 2015 12:47:45 -0700
Subject: [PATCH] Tests when the .ts and .js files are mixed in compilation
 with tscconfig file specifying them

---
 ...jsFileCompilationDifferentNamesSpecified.json | 16 ++++++++++++++++
 .../amd/test.d.ts                                |  2 ++
 .../amd/test.js                                  |  2 ++
 ...jsFileCompilationDifferentNamesSpecified.json | 16 ++++++++++++++++
 .../node/test.d.ts                               |  2 ++
 .../node/test.js                                 |  2 ++
 ...jsFileCompilationDifferentNamesSpecified.json |  7 +++++++
 .../DifferentNamesSpecified/a.ts                 |  1 +
 .../DifferentNamesSpecified/b.js                 |  1 +
 .../DifferentNamesSpecified/tsconfig.json        |  4 ++++
 10 files changed, 53 insertions(+)
 create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.json
 create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.d.ts
 create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.js
 create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.json
 create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.d.ts
 create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.js
 create mode 100644 tests/cases/project/jsFileCompilationDifferentNamesSpecified.json
 create mode 100644 tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/a.ts
 create mode 100644 tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/b.js
 create mode 100644 tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/tsconfig.json

diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.json
new file mode 100644
index 00000000000..0ba5af91d21
--- /dev/null
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.json
@@ -0,0 +1,16 @@
+{
+    "scenario": "Verify when same named .ts and .js file exists in the folder but .ts file is specified in tsconfig.json",
+    "projectRoot": "tests/cases/projects/jsFileCompilation",
+    "baselineCheck": true,
+    "declaration": true,
+    "project": "DifferentNamesSpecified",
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "DifferentNamesSpecified/a.ts",
+        "DifferentNamesSpecified/b.js"
+    ],
+    "emittedFiles": [
+        "test.js",
+        "test.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.d.ts
new file mode 100644
index 00000000000..bbae04a30bf
--- /dev/null
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.d.ts
@@ -0,0 +1,2 @@
+declare var test: number;
+declare var test2: number;
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.js
new file mode 100644
index 00000000000..f2115703462
--- /dev/null
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.js
@@ -0,0 +1,2 @@
+var test = 10;
+var test2 = 10; // Should get compiled
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.json
new file mode 100644
index 00000000000..0ba5af91d21
--- /dev/null
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.json
@@ -0,0 +1,16 @@
+{
+    "scenario": "Verify when same named .ts and .js file exists in the folder but .ts file is specified in tsconfig.json",
+    "projectRoot": "tests/cases/projects/jsFileCompilation",
+    "baselineCheck": true,
+    "declaration": true,
+    "project": "DifferentNamesSpecified",
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "DifferentNamesSpecified/a.ts",
+        "DifferentNamesSpecified/b.js"
+    ],
+    "emittedFiles": [
+        "test.js",
+        "test.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.d.ts
new file mode 100644
index 00000000000..bbae04a30bf
--- /dev/null
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.d.ts
@@ -0,0 +1,2 @@
+declare var test: number;
+declare var test2: number;
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.js
new file mode 100644
index 00000000000..f2115703462
--- /dev/null
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.js
@@ -0,0 +1,2 @@
+var test = 10;
+var test2 = 10; // Should get compiled
diff --git a/tests/cases/project/jsFileCompilationDifferentNamesSpecified.json b/tests/cases/project/jsFileCompilationDifferentNamesSpecified.json
new file mode 100644
index 00000000000..d23706bab94
--- /dev/null
+++ b/tests/cases/project/jsFileCompilationDifferentNamesSpecified.json
@@ -0,0 +1,7 @@
+{
+  "scenario": "Verify when same named .ts and .js file exists in the folder but .ts file is specified in tsconfig.json",
+  "projectRoot": "tests/cases/projects/jsFileCompilation",
+  "baselineCheck": true,
+  "declaration": true,
+  "project": "DifferentNamesSpecified"
+}
\ No newline at end of file
diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/a.ts b/tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/a.ts
new file mode 100644
index 00000000000..6d820a0093e
--- /dev/null
+++ b/tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/a.ts
@@ -0,0 +1 @@
+var test = 10;
\ No newline at end of file
diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/b.js b/tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/b.js
new file mode 100644
index 00000000000..9fdf6253b80
--- /dev/null
+++ b/tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/b.js
@@ -0,0 +1 @@
+var test2 = 10; // Should get compiled
\ No newline at end of file
diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/tsconfig.json b/tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/tsconfig.json
new file mode 100644
index 00000000000..582826bdceb
--- /dev/null
+++ b/tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "compilerOptions": { "out": "test.js" },
+  "files": [ "a.ts", "b.js" ]
+}
\ No newline at end of file