From d457a952eceb1698b2d71f5d9ec80736be423824 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Sun, 24 Sep 2017 00:56:08 +0200 Subject: ... --- orig/pq-web/sim.js | 42 +++++++++++++++++------------------------- plural_test.go | 40 +++++++++++++++++++--------------------- 2 files changed, 36 insertions(+), 46 deletions(-) diff --git a/orig/pq-web/sim.js b/orig/pq-web/sim.js index 2b0b5a7..a6e4976 100644 --- a/orig/pq-web/sim.js +++ b/orig/pq-web/sim.js @@ -75,31 +75,23 @@ $.each = function (object, callback) { var document = null; -if (typeof process !== "undefined") { - // Node - var fs = require("fs"); - var load = function (filename) { - var content = fs.readFileSync(filename); - require("vm").runInThisContext(content, filename); - //global.eval.call(global, String(content)); - }; - var print = function () { - args = Array.prototype.slice.call(arguments); - console.log(args.join(" ")); - }; - var read = function (f) { return fs.readFileSync(f); }; - var write = function (f,c) { fs.writeFileSync(f,c); }; - - global.window = window; - global.document = document; - global.navigator = navigator; - global.$ = $; - print("node"); -} else { - // V8 shell - global = this; - print("v8"); -} +var fs = require("fs"); +var load = function (filename) { + var content = fs.readFileSync(filename); + require("vm").runInThisContext(content, filename); + //global.eval.call(global, String(content)); +}; +var print = function () { + args = Array.prototype.slice.call(arguments); + console.log(args.join(" ")); +}; +var read = function (f) { return fs.readFileSync(f); }; +var write = function (f,c) { fs.writeFileSync(f,c); }; + +global.window = window; +global.document = document; +global.navigator = navigator; +global.$ = $; var alert = global.alert = function (m) { print("ALERT: " + m); }; diff --git a/plural_test.go b/plural_test.go index 83950d6..385732b 100644 --- a/plural_test.go +++ b/plural_test.go @@ -2,35 +2,33 @@ package main import "testing" -var testPlural = map[string]string{ - "funny": "funnies", - "musmus": "musmi", - "much": "muches", - "mux": "muxes", - "fif": "fives", - "heman": "hemen", - "Wo Man": "Wo Men", - "else": "elses", - "usas": "usases", - "nismus": "nismi", -} - func TestPlural(t *testing.T) { - for k, v := range testPlural { + testCases := map[string]string{ + "funny": "funnies", + "musmus": "musmi", + "much": "muches", + "mux": "muxes", + "fif": "fives", + "heman": "hemen", + "Wo Man": "Wo Men", + "else": "elses", + "usas": "usases", + "nismus": "nismi", + } + for k, v := range testCases { if r := Plural(k); r != v { - t.Errorf("expected %v, got %v\n", v, r) + t.Errorf("got %v, want %v", r, v) } } } -var indefCases = map[string]string{ - "abachus": "an abachi", -} - func TestIndefinite(t *testing.T) { - for k, v := range indefCases { + testCases := map[string]string{ + "abachus": "an abachi", + } + for k, v := range testCases { if r := Indefinite(k, 2); r != v { - t.Errorf("expected %v, got %v\n", v, r) + t.Errorf("got %v, want %v", r, v) } } } -- cgit v1.2.3