Skip to content

Combine multiple tests into one runner #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Beakerboy merged 9 commits into from
Apr 29, 2025
Merged

Combine multiple tests into one runner #93

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5f759d6
Update combine_ways.test.js
Beakerboy Apr 29, 2025
4d57e7d
Update combine_ways.test.js
Beakerboy Apr 29, 2025
a34c71d
Update combine_ways.test.js
Beakerboy Apr 29, 2025
5746cd1
Update combine_ways.test.js
Beakerboy Apr 29, 2025
c448e94
Update combine_ways.test.js
Beakerboy Apr 29, 2025
de4fb7a
Update combine_ways.test.js
Beakerboy Apr 29, 2025
554b726
Update combine_ways.test.js
Beakerboy Apr 29, 2025
36059e5
Update combine_ways.test.js
Beakerboy Apr 29, 2025
c4ee13f
Update combine_ways.test.js
Beakerboy Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
132 changes: 53 additions & 79 deletions test/combine_ways.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,87 +14,61 @@ import { BuildingShapeUtils } from '../src/extras/BuildingShapeUtils.js';
// import { JSDOM } from 'jsdom';

test('Test no combining necessary. one open way', () => {
var way1 = '<way id="1"><nd ref="1"/><nd ref="2"/><nd ref="3"/><nd ref="4"/></way>';
var way = '<way id="1"><nd ref="1"/><nd ref="2"/><nd ref="3"/><nd ref="4"/></way>';
let parser = new window.DOMParser();
let xml1 = parser.parseFromString(way1, 'text/xml').getElementsByTagName('way')[0];
let result = BuildingShapeUtils.combineWays([xml1]);
let xml = parser.parseFromString(way, 'text/xml').getElementsByTagName('way')[0];
let result = BuildingShapeUtils.combineWays([xml]);
expect(result.length).toBe(0);
});

test('Test combining 2 ways 1->2', () => {
var way1 = '<way id="1"><nd ref="1"/><nd ref="2"/></way>';
var way2 = '<way id="2"><nd ref="2"/><nd ref="3"/></way>';
var way3 = '<way id="3"><nd ref="3"/><nd ref="1"/></way>';
let parser = new window.DOMParser();
let xml1 = parser.parseFromString(way1, 'text/xml').getElementsByTagName('way')[0];
let xml2 = parser.parseFromString(way2, 'text/xml').getElementsByTagName('way')[0];
let xml3 = parser.parseFromString(way3, 'text/xml').getElementsByTagName('way')[0];
let result = BuildingShapeUtils.combineWays([xml1, xml2, xml3]);
// Expect one closed way with 3 unique nodes.
expect(result.length).toBe(1);
expect(BuildingShapeUtils.isClosed(result[0])).toBe(true);
expect(result[0].getElementsByTagName('nd').length).toBe(4);
expect(BuildingShapeUtils.isSelfIntersecting(result[0])).toBe(false);
});

test('Test combining 3 ways 2->1->3', () => {
var way1 = '<way id="1"><nd ref="1"/><nd ref="2"/></way>';
var way2 = '<way id="2"><nd ref="3"/><nd ref="1"/></way>';
var way3 = '<way id="3"><nd ref="2"/><nd ref="3"/></way>';
let parser = new window.DOMParser();
let xml1 = parser.parseFromString(way1, 'text/xml').getElementsByTagName('way')[0];
let xml2 = parser.parseFromString(way2, 'text/xml').getElementsByTagName('way')[0];
let xml3 = parser.parseFromString(way3, 'text/xml').getElementsByTagName('way')[0];
let result = BuildingShapeUtils.combineWays([xml1, xml2, xml3]);
expect(result.length).toBe(1);
expect(BuildingShapeUtils.isClosed(result[0])).toBe(true);
expect(BuildingShapeUtils.isSelfIntersecting(result[0])).toBe(false);
expect(result[0].getElementsByTagName('nd').length).toBe(4);
});

test('Test combining 2 unaligned ways', () => {
var way1 = '<way id="1"><nd ref="1"/><nd ref="2"/></way>';
var way2 = '<way id="2"><nd ref="3"/><nd ref="2"/></way>';
var way3 = '<way id="3"><nd ref="3"/><nd ref="1"/></way>';
let parser = new window.DOMParser();
let xml1 = parser.parseFromString(way1, 'text/xml').getElementsByTagName('way')[0];
let xml2 = parser.parseFromString(way2, 'text/xml').getElementsByTagName('way')[0];
let xml3 = parser.parseFromString(way3, 'text/xml').getElementsByTagName('way')[0];
let result = BuildingShapeUtils.combineWays([xml1, xml2, xml3]);
expect(result.length).toBe(1);
expect(BuildingShapeUtils.isClosed(result[0])).toBe(true);
expect(BuildingShapeUtils.isSelfIntersecting(result[0])).toBe(false);
expect(result[0].getElementsByTagName('nd').length).toBe(4);
});

