fix asserts in tests (#107)

So that `actual` and `expected` are in the correct positions.

Author: copperlight

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nflx-spectator",
-  "version": "3.0.15",
+  "version": "3.0.16",
   "license": "Apache-2.0",
   "homepage": "https://github.com/Netflix/spectator-js",
   "author": "Netflix Telemetry Engineering <[email protected]>",

test/common_tags.test.ts

@@ -26,7 +26,7 @@ describe("Common Tags Tests", (): void => {
 
     it("get tags from env vars", (): void => {
         setup_environment();
-        assert.deepEqual(all_expected_tags(), tags_from_env_vars());
+        assert.deepEqual(tags_from_env_vars(), all_expected_tags());
         clear_environment();
     });
 
@@ -36,7 +36,7 @@ describe("Common Tags Tests", (): void => {
 
         const expected_tags: Record<string, string> = all_expected_tags();
         delete expected_tags["nf.container"];
-        assert.deepEqual(expected_tags, tags_from_env_vars());
+        assert.deepEqual(tags_from_env_vars(), expected_tags);
 
         clear_environment();
     });
@@ -47,20 +47,20 @@ describe("Common Tags Tests", (): void => {
 
         const expected_tags: Record<string, string> = all_expected_tags();
         delete expected_tags["nf.container"];
-        assert.deepEqual(expected_tags, tags_from_env_vars());
+        assert.deepEqual(tags_from_env_vars(), expected_tags);
 
         clear_environment();
     });
 
     it("get tags from env vars with whitespace ignored", (): void => {
         setup_environment();
         process.env.TITUS_CONTAINER_NAME = "    main \t\t";
-        assert.deepEqual(all_expected_tags(), tags_from_env_vars());
+        assert.deepEqual(tags_from_env_vars(), all_expected_tags());
         clear_environment();
     });
 
     it("validate tags skips zero length strings", (): void => {
         const tags = {"a": "", "": "b", "cc": "1"};
-        assert.deepEqual({"cc": "1"}, validate_tags(tags));
+        assert.deepEqual(validate_tags(tags), {"cc": "1"});
     });
 });

test/config.test.ts

@@ -32,14 +32,14 @@ describe("Config Tests", (): void => {
         setup_environment();
         const config = new Config();
         assert.deepEqual(all_expected_tags(), config.extra_common_tags);
-        assert.equal("udp", config.location);
+        assert.equal(config.location, "udp");
         clear_environment();
     });
 
     it("env location override", (): void => {
         process.env.SPECTATOR_OUTPUT_LOCATION = "memory";
         const config = new Config();
-        assert.equal("memory", config.location);
+        assert.equal(config.location, "memory");
         clear_environment();
     });
 
@@ -52,19 +52,19 @@ describe("Config Tests", (): void => {
     it("extra common tags", (): void => {
         setup_environment();
         const config = new Config(undefined, {"extra-tag": "foo"});
-        assert.equal("udp", config.location);
-        assert.deepEqual({"extra-tag": "foo", "nf.container": "main", "nf.process": "nodejs"}, config.extra_common_tags);
+        assert.equal(config.location, "udp");
+        assert.deepEqual(config.extra_common_tags, {"extra-tag": "foo", "nf.container": "main", "nf.process": "nodejs"});
         clear_environment();
     });
 
     it("valid output locations", (): void => {
-        assert.equal("none", get_location("none"));
-        assert.equal("memory", get_location("memory"));
-        assert.equal("stderr", get_location("stderr"));
-        assert.equal("stdout", get_location("stdout"));
-        assert.equal("udp", get_location("udp"));
-        assert.equal("file://", get_location("file://"));
-        assert.equal("udp://", get_location("udp://"));
+        assert.equal(get_location("none"), "none");
+        assert.equal(get_location("memory"), "memory");
+        assert.equal(get_location("stderr"), "stderr");
+        assert.equal(get_location("stdout"), "stdout");
+        assert.equal(get_location("udp"), "udp");
+        assert.equal(get_location("file://"), "file://");
+        assert.equal(get_location("udp://"), "udp://");
     });
 
     it("invalid output location throws", (): void => {

test/logger/logger.test.ts

@@ -62,7 +62,11 @@ describe("Logger Tests", (): void => {
         log.warn("stern warning");
         log.error("error message");
 
-        assert.deepEqual(["WARN: stern warning", "ERROR: error message"], messages);
+        const expected: string[] = [
+            "WARN: stern warning",
+            "ERROR: error message"
+        ];
+        assert.deepEqual(messages, expected);
         console.log = f;
     });
 });

test/meter/age_gauge.test.ts

@@ -12,7 +12,7 @@ describe("AgeGauge Tests", (): void => {
         assert.isTrue(writer.is_empty());
 
         g.now();
-        assert.equal("A:age_gauge:0", writer.last_line());
+        assert.equal(writer.last_line(), "A:age_gauge:0");
     });
 
     it("set", (): void => {
@@ -21,6 +21,6 @@ describe("AgeGauge Tests", (): void => {
         assert.isTrue(writer.is_empty());
 
         g.set(10);
-        assert.equal("A:age_gauge:10", writer.last_line());
+        assert.equal(writer.last_line(), "A:age_gauge:10");
     });
 });

test/meter/counter.test.ts

@@ -12,10 +12,10 @@ describe("Counter Tests", (): void => {
         assert.isTrue(writer.is_empty());
 
         c.add();
-        assert.equal("c:counter:1", writer.last_line());
+        assert.equal(writer.last_line(), "c:counter:1");
 
         c.add(2);
-        assert.equal("c:counter:2", writer.last_line());
+        assert.equal(writer.last_line(), "c:counter:2");
     });
 
     it("increment", (): void => {
@@ -24,10 +24,10 @@ describe("Counter Tests", (): void => {
         assert.isTrue(writer.is_empty());
 
         c.increment();
-        assert.equal("c:counter:1", writer.last_line());
+        assert.equal(writer.last_line(), "c:counter:1");
 
         c.increment(2);
-        assert.equal("c:counter:2", writer.last_line());
+        assert.equal(writer.last_line(), "c:counter:2");
     });
 
     it("increment negative", (): void => {

test/meter/dist_summary.test.ts

@@ -12,7 +12,7 @@ describe("DistributionSummary Tests", (): void => {
         assert.isTrue(writer.is_empty());
 
         d.record(42);
-        assert.equal("d:dist_summary:42", writer.last_line());
+        assert.equal(writer.last_line(), "d:dist_summary:42");
     });
 
     it("record negative", (): void => {
@@ -26,6 +26,6 @@ describe("DistributionSummary Tests", (): void => {
         const d = new DistributionSummary(tid, new MemoryWriter());
         const writer = d.writer() as MemoryWriter;
         d.record(0);
-        assert.equal("d:dist_summary:0", writer.last_line());
+        assert.equal(writer.last_line(), "d:dist_summary:0");
     });
 });

test/meter/gauge.test.ts

@@ -12,7 +12,7 @@ describe("Gauge Tests", (): void => {
         assert.isTrue(writer.is_empty());
 
         g.set(1);
-        assert.equal("g:gauge:1", writer.last_line());
+        assert.equal(writer.last_line(), "g:gauge:1");
     });
 
     it("update delegates to set", (): void => {
@@ -21,13 +21,13 @@ describe("Gauge Tests", (): void => {
         assert.isTrue(writer.is_empty());
 
         g.update(1);
-        assert.equal("g:gauge:1", writer.last_line());
+        assert.equal(writer.last_line(), "g:gauge:1");
     });
 
     it("ttl_seconds", (): void => {
         const g = new Gauge(tid, new MemoryWriter(), 120);
         const writer = g.writer() as MemoryWriter;
         g.set(42);
-        assert.equal("g,120:gauge:42", writer.last_line());
+        assert.equal(writer.last_line(), "g,120:gauge:42");
     });
 });

test/meter/max_gauge.test.ts

@@ -12,7 +12,7 @@ describe("MaxGauge Tests", (): void => {
         assert.isTrue(writer.is_empty());
 
         g.set(0);
-        assert.equal("m:max_gauge:0", writer.last_line());
+        assert.equal(writer.last_line(), "m:max_gauge:0");
     });
 
     it("update delegates to set", (): void => {
@@ -21,6 +21,6 @@ describe("MaxGauge Tests", (): void => {
         assert.isTrue(writer.is_empty());
 
         g.update(0);
-        assert.equal("m:max_gauge:0", writer.last_line());
+        assert.equal(writer.last_line(), "m:max_gauge:0");
     });
 });

test/meter/monotonic_counter.test.ts

@@ -12,7 +12,7 @@ describe("MonotonicCounter Tests", (): void => {
         assert.isTrue(writer.is_empty());
 
         c.set(1);
-        assert.equal("C:monotonic_counter:1", writer.last_line());
+        assert.equal(writer.last_line(), "C:monotonic_counter:1");
     });
 
     it("set negative", (): void => {
@@ -21,6 +21,6 @@ describe("MonotonicCounter Tests", (): void => {
         assert.isTrue(writer.is_empty());
 
         c.set(-1);
-        assert.equal("C:monotonic_counter:-1", writer.last_line());
+        assert.equal(writer.last_line(), "C:monotonic_counter:-1");
     });
 });