aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Weiske <cweiske@cweiske.de>2018-09-23 21:03:34 +0200
committerChristian Weiske <cweiske@cweiske.de>2018-09-23 21:03:39 +0200
commitc357ddbafa4a6f66822db6528c07268f60b5c28d (patch)
tree8ead05c5e938a5c35e225b480c5da29aec476121
parent2b59f9d35c81a9d25e87a4d9c48ee1097756a3bb (diff)
downloadgrauphel-c357ddbafa4a6f66822db6528c07268f60b5c28d.tar.gz
grauphel-c357ddbafa4a6f66822db6528c07268f60b5c28d.zip
Support phpunit 7, let travis test PHP 7.2 and 7.1
-rw-r--r--.travis.yml3
-rw-r--r--tests/Lib/Converter/HtmlTest.php4
-rw-r--r--tests/Lib/Search/QueryParserTest.php2
-rw-r--r--tests/html2tomboyXslTest.php5
4 files changed, 8 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index 09c9a85..c7216ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,8 @@ addons:
- diffutils
- xsltproc
php:
- - 7
+ - 7.2
+ - 7.1
- 5.6
script:
- cd tests
diff --git a/tests/Lib/Converter/HtmlTest.php b/tests/Lib/Converter/HtmlTest.php
index b02e39c..7af71d7 100644
--- a/tests/Lib/Converter/HtmlTest.php
+++ b/tests/Lib/Converter/HtmlTest.php
@@ -2,7 +2,7 @@
require_once __DIR__ . '/../../../lib/converter/base.php';
require_once __DIR__ . '/../../../lib/converter/html.php';
-class Lib_Converter_HtmlTest extends PHPUnit_Framework_TestCase
+class Lib_Converter_HtmlTest extends \PHPUnit\Framework\TestCase
{
public function testConvert()
{
@@ -28,4 +28,4 @@ class Lib_Converter_HtmlTest extends PHPUnit_Framework_TestCase
);
}
}
-?> \ No newline at end of file
+?>
diff --git a/tests/Lib/Search/QueryParserTest.php b/tests/Lib/Search/QueryParserTest.php
index 122138f..4e706f9 100644
--- a/tests/Lib/Search/QueryParserTest.php
+++ b/tests/Lib/Search/QueryParserTest.php
@@ -3,7 +3,7 @@ require_once __DIR__ . '/../../../lib/search/queryparser.php';
use OCA\Grauphel\Search\Queryparser;
-class Lib_Search_QueryParserTest extends PHPUnit_Framework_TestCase
+class Lib_Search_QueryParserTest extends \PHPUnit\Framework\TestCase
{
public function testParseSimple()
{
diff --git a/tests/html2tomboyXslTest.php b/tests/html2tomboyXslTest.php
index 5e9139e..199f2e4 100644
--- a/tests/html2tomboyXslTest.php
+++ b/tests/html2tomboyXslTest.php
@@ -1,5 +1,5 @@
<?php
-class html2tomboyXslTest extends PHPUnit_Framework_TestCase
+class html2tomboyXslTest extends \PHPUnit\Framework\TestCase
{
/**
* Use xsltproc and diff to check if the XSL file generates
@@ -7,6 +7,7 @@ class html2tomboyXslTest extends PHPUnit_Framework_TestCase
*/
public function testFormat()
{
+ chdir(__DIR__);
exec(
'xsltproc'
. ' ../templates/html2tomboy.xsl'
@@ -21,4 +22,4 @@ class html2tomboyXslTest extends PHPUnit_Framework_TestCase
);
}
}
-?> \ No newline at end of file
+?>