summaryrefslogtreecommitdiffstats
path: root/tests/unit
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2014-05-15 23:20:52 +0200
committerBernhard Posselt <dev@bernhard-posselt.com>2014-05-15 23:20:52 +0200
commit0f327d610517922eb7243929cee91aa29d9d2675 (patch)
tree005e4583fdf0523b3ab27af960c732d52ffcdfa3 /tests/unit
parent1a41906247430389141d0faf44a1f42858892835 (diff)
use custom trait to fix tests on 5.4
Diffstat (limited to 'tests/unit')
-rw-r--r--tests/unit/controller/JSONHttpErrorTest.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/unit/controller/JSONHttpErrorTest.php b/tests/unit/controller/JSONHttpErrorTest.php
index dfcbd202e..ffbbbed43 100644
--- a/tests/unit/controller/JSONHttpErrorTest.php
+++ b/tests/unit/controller/JSONHttpErrorTest.php
@@ -15,13 +15,17 @@ namespace OCA\News\Controller;
require_once(__DIR__ . "/../../classloader.php");
+class Test {
+ use JSONHttpError;
+}
class JSONHttpErrorTest extends \PHPUnit_Framework_TestCase {
public function testError() {
$ex = new \Exception('hi');
- $result = JSONHttpError::error($ex, 3);
+ $test = new Test();
+ $result = $test->error($ex, 3);
$this->assertEquals(['message' => 'hi'], $result->getData());
$this->assertEquals(3, $result->getStatus());
); if (!axp20x) return -ENOMEM; axp20x->dev = &i2c->dev; axp20x->irq = i2c->irq; dev_set_drvdata(axp20x->dev, axp20x); ret = axp20x_match_device(axp20x); if (ret) return ret; axp20x->regmap = devm_regmap_init_i2c(i2c, axp20x->regmap_cfg); if (IS_ERR(axp20x->regmap)) { ret = PTR_ERR(axp20x->regmap); dev_err(&i2c->dev, "regmap init failed: %d\n", ret); return ret; } return axp20x_device_probe(axp20x); } static int axp20x_i2c_remove(struct i2c_client *i2c) { struct axp20x_dev *axp20x = i2c_get_clientdata(i2c); return axp20x_device_remove(axp20x); } static const struct of_device_id axp20x_i2c_of_match[] = { { .compatible = "x-powers,axp152", .data = (void *)AXP152_ID }, { .compatible = "x-powers,axp202", .data = (void *)AXP202_ID }, { .compatible = "x-powers,axp209", .data = (void *)AXP209_ID }, { .compatible = "x-powers,axp221", .data = (void *)AXP221_ID }, { .compatible = "x-powers,axp223", .data = (void *)AXP223_ID }, { .compatible = "x-powers,axp806", .data = (void *)AXP806_ID }, { }, }; MODULE_DEVICE_TABLE(of, axp20x_i2c_of_match); static const struct i2c_device_id axp20x_i2c_id[] = { { "axp152", 0 }, { "axp202", 0 }, { "axp209", 0 }, { "axp221", 0 }, { "axp223", 0 }, { "axp806", 0 }, { }, }; MODULE_DEVICE_TABLE(i2c, axp20x_i2c_id); static const struct acpi_device_id axp20x_i2c_acpi_match[] = { { .id = "INT33F4", .driver_data = AXP288_ID, }, { }, }; MODULE_DEVICE_TABLE(acpi, axp20x_i2c_acpi_match); static struct i2c_driver axp20x_i2c_driver = { .driver = { .name = "axp20x-i2c", .of_match_table = of_match_ptr(axp20x_i2c_of_match), .acpi_match_table = ACPI_PTR(axp20x_i2c_acpi_match), }, .probe = axp20x_i2c_probe, .remove = axp20x_i2c_remove, .id_table = axp20x_i2c_id, }; module_i2c_driver(axp20x_i2c_driver); MODULE_DESCRIPTION("PMIC MFD I2C driver for AXP20X"); MODULE_AUTHOR("Carlo Caione <carlo@caione.org>"); MODULE_LICENSE("GPL");