Skip to content

Adapt CSL tests to CRLF and LF#2306

Merged
matthiasgeiger merged 2 commits into
masterfrom
fixCSLTest
Nov 22, 2016
Merged

Adapt CSL tests to CRLF and LF#2306
matthiasgeiger merged 2 commits into
masterfrom
fixCSLTest

Conversation

@koppor

@koppor koppor commented Nov 21, 2016

Copy link
Copy Markdown
Member

The discussion at michel-kraemer/citeproc-java@729ca2c revealed that \r does not appear as line separator alone. Thus, our tests should be adapted accordingly.

Refs JabRef#174

@koppor koppor added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Nov 21, 2016

@matthiasgeiger matthiasgeiger left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see comments 😉

}

@Test
public void testIgnoreeCarriageReturnNewLine() {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ignore

@Test
public void testIgnoreeCarriageReturnNewLine() {
BibEntry entry = new BibEntry();
entry.setField(FieldName.AUTHOR, "Last, First and\nDoe, Jane");

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be \r\n?

@matthiasgeiger matthiasgeiger merged commit c26f01e into master Nov 22, 2016
@koppor koppor deleted the fixCSLTest branch November 23, 2016 01:12
Siedlerchr added a commit that referenced this pull request Nov 27, 2016
* upstream/master: (36 commits)
  Rework DBLPFetcher to new structure (#2314)
  Consider dev tag in version comparison (#2312)
  Update diffutils from 1.3.0 to 2.1.1
  Replace usages of Throwable with Exception (#2310)
  Add missing srcDir statement
  improve documentation of save order limitation - see #2305
  Adapt CSL tests to CRLF and LF (#2306)
  Use SPDX license identifiers
  Add key format of #2275 as requirement to CONTRIBUTING.md
  Add fallback exception handler (#2287)
  Update citeproc dependency to 1.0.1 (#2303)
  Remove duplicate code getResolvedFieldOrAlias (#2296)
  Update testCompile dependencies (mockito-core, wiremock)
  Change execution order (#2302)
  Use https for files.jabref.org
  Use compileJava instead of getdeps to decrease build time even more
  Update install4j from 6.1.1 to 6.1.3
  Fix local metadata synchronization
  Fix NullPointerException in ConnectToSharedDatabaseDialog (#2297)
  The error message "No suitable driver found" will not appear when JabRef connects on startup. (#2295)
  ...

# Conflicts:
#	src/main/java/net/sf/jabref/logic/util/io/FileUtil.java
Siedlerchr added a commit that referenced this pull request Nov 28, 2016
…ntentSelector

* 'master' of https://github.com/Siedlerchr/jabref:
  Rework DBLPFetcher to new structure (#2314)
  Consider dev tag in version comparison (#2312)
  Update diffutils from 1.3.0 to 2.1.1
  Replace usages of Throwable with Exception (#2310)
  Add missing srcDir statement
  improve documentation of save order limitation - see #2305
  Adapt CSL tests to CRLF and LF (#2306)
  Use SPDX license identifiers
  Add key format of #2275 as requirement to CONTRIBUTING.md
  Add fallback exception handler (#2287)
  Update citeproc dependency to 1.0.1 (#2303)
  Remove duplicate code getResolvedFieldOrAlias (#2296)
  Update testCompile dependencies (mockito-core, wiremock)
  Change execution order (#2302)
  Use https for files.jabref.org
  Use compileJava instead of getdeps to decrease build time even more
  Update install4j from 6.1.1 to 6.1.3
  Fix local metadata synchronization
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants