From 5971bbebb749a46399c2eed6c9083945a9ec2ac4 Mon Sep 17 00:00:00 2001
From: Andrew Wong <wongavision@gmail.com>
Date: Thu, 20 Dec 2018 14:12:07 -0500
Subject: [PATCH 1/3] Added more validation tests

---
 modules/core/context.js                       |  2 +-
 modules/index.js                              |  1 +
 .../{issueManager.js => issue_manager.js}     |  0
 test/index.html                               |  4 ++
 test/spec/validations/deprecated_tag.js       | 49 +++++++++++++
 test/spec/validations/disconnected_highway.js | 70 +++++++++++++++++++
 test/spec/validations/issue_manager.js        | 43 ++++++++++++
 test/spec/validations/missing_tag.js          |  2 +-
 test/spec/validations/tag_suggests_area.js    | 62 ++++++++++++++++
 9 files changed, 231 insertions(+), 2 deletions(-)
 rename modules/validations/{issueManager.js => issue_manager.js} (100%)
 create mode 100644 test/spec/validations/deprecated_tag.js
 create mode 100644 test/spec/validations/disconnected_highway.js
 create mode 100644 test/spec/validations/issue_manager.js
 create mode 100644 test/spec/validations/tag_suggests_area.js

diff --git a/modules/core/context.js b/modules/core/context.js
index a739f9018..e6c0e37c6 100644
--- a/modules/core/context.js
+++ b/modules/core/context.js
@@ -13,7 +13,7 @@ import { select as d3_select } from 'd3-selection';
 import { t, currentLocale, addTranslation, setLocale } from '../util/locale';
 
 import { coreHistory } from './history';
-import { IssueManager } from '../validations/issueManager';
+import { IssueManager } from '../validations/issue_manager';
 import { dataLocales, dataEn } from '../../data';
 import { geoRawMercator } from '../geo/raw_mercator';
 import { modeSelect } from '../modes/select';
diff --git a/modules/index.js b/modules/index.js
index ce345f16c..e515229ad 100644
--- a/modules/index.js
+++ b/modules/index.js
@@ -19,6 +19,7 @@ export * from './ui/settings/index';
 export * from './ui/index';
 export * from './util/index';
 export * from './validations/index';
+export { IssueManager } from './validations/issue_manager';
 
 /* export some legacy symbols: */
 import { services } from './services/index';
diff --git a/modules/validations/issueManager.js b/modules/validations/issue_manager.js
similarity index 100%
rename from modules/validations/issueManager.js
rename to modules/validations/issue_manager.js
diff --git a/test/index.html b/test/index.html
index 21a6ea7c5..116dda260 100644
--- a/test/index.html
+++ b/test/index.html
@@ -143,7 +143,11 @@
     <script src='spec/util/session_mutex.js'></script>
     <script src='spec/util/util.js'></script>
 
+    <script src='spec/validations/issue_manager.js'></script>
+    <script src='spec/validations/deprecated_tag.js'></script>
     <script src='spec/validations/missing_tag.js'></script>
+    <script src='spec/validations/disconnected_highway.js'></script>
+    <script src='spec/validations/tag_suggests_area.js'></script>
     <script src='spec/validations/crossing_ways.js'></script>
     <script src='spec/operations/detach_node.js'></script>
     <script>
