Skip to content

Commit

Permalink
new Testfile and first implementation of new test cases.
Browse files Browse the repository at this point in the history
  • Loading branch information
boceckts committed Dec 15, 2015
1 parent c201d7c commit b773a12
Show file tree
Hide file tree
Showing 14 changed files with 161 additions and 6 deletions.
11 changes: 8 additions & 3 deletions src/main/java/net/sf/jabref/importer/ImportFormatReader.java
Original file line number Diff line number Diff line change
Expand Up @@ -131,13 +131,18 @@ public List<BibtexEntry> importFromFile(String format, String filename, OutputPr
public List<BibtexEntry> importFromFile(ImportFormat importer, String filename, OutputPrinter status) throws IOException {
File file = new File(filename);

try (InputStream stream = new FileInputStream(file)) {
try (InputStream stream = new FileInputStream(file);
BufferedInputStream bis = new BufferedInputStream(stream)) {

if (!importer.isRecognizedFormat(stream)) {
bis.mark(Integer.MAX_VALUE);

if (!importer.isRecognizedFormat(bis)) {
throw new IOException("Wrong file format");
}

return importer.importEntries(stream, status);
bis.reset();

return importer.importEntries(bis, status);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

import net.sf.jabref.Globals;
import net.sf.jabref.JabRefPreferences;
import net.sf.jabref.bibtex.BibtexEntryAssert;
import net.sf.jabref.importer.OutputPrinterToNull;
import net.sf.jabref.model.entry.BibtexEntry;

Expand Down Expand Up @@ -53,7 +54,7 @@ public void testIsRecognizedFormat() throws Exception {

//Test with txt File which is in recognized Format
Assert.assertTrue(importer.isRecognizedFormat(MedlinePlainImporter.class
.getResourceAsStream("MedlinePLainImporterTest.txt")));
.getResourceAsStream("MedlinePlainImporterTest.txt")));

}

Expand All @@ -62,7 +63,7 @@ public void testImportEntries() throws Exception {

//create entries list from the txt file
List<BibtexEntry> entries = importer.importEntries(
MedlinePlainImporter.class.getResourceAsStream("MedlinePLainImporterTest.txt"),
MedlinePlainImporter.class.getResourceAsStream("MedlinePlainImporterTest.txt"),
new OutputPrinterToNull());
Assert.assertEquals(7, entries.size());

Expand All @@ -78,13 +79,31 @@ public void testImportEntries() throws Exception {
Assert.assertEquals("06", test2.getField("month"));
Assert.assertNull(test2.getField("author"));
Assert.assertNull(test2.getField("title"));
}

@Test
public void testEmptyImport() throws Exception {
//Test entries with empty txt File
List<BibtexEntry> emptyEntries = importer.importEntries(
MedlinePlainImporter.class.getResourceAsStream("MedlinePLainImporterTestEmpty.txt"),
MedlinePlainImporter.class.getResourceAsStream("MedlinePlainImporterTestEmpty.txt"),
new OutputPrinterToNull());
Assert.assertEquals(0, emptyEntries.size());
}

@Test
public void testSingleEntries() throws Exception {
for (int n = 1; n < 6; n++) {
try (InputStream is = MedlinePlainImporter.class.getResourceAsStream("MedlinePlainImporterTest" + n
+ ".txt");
InputStream nis = MedlinePlainImporter.class.getResourceAsStream("MedlinePlainImporterTestBib" + n
+ ".bib")) {

List<BibtexEntry> entries = importer.importEntries(is, new OutputPrinterToNull());
Assert.assertNotNull(entries);
Assert.assertEquals(1, entries.size());
BibtexEntryAssert.assertEquals(nis, entries.get(0));
}
}
}

@Test
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
PMID- 20481061
OWN - NLM
STAT- MEDLINE
DA - 20100520
DCOM- 20100526
LR - 20150731
IS - 0955-2359 (Print)
IS - 0955-2359 (Linking)
VI - 20
IP - 4
DP - 2009
TI - From danger and motherhood to health and beauty: health advice for the factory
girl in early twentieth-century Britain.
PG - 454-81
AB - A survey of government reports and the archives and journals of other agencies
interested in industrial health in early twentieth-century Britain has led us to
conclude that, in addition to apprehension about the potentially harmful impact
of industrial work on the reproductive health of women, there was a great deal of
interest in the health of young, unmarried girls in the workplace, particularly
the factory. Adopting a broader time frame, we suggest that the First World War,
with its emphasis on the reproductive health of women, was an anomalous
experience in a broader trend which stressed the growing acceptability of women's
work within industry. Concern with girls' health and welfare embraced hygiene,
diet, exercise, recreation, fashion and beauty within and outside of the
workplace, as well as the impact of the boredom and monotony associated with
industrial work. The health problems of young women workers tended to be
associated with behaviour and environment rather than biology, as were anxieties
about the impact of work on morals, habits and character. Efforts to ensure that
young female factory workers would be equipped to take their place as citizens
and parents, we argue, often dovetailed rather than diverged with the 'boy
labour' question.
FAU - Long, Vicky
AU - Long V
AD - Centre for the History of Science, Technology and Medicine, University of
Manchester. [email protected]
FAU - Marland, Hilary
AU - Marland H
LA - eng
GR - /076053/Z/04/Z/Wellcome Trust/United Kingdom
GR - 076053/Wellcome Trust/United Kingdom
PT - Historical Article
PT - Journal Article
PT - Research Support, Non-U.S. Gov't
PL - England
TA - 20 Century Br Hist
JT - 20 century British history
JID - 9015384
SB - QIS
MH - Attitude to Health
MH - Employment/psychology
MH - Female
MH - Gender Identity
MH - Great Britain
MH - History, 20th Century
MH - Humans
MH - Occupational Health/*history
MH - Reproductive Medicine/*history
MH - Women, Working/*history/psychology
PMC - PMC4513071
MID - EMS54115
OID - NLM: EMS54115
OID - NLM: PMC4513071
EDAT- 2009/01/01 00:00
MHDA- 2010/05/27 06:00
CRDT- 2010/05/21 06:00
PST - ppublish
SO - 20 Century Br Hist. 2009;20(4):454-81.
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
PMC -22664230
TI-
BTI -
FAU -
FED - Some Editor
PT - Clinical Conference
FED - Some test data
JT - Test Journal
PG -
PL -
IS -
VI -
AB - Old Abstract
AB - new abstract
DP - 2013 06 10
MH -
AID -
CON - First Comment
CIN - Different Comment
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
PMCR- 20481061
TI - This is a Testtitle
TI - This title should be appended:
TI - This title should also be appended
PT - Book
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
PMID-22664220
PT - Technical Report
AID - doi:10.1016/j.cpr.2005.02.002
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
PMID-22664238
PT - Editorial
JT - Inproceedings book title
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
PMID-96578310
PT - Overall
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
PMID-45984220
PT -
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
@Article{LongMarland2009,
Title = {From danger and motherhood to health and beauty: health advice for the factory girl in early twentieth-century Britain.},
Author = {Long, Vicky and Marland, Hilary},
Journal = {20 century British history},
Year = {2009},
Pages = {454-81},
Volume = {20},
Abstract = {A survey of government reports and the archives and journals of other agencies interested in industrial health in early twentieth-century Britain has led us to conclude that, in addition to apprehension about the potentially harmful impact of industrial work on the reproductive health of women, there was a great deal of interest in the health of young, unmarried girls in the workplace, particularly the factory. Adopting a broader time frame, we suggest that the First World War, with its emphasis on the reproductive health of women, was an anomalous experience in a broader trend which stressed the growing acceptability of women's work within industry. Concern with girls' health and welfare embraced hygiene, diet, exercise, recreation, fashion and beauty within and outside of the workplace, as well as the impact of the boredom and monotony associated with industrial work. The health problems of young women workers tended to be associated with behaviour and environment rather than biology, as were anxieties about the impact of work on morals, habits and character. Efforts to ensure that young female factory workers would be equipped to take their place as citizens and parents, we argue, often dovetailed rather than diverged with the 'boy labour' question.},
Address = {England},
ISSN = {0955-2359 (Linking)},
Keywords = {Attitude to Health, Employment/psychology, Female, Gender Identity, Great Britain, History, 20th Century, Humans, Occupational Health/*history, Reproductive Medicine/*history, Women, Working/*history/psychology}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@Conference{Editor2013,
Year = {2013},
Editor = {Editor, Some and test data, Some},
Month = {06},
Abstract = {Old Abstract
new abstract},
Comment = {First Comment Different Comment},
Journal = {Test Journal}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@Book{,
Title = {This is a Testtitle: This title should be appended: This title should also be appended}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@TechReport{,
DOI = {10.1016/j.cpr.2005.02.002}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@InProceedings{,
Booktitle = {Inproceedings book title}
}

0 comments on commit b773a12

Please sign in to comment.