test('Test combining 3 ways 1->2->3', () => {
var way1 = '<way id="1"><nd ref="1"/><nd ref="2"/></way>';
var way2 = '<way id="2"><nd ref="1"/><nd ref="3"/></way>';
var way3 = '<way id="3"><nd ref="2"/><nd ref="3"/></way>';
let parser = new window.DOMParser();
let xml1 = parser.parseFromString(way1, 'text/xml').getElementsByTagName('way')[0];
let xml2 = parser.parseFromString(way2, 'text/xml').getElementsByTagName('way')[0];
let xml3 = parser.parseFromString(way3, 'text/xml').getElementsByTagName('way')[0];
let result = BuildingShapeUtils.combineWays([xml1, xml2, xml3]);
expect(result.length).toBe(1);
expect(BuildingShapeUtils.isClosed(result[0])).toBe(true);
expect(BuildingShapeUtils.isSelfIntersecting(result[0])).toBe(false);
expect(result[0].getElementsByTagName('nd').length).toBe(4);
});

test('Test combining 4 ways', () => {
var way1 = '<way id="1"><nd ref="1"/><nd ref="2"/></way>';
var way2 = '<way id="2"><nd ref="3"/><nd ref="4"/></way>';
var way3 = '<way id="3"><nd ref="4"/><nd ref="1"/></way>';
var way4 = '<way id="4"><nd ref="2"/><nd ref="3"/></way>';
let parser = new window.DOMParser();
let xml1 = parser.parseFromString(way1, 'text/xml').getElementsByTagName('way')[0];
let xml2 = parser.parseFromString(way2, 'text/xml').getElementsByTagName('way')[0];
let xml3 = parser.parseFromString(way3, 'text/xml').getElementsByTagName('way')[0];
let xml4 = parser.parseFromString(way4, 'text/xml').getElementsByTagName('way')[0];
let result = BuildingShapeUtils.combineWays([xml1, xml2, xml3, xml4]);
expect(result.length).toBe(1);
expect(BuildingShapeUtils.isClosed(result[0]));
expect(BuildingShapeUtils.isSelfIntersecting(result[0])).toBe(false);
expect(result[0].getElementsByTagName('nd').length).toBe(5);
describe('Combine Ways', () => {
test.each([
[
[
'<way id="1"><nd ref="1"/><nd ref="2"/></way>',
'<way id="2"><nd ref="2"/><nd ref="3"/></way>',
'<way id="3"><nd ref="3"/><nd ref="1"/></way>',
], 1, 4, 'Test combining 3 ways 1->2->3',
],
[
[
'<way id="1"><nd ref="1"/><nd ref="2"/></way>',
'<way id="2"><nd ref="3"/><nd ref="1"/></way>',
'<way id="3"><nd ref="2"/><nd ref="3"/></way>',
], 1, 4, 'Test combining 3 ways 2->1->3',
],
[
[
'<way id="1"><nd ref="1"/><nd ref="2"/></way>',
'<way id="2"><nd ref="3"/><nd ref="2"/></way>',
'<way id="3"><nd ref="3"/><nd ref="1"/></way>',
], 1, 4, 'Test combining tip to tip',
],
[
[
'<way id="1"><nd ref="1"/><nd ref="2"/></way>',
'<way id="2"><nd ref="1"/><nd ref="3"/></way>',
'<way id="3"><nd ref="2"/><nd ref="3"/></way>',
], 1, 4, 'Test combining tail to tail',
],
[
[
'<way id="1"><nd ref="1"/><nd ref="2"/></way>',
'<way id="2"><nd ref="3"/><nd ref="4"/></way>',
'<way id="3"><nd ref="4"/><nd ref="1"/></way>',
'<way id="4"><nd ref="2"/><nd ref="3"/></way>',
], 1, 5, 'Test combining 4 ways',
],
])('${description}', (ways, length, nodes, description) => {
let parser = new window.DOMParser();
const xml = [];
for (const way of ways){
xml.push(parser.parseFromString(way, 'text/xml').getElementsByTagName('way')[0]);
}
let result = BuildingShapeUtils.combineWays(xml);
expect(result.length).toBe(length);
expect(BuildingShapeUtils.isClosed(result[0]));
expect(BuildingShapeUtils.isSelfIntersecting(result[0])).toBe(false);
expect(result[0].getElementsByTagName('nd').length).toBe(nodes);
});
});
⚡