Commit 4a85726e authored by Klaus Weidenbach's avatar Klaus Weidenbach
Browse files

👷 Update PHPUnit to current stable 6.

Update requirements to PHP7 for dev.
Add php-mock-phpunit to mock and stub global functions in a better way.
parent cb2eee1d
......@@ -33,11 +33,11 @@ addons:
# - mariadb
# - postgresql
# any PHP version we want to test against, our unit tests require PHP>=5.6
# any PHP version we want to test against, current stable phpunit requires PHP >= 7.0
php:
- '5.6'
- '7.0'
- '7.1'
# HHVM does not fulfil PHPUnit platform requirements as being compatible with PHP7 yet
#- 'hhvm'
# list of environments to test
......@@ -108,8 +108,6 @@ install:
before_script:
# Use code coverage config for phpunit
- if [[ ! -z $CODECOV ]]; then export PHPUCOV=""; fi
# HHVM needs xdebug for code coverage, but extremely slow
#- if [[ $TRAVIS_PHP_VERSION =~ ^hhvm ]]; then echo 'xdebug.enable = On' >> /etc/hhvm/php.ini; fi
# Some preparation tasks of environment
- ./tests/travis/prepare.sh
# DB specific prepare scripts
......
......@@ -33,11 +33,12 @@
"pixel418/markdownify": "^2.2"
},
"require-dev" : {
"php" : ">=5.6",
"phpunit/phpunit" : "^5.7",
"php" : ">=7.0",
"phpunit/phpunit" : "^6.0",
"behat/behat" : "@stable",
"behat/mink-extension": "@stable",
"behat/mink-goutte-driver": "@stable"
"behat/mink-goutte-driver": "@stable",
"php-mock/php-mock-phpunit": "^2.0"
},
"autoload" : {
"psr-4" : {
......
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/5.7/phpunit.xsd"
backupGlobals="false"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
bootstrap="../boot.php"
forceCoversAnnotation="false"
beStrictAboutCoversAnnotation="true"
beStrictAboutOutputDuringTests="true"
beStrictAboutTestsThatDoNotTestAnything="true"
beStrictAboutTodoAnnotatedTests="true"
processIsolation="false"
verbose="true">
<testsuite name="Hubzilla default Test Suite">
<directory suffix="Test.php">./unit/</directory>
......@@ -31,7 +30,8 @@
</filter>
<logging>
<log type="junit" target="./results/junit.xml" logIncompleteSkipped="false"/>
<log type="coverage-html" target="./results/report/" lowUpperBound="35"
highLowerBound="70"/>
<log type="coverage-clover" target="./results/coverage-clover.xml"/>
<log type="coverage-html" target="./results/coverage-report/" lowUpperBound="35"
highLowerBound="70"/>
</logging>
</phpunit>
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/5.7/phpunit.xsd"
backupGlobals="false"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
bootstrap="../boot.php"
forceCoversAnnotation="false"
beStrictAboutCoversAnnotation="true"
beStrictAboutOutputDuringTests="true"
beStrictAboutTestsThatDoNotTestAnything="true"
beStrictAboutTodoAnnotatedTests="true"
processIsolation="true"
verbose="true">
<testsuite name="Hubzilla default Test Suite">
<directory suffix="Test.php">./unit/</directory>
......@@ -28,7 +27,8 @@
</filter>
<logging>
<log type="junit" target="./results/junit.xml" logIncompleteSkipped="false"/>
<log type="coverage-html" target="./results/report/" lowUpperBound="35"
highLowerBound="70"/>
<log type="coverage-clover" target="./results/coverage-clover.xml"/>
<log type="coverage-html" target="./results/coverage-report/" lowUpperBound="35"
highLowerBound="70"/>
</logging>
</phpunit>
<?php
/*
* Copyright (c) 2016 Hubzilla
* Copyright (c) 2016-2017 Hubzilla
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
......@@ -21,90 +21,75 @@
* SOFTWARE.
*/
// Global namespace for fully qualified \App class.
namespace {
// General channel permissions in boot.php
// 0 = Only you
define ( 'PERMS_PUBLIC' , 0x0001 ); // anybody
define ( 'PERMS_NETWORK' , 0x0002 ); // anybody in this network
define ( 'PERMS_SITE' , 0x0004 ); // anybody on this site
define ( 'PERMS_CONTACTS' , 0x0008 ); // any of my connections
define ( 'PERMS_SPECIFIC' , 0x0080 ); // only specific connections
define ( 'PERMS_AUTHED' , 0x0100 ); // anybody authenticated (could include visitors from other networks)
define ( 'PERMS_PENDING' , 0x0200 ); // any connections including those who haven't yet been approved
// log levels in boot.php
define ( 'LOGGER_DEBUG', 2 );
namespace Zotlabs\Tests\Unit\Lib;
// Stub global fully qualified \App class for static function calls
class App {
// Stub get_hostname()
public static function get_hostname() {
return 'phpunit';
}
}
}
use phpmock\phpunit\PHPMock;
use Zotlabs\Tests\Unit\UnitTestCase;
use Zotlabs\Lib\PermissionDescription;
// Stub global functions used in PermissionDescription with the help of
// PHP's namespace resolution rules.
namespace Zotlabs\Lib {
// Stub global translate function t()
function t($s) {
return $s;
}
// Stub global log function logger()
function logger($msg, $level = LOGGER_NORMAL, $priority = LOG_INFO) {
// doesn't matter
}
}
/**
* @brief Unit Test case for PermissionDescription class.
*/
class PermissionDescriptionTest extends UnitTestCase {
// regular namespace for this unit test
namespace Zotlabs\Tests\Unit\Lib {
use PHPMock;
use Zotlabs\Tests\Unit\UnitTestCase;
use Zotlabs\Lib\PermissionDescription;
public function testFromDescription() {
$permDesc = PermissionDescription::fromDescription('test');
$permDesc2 = PermissionDescription::fromDescription('test');
$permDesc3 = PermissionDescription::fromDescription('test2');
/**
* @brief Unit Test case for ConnectionPool class.
*/
class PermissionDescriptionTest extends UnitTestCase {
$this->assertEquals($permDesc, $permDesc2);
$this->assertNotEquals($permDesc, $permDesc3);
}
public function testFromDescription() {
$permDesc = PermissionDescription::fromDescription('test');
$permDesc2 = PermissionDescription::fromDescription('test');
$permDesc3 = PermissionDescription::fromDescription('test2');
public function testFromStandalonePermission() {
// Create a stub for global function t()
$t = $this->getFunctionMock('Zotlabs\Lib', 't');
$t->expects($this->atLeastOnce())->willReturnCallback(
function ($string) {
return $string;
}
);
// Create a mock for global function logger()
$this->getFunctionMock('Zotlabs\Lib', 'logger');
$this->assertEquals($permDesc, $permDesc2);
$this->assertNotEquals($permDesc, $permDesc3);
}
$permDescUnknown = PermissionDescription::fromStandalonePermission(-1);
$permDescSelf = PermissionDescription::fromStandalonePermission(0);
public function testFromStandalonePermission() {
$permDescUnknown = PermissionDescription::fromStandalonePermission(-1);
$permDescSelf = PermissionDescription::fromStandalonePermission(0);
$this->assertNull($permDescUnknown);
$this->assertNotNull($permDescSelf);
}
$this->assertNull($permDescUnknown);
$this->assertNotNull($permDescSelf);
}
public function testFromGlobalPermission() {
//$permDesc = PermissionDescription::fromGlobalPermission('view_profile');
public function testFromGlobalPermission() {
//$permDesc = PermissionDescription::fromGlobalPermission('view_profile');
$this->markTestIncomplete(
'The method fromGlobalPermission() is not yet testable ...'
);
}
$this->markTestIncomplete(
'For this test we need more stubs...'
);
}
public function testGetPermissionDescription() {
// Create a stub for global function t()
$t = $this->getFunctionMock('Zotlabs\Lib', 't');
$t->expects($this->atLeastOnce())->willReturnCallback(
function ($string) {
return $string;
}
);
// Create a mock for global function logger()
$this->getFunctionMock('Zotlabs\Lib', 'logger');
public function testGetPermissionDescription() {
// Create a stub for the PermissionDescription class
$stub = $this->createMock(PermissionDescription::class);
$stub->method('get_permission_description')
->will($this->returnArgument(0));
// fromStandalonePermission uses get_permission_description(), so that will not help
//$permDescSelf = PermissionDescription::fromStandalonePermission(0);
//$permDescPublic = PermissionDescription::fromStandalonePermission(PERMS_PUBLIC);
$permDescSelf = PermissionDescription::fromStandalonePermission(0);
$this->assertInstanceOf(PermissionDescription::class, $permDescSelf);
$this->assertEquals($permDescSelf->get_permission_description(), 'Only me');
$this->markTestIncomplete(
'For this test we need a mock of PermissionDescription...'
);
//$permDescSelf =
//$this->assertEquals($permDescSelf->, 'Only me');
//$this->assertEquals($permDescPublic, 'Public');
}
$permDescPublic = PermissionDescription::fromStandalonePermission(PERMS_PUBLIC);
$this->assertEquals($permDescPublic->get_permission_description(), 'Public');
}
}
......@@ -361,9 +361,6 @@ return array(
'Sabre\\Xml\\Writer' => $vendorDir . '/sabre/xml/lib/Writer.php',
'Sabre\\Xml\\XmlDeserializable' => $vendorDir . '/sabre/xml/lib/XmlDeserializable.php',
'Sabre\\Xml\\XmlSerializable' => $vendorDir . '/sabre/xml/lib/XmlSerializable.php',
'Test\\Markdownify\\ConverterExtraTest' => $vendorDir . '/pixel418/markdownify/test/ConverterExtraTest.php',
'Test\\Markdownify\\ConverterTest' => $vendorDir . '/pixel418/markdownify/test/ConverterTest.php',
'Test\\Markdownify\\ConverterTestCase' => $vendorDir . '/pixel418/markdownify/test/ConverterTestCase.php',
'Zotlabs\\Access\\AccessList' => $baseDir . '/Zotlabs/Access/AccessList.php',
'Zotlabs\\Access\\PermissionLimits' => $baseDir . '/Zotlabs/Access/PermissionLimits.php',
'Zotlabs\\Access\\PermissionRoles' => $baseDir . '/Zotlabs/Access/PermissionRoles.php',
......
......@@ -476,9 +476,6 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
'Sabre\\Xml\\Writer' => __DIR__ . '/..' . '/sabre/xml/lib/Writer.php',
'Sabre\\Xml\\XmlDeserializable' => __DIR__ . '/..' . '/sabre/xml/lib/XmlDeserializable.php',
'Sabre\\Xml\\XmlSerializable' => __DIR__ . '/..' . '/sabre/xml/lib/XmlSerializable.php',
'Test\\Markdownify\\ConverterExtraTest' => __DIR__ . '/..' . '/pixel418/markdownify/test/ConverterExtraTest.php',
'Test\\Markdownify\\ConverterTest' => __DIR__ . '/..' . '/pixel418/markdownify/test/ConverterTest.php',
'Test\\Markdownify\\ConverterTestCase' => __DIR__ . '/..' . '/pixel418/markdownify/test/ConverterTestCase.php',
'Zotlabs\\Access\\AccessList' => __DIR__ . '/../..' . '/Zotlabs/Access/AccessList.php',
'Zotlabs\\Access\\PermissionLimits' => __DIR__ . '/../..' . '/Zotlabs/Access/PermissionLimits.php',
'Zotlabs\\Access\\PermissionRoles' => __DIR__ . '/../..' . '/Zotlabs/Access/PermissionRoles.php',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment