2 files changed, 42 insertions, 36 deletions
diff --git a/cli/tests/unit/write_file_test.ts b/cli/tests/unit/write_file_test.ts
index b46502eef..9cbc0b272 100644
--- a/cli/tests/unit/write_file_test.ts
+++ b/cli/tests/unit/write_file_test.ts
@@ -17,7 +17,7 @@ Deno.test(
     const dataRead = Deno.readFileSync(filename);
     const dec = new TextDecoder("utf-8");
     const actual = dec.decode(dataRead);
-    assertEquals("Hello", actual);
+    assertEquals(actual, "Hello");
   },
 );
 
@@ -34,7 +34,7 @@ Deno.test(
     const dataRead = Deno.readFileSync(fileUrl);
     const dec = new TextDecoder("utf-8");
     const actual = dec.decode(dataRead);
-    assertEquals("Hello", actual);
+    assertEquals(actual, "Hello");
 
     Deno.removeSync(tempDir, { recursive: true });
   },
@@ -92,7 +92,7 @@ Deno.test(
     const dataRead = Deno.readFileSync(filename);
     const dec = new TextDecoder("utf-8");
     const actual = dec.decode(dataRead);
-    assertEquals("Hello", actual);
+    assertEquals(actual, "Hello");
   },
 );
 
@@ -107,17 +107,17 @@ Deno.test(
     let dataRead = Deno.readFileSync(filename);
     const dec = new TextDecoder("utf-8");
     let actual = dec.decode(dataRead);
-    assertEquals("HelloHello", actual);
+    assertEquals(actual, "HelloHello");
     // Now attempt overwrite
     Deno.writeFileSync(filename, data, { append: false });
     dataRead = Deno.readFileSync(filename);
     actual = dec.decode(dataRead);
-    assertEquals("Hello", actual);
+    assertEquals(actual, "Hello");
     // append not set should also overwrite
     Deno.writeFileSync(filename, data);
     dataRead = Deno.readFileSync(filename);
     actual = dec.decode(dataRead);
-    assertEquals("Hello", actual);
+    assertEquals(actual, "Hello");
   },
 );
 
@@ -131,7 +131,7 @@ Deno.test(
     const dataRead = Deno.readFileSync(filename);
     const dec = new TextDecoder("utf-8");
     const actual = dec.decode(dataRead);
-    assertEquals("Hello", actual);
+    assertEquals(actual, "Hello");
   },
 );
 
@@ -148,7 +148,7 @@ Deno.test(
     const dataRead = Deno.readFileSync(fileUrl);
     const dec = new TextDecoder("utf-8");
     const actual = dec.decode(dataRead);
-    assertEquals("Hello", actual);
+    assertEquals(actual, "Hello");
 
     Deno.removeSync(tempDir, { recursive: true });
   },
@@ -212,7 +212,7 @@ Deno.test(
     const dataRead = Deno.readFileSync(filename);
     const dec = new TextDecoder("utf-8");
     const actual = dec.decode(dataRead);
-    assertEquals("Hello", actual);
+    assertEquals(actual, "Hello");
   },
 );
 
@@ -227,17 +227,17 @@ Deno.test(
     let dataRead = Deno.readFileSync(filename);
     const dec = new TextDecoder("utf-8");
     let actual = dec.decode(dataRead);
-    assertEquals("HelloHello", actual);
+    assertEquals(actual, "HelloHello");
     // Now attempt overwrite
     await Deno.writeFile(filename, data, { append: false });
     dataRead = Deno.readFileSync(filename);
     actual = dec.decode(dataRead);
-    assertEquals("Hello", actual);
+    assertEquals(actual, "Hello");
     // append not set should also overwrite
     await Deno.writeFile(filename, data);
     dataRead = Deno.readFileSync(filename);
     actual = dec.decode(dataRead);
-    assertEquals("Hello", actual);
+    assertEquals(actual, "Hello");
   },
 );
 
@@ -256,8 +256,6 @@ Deno.test(
       assert(e instanceof Error);
       assertEquals(e.name, "AbortError");
     }
-    const stat = Deno.statSync(filename);
-    assertEquals(stat.size, 0);
   },
 );
 
@@ -276,8 +274,6 @@ Deno.test(
     } catch (e) {
       assertEquals(e, abortReason);
     }
-    const stat = Deno.statSync(filename);
-    assertEquals(stat.size, 0);
   },
 );
 
@@ -295,8 +291,6 @@ Deno.test(
     } catch (e) {
       assertEquals(e, "Some string");
     }
-    const stat = Deno.statSync(filename);
-    assertEquals(stat.size, 0);
   },
 );
 
@@ -315,8 +309,7 @@ Deno.test(
       assert(e instanceof Error);
       assertEquals(e.name, "AbortError");
     }
-    const stat = Deno.statSync(filename);
-    assertEquals(stat.size, 0);
+    assertNotExists(filename);
   },
 );
 
@@ -335,8 +328,7 @@ Deno.test(
     } catch (e) {
       assertEquals(e, abortReason);
     }
-    const stat = Deno.statSync(filename);
-    assertEquals(stat.size, 0);
+    assertNotExists(filename);
   },
 );
 
@@ -356,7 +348,21 @@ Deno.test(
     } catch (e) {
       assertEquals(e, "Some string");
     }
-    const stat = Deno.statSync(filename);
-    assertEquals(stat.size, 0);
+    assertNotExists(filename);
   },
 );
+
+function assertNotExists(filename: string | URL) {
+  if (pathExists(filename)) {
+    throw new Error(`The file ${filename} exists.`);
+  }
+}
+
+function pathExists(path: string | URL) {
+  try {
+    Deno.statSync(path);
+    return true;
+  } catch {
+    return false;
+  }
+}
diff --git a/cli/tests/unit/write_text_file_test.ts b/cli/tests/unit/write_text_file_test.ts
index ed92b0f35..c83534928 100644
--- a/cli/tests/unit/write_text_file_test.ts
+++ b/cli/tests/unit/write_text_file_test.ts
@@ -11,7 +11,7 @@ Deno.test(
     const filename = Deno.makeTempDirSync() + "/test.txt";
     Deno.writeTextFileSync(filename, "Hello");
     const dataRead = Deno.readTextFileSync(filename);
-    assertEquals("Hello", dataRead);
+    assertEquals(dataRead, "Hello");
   },
 );
 
@@ -24,7 +24,7 @@ Deno.test(
     );
     Deno.writeTextFileSync(fileUrl, "Hello");
     const dataRead = Deno.readTextFileSync(fileUrl);
-    assertEquals("Hello", dataRead);
+    assertEquals(dataRead, "Hello");
 
     Deno.removeSync(fileUrl, { recursive: true });
   },
@@ -78,7 +78,7 @@ Deno.test(
     // Turn on create, should have no error
     Deno.writeTextFileSync(filename, data, { create: true });
     Deno.writeTextFileSync(filename, data, { create: false });
-    assertEquals("Hello", Deno.readTextFileSync(filename));
+    assertEquals(Deno.readTextFileSync(filename), "Hello");
   },
 );
 
@@ -89,13 +89,13 @@ Deno.test(
     const filename = Deno.makeTempDirSync() + "/test.txt";
     Deno.writeTextFileSync(filename, data);
     Deno.writeTextFileSync(filename, data, { append: true });
-    assertEquals("HelloHello", Deno.readTextFileSync(filename));
+    assertEquals(Deno.readTextFileSync(filename), "HelloHello");
     // Now attempt overwrite
     Deno.writeTextFileSync(filename, data, { append: false });
-    assertEquals("Hello", Deno.readTextFileSync(filename));
+    assertEquals(Deno.readTextFileSync(filename), "Hello");
     // append not set should also overwrite
     Deno.writeTextFileSync(filename, data);
-    assertEquals("Hello", Deno.readTextFileSync(filename));
+    assertEquals(Deno.readTextFileSync(filename), "Hello");
   },
 );
 
@@ -105,7 +105,7 @@ Deno.test(
     const filename = Deno.makeTempDirSync() + "/test.txt";
     await Deno.writeTextFile(filename, "Hello");
     const dataRead = Deno.readTextFileSync(filename);
-    assertEquals("Hello", dataRead);
+    assertEquals(dataRead, "Hello");
   },
 );
 
@@ -118,7 +118,7 @@ Deno.test(
     );
     await Deno.writeTextFile(fileUrl, "Hello");
     const dataRead = Deno.readTextFileSync(fileUrl);
-    assertEquals("Hello", dataRead);
+    assertEquals(dataRead, "Hello");
 
     Deno.removeSync(fileUrl, { recursive: true });
   },
@@ -178,7 +178,7 @@ Deno.test(
     // Turn on create, should have no error
     await Deno.writeTextFile(filename, data, { create: true });
     await Deno.writeTextFile(filename, data, { create: false });
-    assertEquals("Hello", Deno.readTextFileSync(filename));
+    assertEquals(Deno.readTextFileSync(filename), "Hello");
   },
 );
 
@@ -189,12 +189,12 @@ Deno.test(
     const filename = Deno.makeTempDirSync() + "/test.txt";
     await Deno.writeTextFile(filename, data);
     await Deno.writeTextFile(filename, data, { append: true });
-    assertEquals("HelloHello", Deno.readTextFileSync(filename));
+    assertEquals(Deno.readTextFileSync(filename), "HelloHello");
     // Now attempt overwrite
     await Deno.writeTextFile(filename, data, { append: false });
-    assertEquals("Hello", Deno.readTextFileSync(filename));
+    assertEquals(Deno.readTextFileSync(filename), "Hello");
     // append not set should also overwrite
     await Deno.writeTextFile(filename, data);
-    assertEquals("Hello", Deno.readTextFileSync(filename));
+    assertEquals(Deno.readTextFileSync(filename), "Hello");
   },
 );