yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-03 17:59:33 +02:00
Code Issues Releases Wiki Activity

git-svn-id: https://only.mawhrin.net/repos/FBReaderJ/trunk@87 6a642e6f-84f6-412e-ac94-c4a38d5a04b0

Browse source
This commit is contained in:
tushkanchik 2007-11-03 02:44:05 +00:00
parent 900ae7c7a6
commit f5a08b25d7
2 changed files with 59 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/org/fbreader/bookmodel/BookReader.java
View file

@ -24,7 +24,7 @@ public class BookReader {
myBookModel = model; myBookModel = model;
} }
public void flushTextBufferToParagraph() { private void flushTextBufferToParagraph() {
if (myBuffer.length() != 0) { if (myBuffer.length() != 0) {
myCurrentTextModel.addText(myBuffer); myCurrentTextModel.addText(myBuffer);
myBuffer.delete(0, myBuffer.length()); myBuffer.delete(0, myBuffer.length());

58
test/org/test/fbreader/formats/fb2/TestFB2Reader.java
View file

@ -131,4 +131,62 @@ public class TestFB2Reader extends TestCase {
assertEquals(model.dump(), "[PARAGRAPH]\n[TEXT]Note[/TEXT][/PARAGRAPH]\n"); assertEquals(model.dump(), "[PARAGRAPH]\n[TEXT]Note[/TEXT][/PARAGRAPH]\n");
} }
public void testStanza() {
FB2Reader reader = new FB2Reader("FB2ReaderTests/stanza.fb2");
ZLTextModel model = reader.read().getBookModel();
assertEquals(model.getParagraph(0).getKind(), ZLTextParagraph.Kind.BEFORE_SKIP_PARAGRAPH);
assertEquals(model.getParagraph(2).getKind(), ZLTextParagraph.Kind.AFTER_SKIP_PARAGRAPH);
assertEquals(model.getParagraph(1).getKind(), ZLTextParagraph.Kind.TEXT_PARAGRAPH);
int stanza = FB2Tag.STANZA.ordinal();
assertEquals(model.dump(), "[PARAGRAPH]\n[CONTROL " + stanza +
"][/PARAGRAPH]\n[PARAGRAPH]\n[CONTROL " + stanza + "][CONTROL " +
FB2Tag.V.ordinal() + "][TEXT]Stanza[/TEXT][/PARAGRAPH]\n[PARAGRAPH]\n[CONTROL " +
stanza + "][/PARAGRAPH]\n");
}
public void testAnnotation() {
FB2Reader reader = new FB2Reader("FB2ReaderTests/annotation.fb2");
ZLTextModel model = reader.read().getBookModel();
assertEquals(model.dump(), "[PARAGRAPH]\n[CONTROL " +
FB2Tag.ANNOTATION.ordinal() + "][TEXT]annotation[/TEXT][/PARAGRAPH]\n");
}
public void testAnnotationBeforeBody() {
FB2Reader reader = new FB2Reader("FB2ReaderTests/annotation_before.fb2");
ZLTextModel model = reader.read().getBookModel();
assertEquals(model.getParagraph(1).getKind(),
ZLTextParagraph.Kind.END_OF_SECTION_PARAGRAPH);
assertEquals(model.dump(), "[PARAGRAPH]\n[CONTROL " +
FB2Tag.ANNOTATION.ordinal() +
"][TEXT]annotation[/TEXT][/PARAGRAPH]\n[PARAGRAPH]\n[/PARAGRAPH]\n");
}
public void testEndOfSection() {
FB2Reader reader = new FB2Reader("FB2ReaderTests/section.fb2");
ZLTextModel model = reader.read().getBookModel();
assertEquals(model.getParagraph(1).getKind(),
ZLTextParagraph.Kind.END_OF_SECTION_PARAGRAPH);
assertEquals(model.dump(), "[PARAGRAPH]\n[TEXT]section[/TEXT][/PARAGRAPH]\n[PARAGRAPH]\n[/PARAGRAPH]\n");
}
public void testTitle() {
FB2Reader reader = new FB2Reader("FB2ReaderTests/title.fb2");
ZLTextModel model = reader.read().getBookModel();
assertEquals(model.dump(), "[PARAGRAPH]\n[CONTROL " +
FB2Tag.TITLE.ordinal() + "][TEXT]Title[/TEXT][/PARAGRAPH]\n");
}
public void testPoemTitle() {
FB2Reader reader = new FB2Reader("FB2ReaderTests/poem_title.fb2");
ZLTextModel model = reader.read().getBookModel();
assertEquals(model.dump(), "[PARAGRAPH]\n[CONTROL " +
FB2Tag.POEM.ordinal() + "][TEXT]Title[/TEXT][/PARAGRAPH]\n");
}
public void testSectionTitle() {
FB2Reader reader = new FB2Reader("FB2ReaderTests/section_title.fb2");
ZLTextModel model = reader.read().getBookModel();
assertEquals(model.dump(), "[PARAGRAPH]\n[CONTROL " +
FB2Tag.SECTION.ordinal() + "][TEXT]Title[/TEXT][/PARAGRAPH]\n");
}
} }