Skip to content

SF-3680 Ensure that a verse that is not in a para has a blank segment #3665

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

Open
pmachapman wants to merge 1 commit into
base: master
Choose a base branch
from
Open

SF-3680 Ensure that a verse that is not in a para has a blank segment #3665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/SIL.XForge.Scripture/Services/DeltaUsxMapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ public IEnumerable<ChapterDelta> ToChapterDeltas(XDocument usxDoc)
case "para":
if (state.ImpliedParagraph)
{
SegmentEnded(chapterDelta, state.CurRef);
chapterDelta.Insert('\n');
state.ImpliedParagraph = false;
}
Expand Down
75 changes: 75 additions & 0 deletions test/SIL.XForge.Scripture.Tests/Services/DeltaUsxMapperTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1152,6 +1152,57 @@ public void ToUsx_ImpliedParagraphTwice()
Assert.IsTrue(XNode.DeepEquals(newUsxDoc, expected));
}

[Test]
public void ToUsx_ImpliedParagraphForVerseWithEmptyParagraphAfter()
{
var chapterDelta = new ChapterDelta(
1,
1,
true,
Delta
.New()
.InsertBook("PHM")
.InsertChapter("1")
.InsertVerse("1")
.InsertBlank("verse_1_1")
.Insert("\n")
.InsertBlank("verse_1_1/p_1")
.InsertPara("p")
);

var mapper = new DeltaUsxMapper(_mapperGuidService, _logger, _exceptionHandler);
XDocument newUsxDoc = mapper.ToUsx(Usx("PHM"), [chapterDelta]);

XDocument expected = Usx("PHM", Chapter("1"), Verse("1"), Para("p"));
Assert.IsTrue(XNode.DeepEquals(newUsxDoc, expected));
}

[Test]
public void ToUsx_ImpliedParagraphMissingForVerseWithEmptyParagraphAfter()
{
// This is the same test as ToUsx_ImpliedParagraphForVerseWithEmptyParagraphAfter
// but with deltas created before SF-3680
var chapterDelta = new ChapterDelta(
1,
1,
true,
Delta
.New()
.InsertBook("PHM")
.InsertChapter("1")
.InsertVerse("1")
.Insert("\n")
.InsertBlank("verse_1_1/p_1")
.InsertPara("p")
);

var mapper = new DeltaUsxMapper(_mapperGuidService, _logger, _exceptionHandler);
XDocument newUsxDoc = mapper.ToUsx(Usx("PHM"), [chapterDelta]);

XDocument expected = Usx("PHM", Chapter("1"), Verse("1"), Para("p"));
Assert.IsTrue(XNode.DeepEquals(newUsxDoc, expected));
}

[Test]
public void ToUsx_ImpliedParagraphInVerse()
{
Expand Down Expand Up @@ -3271,6 +3322,30 @@ public void ToDelta_ImpliedParagraph()
Assert.IsTrue(chapterDeltas[0].Delta.DeepEquals(expected));
}

[Test]
public void ToDelta_ImpliedParagraphForVerseWithEmptyParagraphAfter()
{
XDocument usxDoc = Usx("PHM", Chapter("1"), Verse("1"), Para("p"));

var mapper = new DeltaUsxMapper(_mapperGuidService, _logger, _exceptionHandler);
List<ChapterDelta> chapterDeltas = [.. mapper.ToChapterDeltas(usxDoc)];

var expected = Delta
.New()
.InsertBook("PHM")
.InsertChapter("1")
.InsertVerse("1")
.InsertBlank("verse_1_1")
.Insert("\n")
.InsertBlank("verse_1_1/p_1")
.InsertPara("p");

Assert.That(chapterDeltas[0].Number, Is.EqualTo(1));
Assert.That(chapterDeltas[0].LastVerse, Is.EqualTo(1));
Assert.That(chapterDeltas[0].IsValid, Is.True);
Assert.IsTrue(chapterDeltas[0].Delta.DeepEquals(expected));
}

[Test]
public void ToDelta_ImpliedParagraphInVerse()
{
Expand Down
Loading