diff --git a/test/spec/validations/deprecated_tag.js b/test/spec/validations/deprecated_tag.js
new file mode 100644
index 000000000..21ce5c13a
--- /dev/null
+++ b/test/spec/validations/deprecated_tag.js
@@ -0,0 +1,49 @@
+describe('iD.validations.deprecated_tag', function () {
+    var context;
+
+    beforeEach(function() {
+        context = iD.Context();
+    });
+
+    function createWay(tags) {
+        var n1 = iD.Node({id: 'n-1', loc: [4,4]});
+        var n2 = iD.Node({id: 'n-2', loc: [4,5]});
+
+        var w = iD.Way({id: 'w-1', nodes: ['n-1', 'n-2'], tags: tags});
+
+        context.perform(
+            iD.actionAddEntity(n1),
+            iD.actionAddEntity(n2),
+            iD.actionAddEntity(w)
+        );
+    }
+
+    function validate() {
+        var validator = iD.validationDeprecatedTag(context);
+        var changes = context.history().changes();
+        return validator(changes, context.graph());
+    }
+
+    it('has no errors on init', function() {
+        var issues = validate();
+        expect(issues).to.have.lengthOf(0);
+    });
+
+    it('has no errors on good tags', function() {
+        createWay({'highway': 'unclassified'});
+        var issues = validate();
+        expect(issues).to.have.lengthOf(0);
+    });
+
+    it('finds deprecated tags', function() {
+        createWay({'highway': 'ford'});
+        var issues = validate();
+        expect(issues).to.have.lengthOf(1);
+        var issue = issues[0];
+        expect(issue.type).to.eql(iD.ValidationIssueType.deprecated_tags);
+        expect(issue.entities).to.have.lengthOf(1);
+        expect(issue.entities[0].id).to.eql('w-1');
+    });
+
+
+});
diff --git a/test/spec/validations/disconnected_highway.js b/test/spec/validations/disconnected_highway.js
new file mode 100644
index 000000000..a1b3e523f
--- /dev/null
+++ b/test/spec/validations/disconnected_highway.js
@@ -0,0 +1,70 @@
+describe('iD.validations.disconnected_highway', function () {
+    var context;
+
+    beforeEach(function() {
+        context = iD.Context();
+    });
+
+    function createWay(tags) {
+        var n1 = iD.Node({id: 'n-1', loc: [4,4]});
+        var n2 = iD.Node({id: 'n-2', loc: [4,5]});
+
+        var w = iD.Way({id: 'w-1', nodes: ['n-1', 'n-2'], tags: tags});
+
+        context.perform(
+            iD.actionAddEntity(n1),
+            iD.actionAddEntity(n2),
+            iD.actionAddEntity(w)
+        );
+    }
+
+    function createConnectingWays() {
+        var n1 = iD.Node({id: 'n-1', loc: [4,4]});
+        var n2 = iD.Node({id: 'n-2', loc: [4,5]});
+        var n3 = iD.Node({id: 'n-3', loc: [5,5]});
+
+        var w = iD.Way(
+            {id: 'w-1', nodes: ['n-1', 'n-2'],
+            tags: {'highway': 'unclassified'}});
+        var w2 = iD.Way({
+            id: 'w-2', nodes: ['n-1', 'n-3'],
+            tags: {'highway': 'unclassified'}});
+
+        context.perform(
+            iD.actionAddEntity(n1),
+            iD.actionAddEntity(n2),
+            iD.actionAddEntity(n3),
+            iD.actionAddEntity(w),
+            iD.actionAddEntity(w2)
+        );
+    }
+
+    function validate() {
+        var validator = iD.validationDisconnectedHighway(context);
+        var changes = context.history().changes();
+        return validator(changes, context.graph());
+    }
+
+    it('has no errors on init', function() {
+        var issues = validate();
+        expect(issues).to.have.lengthOf(0);
+    });
+
+    it('finds disconnected highway', function() {
+        createWay({'highway': 'unclassified'});
+        var issues = validate();
+        expect(issues).to.have.lengthOf(1);
+        var issue = issues[0];
+        expect(issue.type).to.eql(iD.ValidationIssueType.disconnected_highway);
+        expect(issue.entities).to.have.lengthOf(1);
+        expect(issue.entities[0].id).to.eql('w-1');
+    });
+
+    it('ignores roads that are connected', function() {
+        createConnectingWays();
+        var issues = validate();
+        expect(issues).to.have.lengthOf(0);
+    });
+
+
+});
diff --git a/test/spec/validations/issue_manager.js b/test/spec/validations/issue_manager.js
new file mode 100644
index 000000000..78acf1ef3
--- /dev/null
+++ b/test/spec/validations/issue_manager.js
@@ -0,0 +1,43 @@
+describe('iD.validations.IssueManager', function () {
+    var context;
+
+    beforeEach(function() {
+        context = iD.Context();
+    });
+
+    function createInvalidWay() {
+        var n1 = iD.Node({id: 'n-1', loc: [4,4]});
+        var n2 = iD.Node({id: 'n-2', loc: [4,5]});
+
+        var w = iD.Way({id: 'w-1', nodes: ['n-1', 'n-2']});
+
+        context.perform(
+            iD.actionAddEntity(n1),
+            iD.actionAddEntity(n2),
+            iD.actionAddEntity(w)
+        );
+    }
+
+    it('has no issues on init', function() {
+        var issueManager = new iD.IssueManager(context);
+        var issues = issueManager.getIssues();
+        expect(issues).to.have.lengthOf(0);
+    });
+
+    it('populates issues on validate', function() {
+        createInvalidWay();
+        var issueManager = new iD.IssueManager(context);
+        var issues = issueManager.getIssues();
+        expect(issues).to.have.lengthOf(0);
+
+        issueManager.validate();
+        issues = issueManager.getIssues();
+        expect(issues).to.have.lengthOf(1);
+        var issue = issues[0];
+        expect(issue.type).to.eql(iD.ValidationIssueType.missing_tag);
+        expect(issue.entities).to.have.lengthOf(1);
+        expect(issue.entities[0].id).to.eql('w-1');
+    });
+
+
+});
diff --git a/test/spec/validations/missing_tag.js b/test/spec/validations/missing_tag.js
index 1aba5b59c..61564df38 100644
--- a/test/spec/validations/missing_tag.js
+++ b/test/spec/validations/missing_tag.js
@@ -19,7 +19,7 @@ describe('iD.validations.missing_tag', function () {
     }
 
     function validate() {
-        var validator = iD.validationMissingTag();
+        var validator = iD.validationMissingTag(context);
         var changes = context.history().changes();
         return validator(changes, context.graph());
     }
diff --git a/test/spec/validations/tag_suggests_area.js b/test/spec/validations/tag_suggests_area.js
new file mode 100644
index 000000000..952d99f99
--- /dev/null
+++ b/test/spec/validations/tag_suggests_area.js
@@ -0,0 +1,62 @@
+describe('iD.validations.tag_suggests_area', function () {
+    var context;
+
+    beforeEach(function() {
+        context = iD.Context();
+    });
+
+    function createWay(tags) {
+        var n1 = iD.Node({id: 'n-1', loc: [4,4]});
+        var n2 = iD.Node({id: 'n-2', loc: [4,5]});
+
+        var w = iD.Way({id: 'w-1', nodes: ['n-1', 'n-2'], tags: tags});
+
+        context.perform(
+            iD.actionAddEntity(n1),
+            iD.actionAddEntity(n2),
+            iD.actionAddEntity(w)
+        );
+    }
+
+    function createPoint(tags) {
+        var n1 = iD.Node({id: 'n-1', loc: [4,4], tags: tags});
+        context.perform(
+            iD.actionAddEntity(n1)
+        );
+    }
+
+    function validate() {
+        var validator = iD.validationTagSuggestsArea(context);
+        var changes = context.history().changes();
+        return validator(changes, context.graph());
+    }
+
+    it('has no errors on init', function() {
+        var issues = validate();
+        expect(issues).to.have.lengthOf(0);
+    });
+
+    it('has no errors on good tags', function() {
+        createWay({'highway': 'unclassified'});
+        var issues = validate();
+        expect(issues).to.have.lengthOf(0);
+    });
+
+    it('ignores points', function() {
+        createPoint({'building': 'yes'});
+        var issues = validate();
+        expect(issues).to.have.lengthOf(0);
+    });
+
+    it('finds tags that suggest area', function() {
+        createWay({'building': 'yes'});
+        var issues = validate();
+        expect(issues).to.have.lengthOf(1);
+        var issue = issues[0];
+        expect(issue.type).to.eql(iD.ValidationIssueType.tag_suggests_area);
+        expect(issue.entities).to.have.lengthOf(1);
+        expect(issue.entities[0].id).to.eql('w-1');
+    });
+
+
+});

From 67bab7aecfc1d254a5c8720cc95a594b7d6659a3 Mon Sep 17 00:00:00 2001
From: Andrew Wong <wongavision@gmail.com>
Date: Thu, 20 Dec 2018 16:27:50 -0500
Subject: [PATCH 2/3] don't import all of d3

---
 modules/validations/issue_manager.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/validations/issue_manager.js b/modules/validations/issue_manager.js
index 4ece630d9..3a74a1b47 100644
--- a/modules/validations/issue_manager.js
+++ b/modules/validations/issue_manager.js
@@ -1,11 +1,11 @@
-import * as d3 from 'd3';
+import { dispatch as d3_dispatch } from 'd3-dispatch';
 
 import _filter from 'lodash-es/filter';
 
 import { utilRebind } from '../util/rebind';
 
 export function IssueManager(context) {
-    var dispatch = d3.dispatch('reload'),
+    var dispatch = d3_dispatch('reload'),
         self = {},
         issues = [];
 

From 437cc5a9a5c9c0b034fc2db2bbbc753957cf1f4b Mon Sep 17 00:00:00 2001
From: Andrew Wong <wongavision@gmail.com>
Date: Fri, 21 Dec 2018 15:42:19 -0500
Subject: [PATCH 3/3] added severity checks

---
 test/spec/validations/deprecated_tag.js       | 1 +
 test/spec/validations/disconnected_highway.js | 1 +
 test/spec/validations/tag_suggests_area.js    | 1 +
 3 files changed, 3 insertions(+)

diff --git a/test/spec/validations/deprecated_tag.js b/test/spec/validations/deprecated_tag.js
index 21ce5c13a..284ad799e 100644
--- a/test/spec/validations/deprecated_tag.js
+++ b/test/spec/validations/deprecated_tag.js
@@ -41,6 +41,7 @@ describe('iD.validations.deprecated_tag', function () {
         expect(issues).to.have.lengthOf(1);
         var issue = issues[0];
         expect(issue.type).to.eql(iD.ValidationIssueType.deprecated_tags);
+        expect(issue.severity).to.eql(iD.ValidationIssueSeverity.warning);
         expect(issue.entities).to.have.lengthOf(1);
         expect(issue.entities[0].id).to.eql('w-1');
     });
diff --git a/test/spec/validations/disconnected_highway.js b/test/spec/validations/disconnected_highway.js
index a1b3e523f..acd566082 100644
--- a/test/spec/validations/disconnected_highway.js
+++ b/test/spec/validations/disconnected_highway.js
@@ -56,6 +56,7 @@ describe('iD.validations.disconnected_highway', function () {
         expect(issues).to.have.lengthOf(1);
         var issue = issues[0];
         expect(issue.type).to.eql(iD.ValidationIssueType.disconnected_highway);
+        expect(issue.severity).to.eql(iD.ValidationIssueSeverity.warning);
         expect(issue.entities).to.have.lengthOf(1);
         expect(issue.entities[0].id).to.eql('w-1');
     });
diff --git a/test/spec/validations/tag_suggests_area.js b/test/spec/validations/tag_suggests_area.js
index 952d99f99..b268e9b52 100644
--- a/test/spec/validations/tag_suggests_area.js
+++ b/test/spec/validations/tag_suggests_area.js
@@ -54,6 +54,7 @@ describe('iD.validations.tag_suggests_area', function () {
         expect(issues).to.have.lengthOf(1);
         var issue = issues[0];
         expect(issue.type).to.eql(iD.ValidationIssueType.tag_suggests_area);
+        expect(issue.severity).to.eql(iD.ValidationIssueSeverity.warning);
         expect(issue.entities).to.have.lengthOf(1);
         expect(issue.entities[0].id).to.eql('w-1');
     });