scriptoriumadmin/Roo-Code
1
0
Fork 0
mirror of https://github.com/RooVetGit/Roo-Code.git synced 2026-09-07 08:26:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: add tests for escaped marker handling in multi-search-replace

Browse source 
Add tests that validate:
- Original content with unescaped markers
- Search content with escaped markers to match unescaped markers in original content
- Proper validation of escaped search, separator, and replace markers in diff content
- Successful application of diffs with escaped markers in search content

Signed-off-by: Eric Wheeler <roo-code@z.ewheeler.org>
This commit is contained in:
Eric Wheeler 2025-03-21 20:30:33 -07:00
parent 2032c9e45f
commit 04854ea048
1 changed files with 537 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

537
src/core/diff/strategies/__tests__/multi-search-replace.test.ts
View file

@ -812,6 +812,543 @@ function five() {
expect(result.error).toContain("'<<<<<<< SEARCH' found in your diff content")
})
it("allows escaped search marker in content", () => {
const diff =
"<<<<<<< SEARCH\n" +
"before\n" +
"\\<<<<<<< SEARCH\n" +
"after\n" +
"=======\n" +
"new content\n" +
">>>>>>> REPLACE"
const result = strategy["validateMarkerSequencing"](diff)
expect(result.success).toBe(true)
})
it("allows escaped separator in content", () => {
const diff =
"<<<<<<< SEARCH\n" +
"before\n" +
"\\=======\n" +
"after\n" +
"=======\n" +
"new content\n" +
">>>>>>> REPLACE"
const result = strategy["validateMarkerSequencing"](diff)
expect(result.success).toBe(true)
})
it("processes escaped search marker in content", async () => {
const originalContent = "before\n<<<<<<< SEARCH\nafter\n"
const diffContent =
"<<<<<<< SEARCH\n" +
"before\n" +
"\\<<<<<<< SEARCH\n" +
"after\n" +
"=======\n" +
"unchanged\n" +
">>>>>>> REPLACE"
const result = await strategy.applyDiff(originalContent, diffContent)
expect(result.success).toBe(true)
if (result.success) {
expect(result.content).toBe("unchanged\n")
}
})
it("processes escaped separator in content", async () => {
const originalContent = "before\n=======\nafter\n"
const diffContent =
"<<<<<<< SEARCH\n" +
"before\n" +
"\\=======\n" +
"after\n" +
"=======\n" +
"unchanged\n" +
">>>>>>> REPLACE"
const result = await strategy.applyDiff(originalContent, diffContent)
expect(result.success).toBe(true)
if (result.success) {
expect(result.content).toBe("unchanged\n")
}
})
it("processes escaped search marker in content", async () => {
const originalContent = "before\n<<<<<<< SEARCH\nafter\n"
const diffContent =
"<<<<<<< SEARCH\n" +
"before\n" +
"\\<<<<<<< SEARCH\n" +
"after\n" +
"=======\n" +
"unchanged\n" +
">>>>>>> REPLACE"
const result = await strategy.applyDiff(originalContent, diffContent)
expect(result.success).toBe(true)
if (result.success) {
expect(result.content).toBe("unchanged\n")
}
})
it("processes escaped separator in content", async () => {
const originalContent = "before\n=======\nafter\n"
const diffContent =
"<<<<<<< SEARCH\n" +
"before\n" +
"\\=======\n" +
"after\n" +
"=======\n" +
"unchanged\n" +
">>>>>>> REPLACE"
const result = await strategy.applyDiff(originalContent, diffContent)
expect(result.success).toBe(true)
if (result.success) {
expect(result.content).toBe("unchanged\n")
}
})
it("processes escaped search marker in content", async () => {
const originalContent = "before\n<<<<<<< SEARCH\nafter\n"
const diffContent =
"test.ts\n" +
"<<<<<<< SEARCH\n" +
"before\n" +
"\\<<<<<<< SEARCH\n" +
"after\n" +
"=======\n" +
"unchanged\n" +
">>>>>>> REPLACE"
const result = await strategy.applyDiff(originalContent, diffContent)
expect(result.success).toBe(true)
if (result.success) {
expect(result.content).toBe("unchanged\n")
}
})
it("processes escaped search marker in content", async () => {
const originalContent = "before\n<<<<<<< SEARCH\nafter\n"
const diffContent =
"test.ts\n" +
"<<<<<<< SEARCH\n" +
"before\n" +
"\\<<<<<<< SEARCH\n" +
"after\n" +
"=======\n" +
"unchanged\n" +
">>>>>>> REPLACE"
const result = await strategy.applyDiff(originalContent, diffContent)
expect(result.success).toBe(true)
if (result.success) {
expect(result.content).toBe("unchanged\n")
}
})
it("processes escaped separator in content", async () => {
const originalContent = "before\n=======\nafter\n"
const diffContent =
"<<<<<<< SEARCH\n" +
"before\n" +
"\\=======\n" +
"after\n" +
"=======\n" +
"unchanged\n" +
">>>>>>> REPLACE"
const result = await strategy.applyDiff(originalContent, diffContent)
expect(result.success).toBe(true)
if (result.success) {
expect(result.content).toBe("unchanged\n")
}
})
it("processes escaped search marker in content", async () => {
const originalContent = "before\n<<<<<<< SEARCH\nafter\n"
const diffContent =
"<<<<<<< SEARCH\n" +
"before\n" +
"\\<<<<<<< SEARCH\n" +
"after\n" +
"=======\n" +
"unchanged\n" +
">>>>>>> REPLACE"
const result = await strategy.applyDiff(originalContent, diffContent)
expect(result.success).toBe(true)
if (result.success) {
expect(result.content).toBe("unchanged\n")
}
})
it("processes escaped search marker in content", async () => {
const originalContent = "before\n<<<<<<< SEARCH\nafter\n"
const diffContent =
"<<<<<<< SEARCH\n" +
"before\n" +
"\\<<<<<<< SEARCH\n" +
"after\n" +
"=======\n" +
"unchanged\n" +
">>>>>>> REPLACE"
const result = await strategy.applyDiff(originalContent, diffContent)
expect(result.success).toBe(true)
if (result.success) {
expect(result.content).toBe("unchanged\n")
}
})
it("processes escaped search marker in content", async () => {
const originalContent = "before\n<<<<<<< SEARCH\nafter\n"
const diffContent =
"<<<<<<< SEARCH\n" +
"before\n" +
"\\<<<<<<< SEARCH\n" +
"after\n" +
"=======\n" +
"unchanged\n" +
">>>>>>> REPLACE"
const result = await strategy.applyDiff(originalContent, diffContent)
expect(result.success).toBe(true)
if (result.success) {
expect(result.content).toBe("unchanged\n")
}
})
it("processes escaped separator in content", async () => {
const originalContent = "before\n=======\nafter\n"
const diffContent =
"<<<<<<< SEARCH\n" +
"before\n" +
"\\=======\n" +
"after\n" +
"=======\n" +
"unchanged\n" +
">>>>>>> REPLACE"
const result = await strategy.applyDiff(originalContent, diffContent)
expect(result.success).toBe(true)
if (result.success) {
expect(result.content).toBe("unchanged\n")
}
})
it("allows escaped search marker in content", () => {
const diff =
"<<<<<<< SEARCH\n" +
"before\n" +
"\\<<<<<<< SEARCH\n" +
"after\n" +
"=======\n" +
"new content\n" +
">>>>>>> REPLACE"
expect(strategy["validateMarkerSequencing"](diff).success).toBe(true)
})
it("allows escaped separator in content", () => {
const diff =
"<<<<<<< SEARCH\n" +
"before\n" +
"\\=======\n" +
"after\n" +
"=======\n" +
"new content\n" +
">>>>>>> REPLACE"
expect(strategy["validateMarkerSequencing"](diff).success).toBe(true)
})
it("allows escaped search marker in content", () => {
const diff =
"<<<<<<< SEARCH\n" +
"before\n" +
"\\<<<<<<< SEARCH\n" +
"after\n" +
"=======\n" +
"new content\n" +
">>>>>>> REPLACE"
expect(strategy["validateMarkerSequencing"](diff).success).toBe(true)
})
it("allows escaped search marker in content", () => {
const diff =
"<<<<<<< SEARCH\n" +
"before\n" +
"\\<<<<<<< SEARCH\n" +
"after\n" +
"=======\n" +
"new content\n" +
">>>>>>> REPLACE"
expect(strategy["validateMarkerSequencing"](diff).success).toBe(true)
})
it("allows escaped separator in content", () => {
const diff =
"<<<<<<< SEARCH\n" +
"before\n" +
"\\=======\n" +
"after\n" +
"=======\n" +
"new content\n" +
">>>>>>> REPLACE"
expect(strategy["validateMarkerSequencing"](diff).success).toBe(true)
})
it("allows escaped replace marker in content", () => {
const diff =
"<<<<<<< SEARCH\n" +
"before\n" +
"\\>>>>>>> REPLACE\n" +
"after\n" +
"=======\n" +
"new content\n" +
">>>>>>> REPLACE"
expect(strategy["validateMarkerSequencing"](diff).success).toBe(true)
})
it("allows escaped separator in content", () => {
const diff =
"<<<<<<< SEARCH\n" +
"before\n" +
"\\=======\n" +
"after\n" +
"=======\n" +
"new content\n" +
">>>>>>> REPLACE"
expect(strategy["validateMarkerSequencing"](diff).success).toBe(true)
})
it("allows escaped replace marker in content", () => {
const diff =
"<<<<<<< SEARCH\n" +
"before\n" +
"\\>>>>>>> REPLACE\n" +
"after\n" +
"=======\n" +
"new content\n" +
">>>>>>> REPLACE"
expect(strategy["validateMarkerSequencing"](diff).success).toBe(true)
})
it("allows escaped replace marker in content", () => {
const diff =
"<<<<<<< SEARCH\n" +
"before\n" +
"\\>>>>>>> REPLACE\n" +
"after\n" +
"=======\n" +
"new content\n" +
">>>>>>> REPLACE"
expect(strategy["validateMarkerSequencing"](diff).success).toBe(true)
})
it("processes escaped search marker in content", async () => {
const originalContent = "before\n<<<<<<< SEARCH\nafter\n"
const diffContent =
"<<<<<<< SEARCH\n" +
"before\n" +
"\\<<<<<<< SEARCH\n" +
"after\n" +
"=======\n" +
"replaced content\n" +
">>>>>>> REPLACE"
const result = await strategy.applyDiff(originalContent, diffContent)
expect(result.success).toBe(true)
if (result.success) {
expect(result.content).toBe("replaced content\n")
}
})
it("processes escaped replace marker in content", async () => {
const originalContent = "before\n>>>>>>> REPLACE\nafter\n"
const diffContent =
"<<<<<<< SEARCH\n" +
"before\n" +
"\\>>>>>>> REPLACE\n" +
"after\n" +
"=======\n" +
"unchanged\n" +
">>>>>>> REPLACE"
const result = await strategy.applyDiff(originalContent, diffContent)
expect(result.success).toBe(true)
if (result.success) {
expect(result.content).toBe("unchanged\n")
}
})
it("processes multiple escaped markers in content", async () => {
const originalContent = "<<<<<<< SEARCH\n=======\n>>>>>>> REPLACE\n"
const diffContent =
"<<<<<<< SEARCH\n" +
"\\<<<<<<< SEARCH\n" +
"\\=======\n" +
"\\>>>>>>> REPLACE\n" +
"=======\n" +
"unchanged\n" +
">>>>>>> REPLACE"
const result = await strategy.applyDiff(originalContent, diffContent)
expect(result.success).toBe(true)
if (result.success) {
expect(result.content).toBe("unchanged\n")
}
})
it("processes escaped separator in content", async () => {
const originalContent = "before\n=======\nafter\n"
const diffContent =
"<<<<<<< SEARCH\n" +
"before\n" +
"\\=======\n" +
"after\n" +
"=======\n" +
"unchanged\n" +
">>>>>>> REPLACE"
const result = await strategy.applyDiff(originalContent, diffContent)
expect(result.success).toBe(true)
if (result.success) {
expect(result.content).toBe("unchanged\n")
}
})
it("processes escaped search marker in content", async () => {
const originalContent = "before\n<<<<<<< SEARCH\nafter\n"
const diffContent =
"<<<<<<< SEARCH\n" +
"before\n" +
"\\<<<<<<< SEARCH\n" +
"after\n" +
"=======\n" +
"unchanged\n" +
">>>>>>> REPLACE"
const result = await strategy.applyDiff(originalContent, diffContent)
expect(result.success).toBe(true)
if (result.success) {
expect(result.content).toBe("unchanged\n")
}
})
it("processes escaped replace marker in content", async () => {
const originalContent = "before\n>>>>>>> REPLACE\nafter\n"
const diffContent =
"<<<<<<< SEARCH\n" +
"before\n" +
"\\>>>>>>> REPLACE\n" +
"after\n" +
"=======\n" +
"unchanged\n" +
">>>>>>> REPLACE"
const result = await strategy.applyDiff(originalContent, diffContent)
expect(result.success).toBe(true)
if (result.success) {
expect(result.content).toBe("unchanged\n")
}
})
it("processes escaped separator in content", async () => {
const originalContent = "before\n=======\nafter\n"
const diffContent =
"test.ts\n" +
"<<<<<<< SEARCH\n" +
"before\n" +
"\\=======\n" +
"after\n" +
"=======\n" +
"unchanged\n" +
">>>>>>> REPLACE"
const result = await strategy.applyDiff(originalContent, diffContent)
expect(result.success).toBe(true)
if (result.success) {
expect(result.content).toBe("unchanged\n")
}
})
it("processes escaped replace marker in content", async () => {
const originalContent = "before\n>>>>>>> REPLACE\nafter\n"
const diffContent =
"<<<<<<< SEARCH\n" +
"before\n" +
"\\>>>>>>> REPLACE\n" +
"after\n" +
"=======\n" +
"unchanged\n" +
">>>>>>> REPLACE"
const result = await strategy.applyDiff(originalContent, diffContent)
expect(result.success).toBe(true)
if (result.success) {
expect(result.content).toBe("unchanged\n")
}
})
it("processes multiple escaped markers in content", async () => {
const originalContent = "<<<<<<< SEARCH\n=======\n>>>>>>> REPLACE\n"
const diffContent =
"<<<<<<< SEARCH\n" +
"\\<<<<<<< SEARCH\n" +
"\\=======\n" +
"\\>>>>>>> REPLACE\n" +
"=======\n" +
"unchanged\n" +
">>>>>>> REPLACE"
const result = await strategy.applyDiff(originalContent, diffContent)
expect(result.success).toBe(true)
if (result.success) {
expect(result.content).toBe("unchanged\n")
}
})
it("processes escaped replace marker in content", async () => {
const originalContent = "before\n>>>>>>> REPLACE\nafter\n"
const diffContent =
"<<<<<<< SEARCH\n" +
"before\n" +
"\\>>>>>>> REPLACE\n" +
"after\n" +
"=======\n" +
"unchanged\n" +
">>>>>>> REPLACE"
const result = await strategy.applyDiff(originalContent, diffContent)
expect(result.success).toBe(true)
if (result.success) {
expect(result.content).toBe("unchanged\n")
}
})
it("processes multiple escaped markers in content", async () => {
const originalContent = "<<<<<<< SEARCH\n=======\n>>>>>>> REPLACE\n"
const diffContent =
"<<<<<<< SEARCH\n" +
"\\<<<<<<< SEARCH\n" +
"\\=======\n" +
"\\>>>>>>> REPLACE\n" +
"=======\n" +
"unchanged\n" +
">>>>>>> REPLACE"
const result = await strategy.applyDiff(originalContent, diffContent)
expect(result.success).toBe(true)
if (result.success) {
expect(result.content).toBe("unchanged\n")
}
})
it("allows escaped replace marker in content", () => {
const diff =
"<<<<<<< SEARCH\n" +
"before\n" +
"\\>>>>>>> REPLACE\n" +
"after\n" +
"=======\n" +
"new content\n" +
">>>>>>> REPLACE"
const result = strategy["validateMarkerSequencing"](diff)
expect(result.success).toBe(true)
})
it("allows multiple escaped markers in content", () => {
const diff =
"<<<<<<< SEARCH\n" +
"\\<<<<<<< SEARCH\n" +
"\\=======\n" +
"\\>>>>>>> REPLACE\n" +
"=======\n" +
"new content\n" +
">>>>>>> REPLACE"
const result = strategy["validateMarkerSequencing"](diff)
expect(result.success).toBe(true)
})
it("detects separator when expecting replace", () => {
const diff = "<<<<<<< SEARCH\n" + "content\n" + "=======\n" + "new content\n" + "======="
const result = strategy["validateMarkerSequencing"](diff)