Update utils.test.js

Author: Beakerboy

test/utils.test.js

@@ -76,31 +76,15 @@ test('Longest side angle', () => {
   expect(BuildingShapeUtils.longestSideAngle(rightTriangle)).toBe(-Math.PI / 4);
 });
 
-// Combine these next 4 into a test runner.
-test('non-intersecting open way', () => {
-  const way = '<way id="1"><nd ref="1"/><nd ref="2"/></way>';
-  let parser = new window.DOMParser();
-  let xml = parser.parseFromString(way, 'text/xml').getElementsByTagName('way')[0];
-  expect(BuildingShapeUtils.isSelfIntersecting(xml)).toBe(false);
-});
-
-test('non-intersecting closed way', () => {
-  const way = '<way id="1"><nd ref="1"/><nd ref="2"/><nd ref="3"/><nd ref="1"/></way>';
-  let parser = new window.DOMParser();
-  let xml = parser.parseFromString(way, 'text/xml').getElementsByTagName('way')[0];
-  expect(BuildingShapeUtils.isSelfIntersecting(xml)).toBe(false);
-});
-
-test('intersecting open way', () => {
-  const way = '<way id="1"><nd ref="1"/><nd ref="2"/><nd ref="3"/><nd ref="2"/></way>';
-  let parser = new window.DOMParser();
-  let xml = parser.parseFromString(way, 'text/xml').getElementsByTagName('way')[0];
-  expect(BuildingShapeUtils.isSelfIntersecting(xml)).toBe(true);
-});
-
-test('intersecting closed way', () => {
-  const way = '<way id="1"><nd ref="1"/><nd ref="2"/><nd ref="3"/><nd ref="4"/><nd ref="3"/><nd ref="1"/></way>';
-  let parser = new window.DOMParser();
-  let xml = parser.parseFromString(way, 'text/xml').getElementsByTagName('way')[0];
-  expect(BuildingShapeUtils.isSelfIntersecting(xml)).toBe(true);
+describe('isSelfIntersecting', () => {
+  test.each([
+    ['<way id="1"><nd ref="1"/><nd ref="2"/></way>', false, 'open non-intersecting'],
+    ['<way id="1"><nd ref="1"/><nd ref="2"/><nd ref="3"/><nd ref="1"/></way>', false, 'closed non-intersecting'],
+    ['<way id="1"><nd ref="1"/><nd ref="2"/><nd ref="3"/><nd ref="2"/></way>', true', 'open intersecting'],
+    ['<way id="1"><nd ref="1"/><nd ref="2"/><nd ref="3"/><nd ref="4"/><nd ref="3"/><nd ref="1"/></way>', true, 'closed intersecting']
+    ])(${description}, (way, expected, description) => {
+    let parser = new window.DOMParser();
+    let xml = parser.parseFromString(way, 'text/xml').getElementsByTagName('way')[0];
+    expect(BuildingShapeUtils.isSelfIntersecting(xml)).toBe(expected);
+  });
 });