contrapunctus/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Fix: fix tests with some refactoring

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-09-27 03:04:05 +02:00
parent f132963485
commit 0b992e75a4
7 changed files with 64 additions and 401 deletions
Download patch file Download diff file Expand all files Collapse all files

60
test/Logic/OSM/ChangesetHandler.spec.ts
View file

@ -6,21 +6,27 @@ import { Changes } from "../../../src/Logic/Osm/Changes"
import { describe, expect, it } from "vitest"
function elstorage() {
return { addAlias: (_, __) => {} }
return {
addAlias: (_, __) => {
},
}
}
function createChangesetHandler(): ChangesetHandler {
const changes = Changes.createTestObject()
return new ChangesetHandler(
new UIEventSource<boolean>(true),
new OsmConnection({}),
elstorage(),
changes,
e => console.error(e),
)
}
describe("ChangesetHanlder", () => {
describe("RewriteTagsOf", () => {
it("should insert new tags", () => {
const changesetHandler = new ChangesetHandler(
new UIEventSource<boolean>(true),
new OsmConnection({}),
elstorage(),
new Changes({
dryRun: new ImmutableStore(true),
osmConnection: new OsmConnection(),
})
)
const changesetHandler = createChangesetHandler()
const oldChangesetMeta = {
type: "changeset",
@ -57,13 +63,13 @@ describe("ChangesetHanlder", () => {
},
],
new Map<string, string>(),
oldChangesetMeta
oldChangesetMeta,
)
const d = Utils.asDict(rewritten)
expect(d.size).toEqual(10)
expect(d.get("answer")).toEqual("5")
expect(d.get("comment")).toEqual(
"Adding data with #MapComplete for theme #toerisme_vlaanderen"
"Adding data with #MapComplete for theme #toerisme_vlaanderen",
)
expect(d.get("created_by")).toEqual("MapComplete 0.16.6")
expect(d.get("host")).toEqual("https://mapcomplete.org/toerisme_vlaanderen.html")
@ -74,15 +80,7 @@ describe("ChangesetHanlder", () => {
expect(d.get("newTag")).toEqual("newValue")
})
it("should aggregate numeric tags", () => {
const changesetHandler = new ChangesetHandler(
new UIEventSource<boolean>(true),
new OsmConnection({}),
elstorage(),
new Changes({
dryRun: new ImmutableStore(true),
osmConnection: new OsmConnection(),
})
)
const changesetHandler = createChangesetHandler()
const oldChangesetMeta = {
type: "changeset",
id: 118443748,
@ -118,14 +116,14 @@ describe("ChangesetHanlder", () => {
},
],
new Map<string, string>(),
oldChangesetMeta
oldChangesetMeta,
)
const d = Utils.asDict(rewritten)
expect(d.size).toEqual(9)
expect(d.get("answer")).toEqual("42")
expect(d.get("comment")).toEqual(
"Adding data with #MapComplete for theme #toerisme_vlaanderen"
"Adding data with #MapComplete for theme #toerisme_vlaanderen",
)
expect(d.get("created_by")).toEqual("MapComplete 0.16.6")
expect(d.get("host")).toEqual("https://mapcomplete.org/toerisme_vlaanderen.html")
@ -135,15 +133,7 @@ describe("ChangesetHanlder", () => {
expect(d.get("theme")).toEqual("toerisme_vlaanderen")
})
it("should rewrite special reasons with the correct ID", () => {
const changesetHandler = new ChangesetHandler(
new UIEventSource<boolean>(true),
new OsmConnection({}),
elstorage(),
new Changes({
dryRun: new ImmutableStore(true),
osmConnection: new OsmConnection(),
})
)
const changesetHandler = createChangesetHandler()
const oldChangesetMeta = {
type: "changeset",
id: 118443748,
@ -173,14 +163,14 @@ describe("ChangesetHanlder", () => {
const rewritten = changesetHandler.RewriteTagsOf(
[],
new Map<string, string>([["node/-1", "node/42"]]),
oldChangesetMeta
oldChangesetMeta,
)
const d = Utils.asDict(rewritten)
expect(d.size).toEqual(9)
expect(d.get("answer")).toEqual("5")
expect(d.get("comment")).toEqual(
"Adding data with #MapComplete for theme #toerisme_vlaanderen"
"Adding data with #MapComplete for theme #toerisme_vlaanderen",
)
expect(d.get("created_by")).toEqual("MapComplete 0.16.6")
expect(d.get("host")).toEqual("https://mapcomplete.org/toerisme_vlaanderen.html")
@ -206,7 +196,7 @@ describe("ChangesetHanlder", () => {
const changes = new Map<string, string>([["node/-1", "node/42"]])
const hasSpecialMotivationChanges = ChangesetHandler.rewriteMetaTags(
extraMetaTags,
changes
changes,
)
// "Special rewrite did not trigger"
expect(hasSpecialMotivationChanges).toBe(true)