Browse Source

fix travis issue

pull/75/head
Martin Monperrus 8 years ago
parent
commit
ece267fe94
  1. 5
      bibacid-utf8.bib
  2. 16
      bibtexbrowser-test.php
  3. 2
      bibtexbrowser.php

5
bibacid-utf8.bib

@ -224,3 +224,8 @@ MRREVIEWER = {Jean-Fran{\c{c}}ois Clouet},
year = 2015 year = 2015
} }
@article{kjsdf 8,
title = "Entry with + in the key",
author = "Foo Bar",
year = 2017
}

16
bibtexbrowser-test.php

@ -10,6 +10,11 @@ $ phpunit --coverage-html ./coverage btb-test.php
(be sure that xdebug is enabled: /etc/php5/cli/conf.d# ln -s ../../mods-available/xdebug.ini) (be sure that xdebug is enabled: /etc/php5/cli/conf.d# ln -s ../../mods-available/xdebug.ini)
*/ */
// backward compatibility
if (!class_exists('PHPUnit_Framework_TestCase')) {
class_alias('\PHPUnit\Framework\TestCase', 'PHPUnit_Framework_TestCase');
}
function exception_error_handler($severity, $message, $file, $line) { function exception_error_handler($severity, $message, $file, $line) {
if ($severity != E_ERROR) { if ($severity != E_ERROR) {
//trigger_error($message); //trigger_error($message);
@ -93,6 +98,7 @@ class BTBTest extends PHPUnit_Framework_TestCase {
$this->assertEquals("2",$first_entry->getPages()[1]); $this->assertEquals("2",$first_entry->getPages()[1]);
// default style // default style
bibtexbrowser_configure('BIBLIOGRAPHYSTYLE','DefaultBibliographyStyle');
$this->assertEquals("An Article (Foo Bar and Jane Doe), In New Results, volume 5, 2009. [bibtex]",strip_tags($first_entry->toHTML())); $this->assertEquals("An Article (Foo Bar and Jane Doe), In New Results, volume 5, 2009. [bibtex]",strip_tags($first_entry->toHTML()));
$this->assertEquals('<span itemscope="" itemtype="http://schema.org/ScholarlyArticle"><span class="bibtitle" itemprop="name">An Article</span> (<span class="bibauthor"><span itemprop="author" itemtype="http://schema.org/Person">Foo Bar</span> and <span itemprop="author" itemtype="http://schema.org/Person">Jane Doe</span></span>), <span class="bibbooktitle">In <span itemprop="isPartOf">New Results</span></span>, volume 5, <span itemprop="datePublished">2009</span>.<span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Ajournal&amp;rft.atitle=An+Article&amp;rft.jtitle=New+Results&amp;rft.volume=5&amp;rft.issue=&amp;rft.pub=&amp;rfr_id=info%3Asid%2F%3A&amp;rft.date=2009&amp;rft.au=Foo+Bar&amp;rft.au=Jane+Doe"></span></span> <span class="bibmenu"><a class="biburl" title="aKeyA" href="bibtexbrowser.php?key=aKeyA&amp;bib=inline">[bibtex]</a></span>',$first_entry->toHTML()); $this->assertEquals('<span itemscope="" itemtype="http://schema.org/ScholarlyArticle"><span class="bibtitle" itemprop="name">An Article</span> (<span class="bibauthor"><span itemprop="author" itemtype="http://schema.org/Person">Foo Bar</span> and <span itemprop="author" itemtype="http://schema.org/Person">Jane Doe</span></span>), <span class="bibbooktitle">In <span itemprop="isPartOf">New Results</span></span>, volume 5, <span itemprop="datePublished">2009</span>.<span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Ajournal&amp;rft.atitle=An+Article&amp;rft.jtitle=New+Results&amp;rft.volume=5&amp;rft.issue=&amp;rft.pub=&amp;rfr_id=info%3Asid%2F%3A&amp;rft.date=2009&amp;rft.au=Foo+Bar&amp;rft.au=Jane+Doe"></span></span> <span class="bibmenu"><a class="biburl" title="aKeyA" href="bibtexbrowser.php?key=aKeyA&amp;bib=inline">[bibtex]</a></span>',$first_entry->toHTML());
@ -268,6 +274,7 @@ class BTBTest extends PHPUnit_Framework_TestCase {
} }
function test_link_configuration() { function test_link_configuration() {
bibtexbrowser_configure('BIBTEXBROWSER_LINKS_TARGET','_self');
$test_data = fopen('php://memory','x+'); $test_data = fopen('php://memory','x+');
fwrite($test_data, "@book{aKey,pdf={myarticle.pdf}}\n" fwrite($test_data, "@book{aKey,pdf={myarticle.pdf}}\n"
); );
@ -283,6 +290,7 @@ class BTBTest extends PHPUnit_Framework_TestCase {
// see https://github.com/monperrus/bibtexbrowser/pull/14 // see https://github.com/monperrus/bibtexbrowser/pull/14
function test_zotero() { function test_zotero() {
bibtexbrowser_configure('BIBTEXBROWSER_LINKS_TARGET','_self');
$test_data = fopen('php://memory','x+'); $test_data = fopen('php://memory','x+');
fwrite($test_data, "@book{aKey,file={myarticle.pdf}}\n" fwrite($test_data, "@book{aKey,file={myarticle.pdf}}\n"
); );
@ -295,6 +303,7 @@ class BTBTest extends PHPUnit_Framework_TestCase {
// https://github.com/monperrus/bibtexbrowser/issues/40 // https://github.com/monperrus/bibtexbrowser/issues/40
function test_doi_url() { function test_doi_url() {
bibtexbrowser_configure('BIBTEXBROWSER_LINKS_TARGET','_self');
$test_data = fopen('php://memory','x+'); $test_data = fopen('php://memory','x+');
fwrite($test_data, "@Article{Baldwin2014Quantum,Doi={10.1103/PhysRevA.90.012110},Url={http://link.aps.org/doi/10.1103/PhysRevA.90.012110}}" fwrite($test_data, "@Article{Baldwin2014Quantum,Doi={10.1103/PhysRevA.90.012110},Url={http://link.aps.org/doi/10.1103/PhysRevA.90.012110}}"
); );
@ -375,6 +384,7 @@ class BTBTest extends PHPUnit_Framework_TestCase {
# https://github.com/monperrus/bibtexbrowser/pull/51 # https://github.com/monperrus/bibtexbrowser/pull/51
function test_emptyGetPdfLink() { function test_emptyGetPdfLink() {
bibtexbrowser_configure('BIBTEXBROWSER_LINKS_TARGET','_self');
$bibtex = " $bibtex = "
@article{aKey, @article{aKey,
title={\`a Book}, title={\`a Book},
@ -460,6 +470,9 @@ class BTBTest extends PHPUnit_Framework_TestCase {
function test_parsing_author_list() { function test_parsing_author_list() {
// specify parsing of author list // specify parsing of author list
bibtexbrowser_configure('USE_COMMA_AS_NAME_SEPARATOR_IN_OUTPUT', false);
bibtexbrowser_configure('USE_FIRST_THEN_LAST', false);
// default case: one authors // default case: one authors
$bibtex = "@article{aKey61,title={An article Book},author = {Meyer, Heribert}}\n"; $bibtex = "@article{aKey61,title={An article Book},author = {Meyer, Heribert}}\n";
$test_data = fopen('php://memory','x+'); $test_data = fopen('php://memory','x+');
@ -512,6 +525,8 @@ class BTBTest extends PHPUnit_Framework_TestCase {
} }
function test_homepage_link() { function test_homepage_link() {
bibtexbrowser_configure('USE_COMMA_AS_NAME_SEPARATOR_IN_OUTPUT', false);
bibtexbrowser_configure('USE_FIRST_THEN_LAST', false);
$bibtex = "@string{hp_MartinMonperrus={http://www.monperrus.net/martin},hp_FooAcé={http://example.net/}},@article{aKey61,title={An article Book},author = {Martin Monperrus and Foo Acé and Monperrus, Martin}}\n"; $bibtex = "@string{hp_MartinMonperrus={http://www.monperrus.net/martin},hp_FooAcé={http://example.net/}},@article{aKey61,title={An article Book},author = {Martin Monperrus and Foo Acé and Monperrus, Martin}}\n";
$test_data = fopen('php://memory','x+'); $test_data = fopen('php://memory','x+');
fwrite($test_data, $bibtex); fwrite($test_data, $bibtex);
@ -612,6 +627,7 @@ class BTBTest extends PHPUnit_Framework_TestCase {
} }
function testscholarlink() { function testscholarlink() {
bibtexbrowser_configure('BIBTEXBROWSER_LINKS_TARGET','_self');
bibtexbrowser_configure('BIBTEXBROWSER_BIBTEX_VIEW', 'original'); bibtexbrowser_configure('BIBTEXBROWSER_BIBTEX_VIEW', 'original');
$bibtex = "@article{key,title={An article Book},gsid={1234},author = {Martin Monperrus and Foo Ac\'e and Monperrus, Martin}}"; $bibtex = "@article{key,title={An article Book},gsid={1234},author = {Martin Monperrus and Foo Ac\'e and Monperrus, Martin}}";
$test_data = fopen('php://memory','x+'); $test_data = fopen('php://memory','x+');

2
bibtexbrowser.php

@ -2469,7 +2469,7 @@ function VancouverBibliographyStyle(&$bibentry) {
} }
// Ensure punctuation mark at title's end // Ensure punctuation mark at title's end
if (strpos(":.;,?!", substr(rtrim($title), -1)) > 0) {
if (strlen(rtrim($title))>0 && strpos(":.;,?!", substr(rtrim($title), -1)) > 0) {
$title = $title . ' '; $title = $title . ' ';
} else { } else {
$title = $title . '. '; $title = $title . '. ';

Loading…
Cancel
Save