summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/units/Base.php7
-rw-r--r--tests/units/Core/TemplateTest.php24
-rw-r--r--tests/units/Model/FileTest.php24
3 files changed, 37 insertions, 18 deletions
diff --git a/tests/units/Base.php b/tests/units/Base.php
index 89d0e2bf..8112c954 100644
--- a/tests/units/Base.php
+++ b/tests/units/Base.php
@@ -84,7 +84,7 @@ abstract class Base extends PHPUnit_Framework_TestCase
$this->container['db']->logQueries = true;
$this->container['logger'] = new Logger;
- $this->container['logger']->setLogger(new File('/dev/null'));
+ $this->container['logger']->setLogger(new File($this->isWindows() ? 'NUL' : '/dev/null'));
$this->container['httpClient'] = new FakeHttpClient;
$this->container['emailClient'] = $this->getMockBuilder('EmailClient')->setMethods(array('send'))->getMock();
@@ -99,4 +99,9 @@ abstract class Base extends PHPUnit_Framework_TestCase
{
$this->container['db']->closeConnection();
}
+
+ public function isWindows()
+ {
+ return substr(PHP_OS, 0, 3) === 'WIN';
+ }
}
diff --git a/tests/units/Core/TemplateTest.php b/tests/units/Core/TemplateTest.php
index 19c0da1a..6e5ae00d 100644
--- a/tests/units/Core/TemplateTest.php
+++ b/tests/units/Core/TemplateTest.php
@@ -9,20 +9,34 @@ class TemplateTest extends Base
public function testGetTemplateFile()
{
$t = new Template($this->container);
- $this->assertStringEndsWith('app/Core/../Template/a/b.php', $t->getTemplateFile('a/b'));
+ $this->assertStringEndsWith(
+ 'app'.DIRECTORY_SEPARATOR.'Core'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'Template'.DIRECTORY_SEPARATOR.'a'.DIRECTORY_SEPARATOR.'b.php',
+ $t->getTemplateFile('a'.DIRECTORY_SEPARATOR.'b')
+ );
}
public function testGetPluginTemplateFile()
{
$t = new Template($this->container);
- $this->assertStringEndsWith('app/Core/../../plugins/Myplugin/Template/a/b.php', $t->getTemplateFile('myplugin:a/b'));
+ $this->assertStringEndsWith(
+ 'app'.DIRECTORY_SEPARATOR.'Core'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.'Myplugin'.DIRECTORY_SEPARATOR.'Template'.DIRECTORY_SEPARATOR.'a'.DIRECTORY_SEPARATOR.'b.php',
+ $t->getTemplateFile('myplugin:a'.DIRECTORY_SEPARATOR.'b')
+ );
}
public function testGetOverridedTemplateFile()
{
$t = new Template($this->container);
- $t->setTemplateOverride('a/b', 'myplugin:c');
- $this->assertStringEndsWith('app/Core/../../plugins/Myplugin/Template/c.php', $t->getTemplateFile('a/b'));
- $this->assertStringEndsWith('app/Core/../Template/d.php', $t->getTemplateFile('d'));
+ $t->setTemplateOverride('a'.DIRECTORY_SEPARATOR.'b', 'myplugin:c');
+
+ $this->assertStringEndsWith(
+ 'app'.DIRECTORY_SEPARATOR.'Core'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.'Myplugin'.DIRECTORY_SEPARATOR.'Template'.DIRECTORY_SEPARATOR.'c.php',
+ $t->getTemplateFile('a'.DIRECTORY_SEPARATOR.'b')
+ );
+
+ $this->assertStringEndsWith(
+ 'app'.DIRECTORY_SEPARATOR.'Core'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'Template'.DIRECTORY_SEPARATOR.'d.php',
+ $t->getTemplateFile('d')
+ );
}
}
diff --git a/tests/units/Model/FileTest.php b/tests/units/Model/FileTest.php
index e311cf75..29f6ee93 100644
--- a/tests/units/Model/FileTest.php
+++ b/tests/units/Model/FileTest.php
@@ -89,7 +89,7 @@ class FileTest extends Base
{
$f = new File($this->container);
- $this->assertStringStartsWith('12/34/', $f->generatePath(12, 34, 'test.png'));
+ $this->assertStringStartsWith('12'.DIRECTORY_SEPARATOR.'34'.DIRECTORY_SEPARATOR, $f->generatePath(12, 34, 'test.png'));
$this->assertNotEquals($f->generatePath(12, 34, 'test1.png'), $f->generatePath(12, 34, 'test2.png'));
}
@@ -113,7 +113,7 @@ class FileTest extends Base
->expects($this->once())
->method('put')
->with(
- $this->stringContains('1/1/'),
+ $this->stringContains('1'.DIRECTORY_SEPARATOR.'1'.DIRECTORY_SEPARATOR),
$this->equalTo(base64_decode($data))
)
->will($this->returnValue(true));
@@ -126,7 +126,7 @@ class FileTest extends Base
$file = $f->getById(1);
$this->assertNotEmpty($file);
$this->assertStringStartsWith('Screenshot taken ', $file['name']);
- $this->assertStringStartsWith('1/1/', $file['path']);
+ $this->assertStringStartsWith('1'.DIRECTORY_SEPARATOR.'1'.DIRECTORY_SEPARATOR, $file['path']);
$this->assertEquals(1, $file['is_image']);
$this->assertEquals(1, $file['task_id']);
$this->assertEquals(time(), $file['date'], '', 2);
@@ -149,7 +149,7 @@ class FileTest extends Base
->expects($this->once())
->method('put')
->with(
- $this->stringContains('1/1/'),
+ $this->stringContains('1'.DIRECTORY_SEPARATOR.'1'.DIRECTORY_SEPARATOR),
$this->equalTo(base64_decode($data))
)
->will($this->returnValue(true));
@@ -159,7 +159,7 @@ class FileTest extends Base
$file = $f->getById(1);
$this->assertNotEmpty($file);
$this->assertEquals('my file.pdf', $file['name']);
- $this->assertStringStartsWith('1/1/', $file['path']);
+ $this->assertStringStartsWith('1'.DIRECTORY_SEPARATOR.'1'.DIRECTORY_SEPARATOR, $file['path']);
$this->assertEquals(0, $file['is_image']);
$this->assertEquals(1, $file['task_id']);
$this->assertEquals(time(), $file['date'], '', 2);
@@ -211,15 +211,15 @@ class FileTest extends Base
$this->assertEquals(1, $p->create(array('name' => 'test')));
$this->assertEquals(1, $tc->create(array('project_id' => 1, 'title' => 'test')));
- $this->assertEquals(1, $f->create(1, 'B.pdf', '/tmp/foo1', 10));
- $this->assertEquals(2, $f->create(1, 'A.png', '/tmp/foo2', 10));
- $this->assertEquals(3, $f->create(1, 'D.doc', '/tmp/foo3', 10));
+ $this->assertEquals(1, $f->create(1, 'B.pdf', DIRECTORY_SEPARATOR.'tmp'.DIRECTORY_SEPARATOR.'foo1', 10));
+ $this->assertEquals(2, $f->create(1, 'A.png', DIRECTORY_SEPARATOR.'tmp'.DIRECTORY_SEPARATOR.'foo2', 10));
+ $this->assertEquals(3, $f->create(1, 'D.doc', DIRECTORY_SEPARATOR.'tmp'.DIRECTORY_SEPARATOR.'foo3', 10));
$this->container['objectStorage']
->expects($this->at(0))
->method('remove')
->with(
- $this->equalTo('/tmp/foo2')
+ $this->equalTo(DIRECTORY_SEPARATOR.'tmp'.DIRECTORY_SEPARATOR.'foo2')
)
->will($this->returnValue(true));
@@ -227,7 +227,7 @@ class FileTest extends Base
->expects($this->at(1))
->method('remove')
->with(
- $this->equalTo('thumbnails//tmp/foo2')
+ $this->equalTo('thumbnails'.DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR.'tmp'.DIRECTORY_SEPARATOR.'foo2')
)
->will($this->returnValue(true));
@@ -235,7 +235,7 @@ class FileTest extends Base
->expects($this->at(2))
->method('remove')
->with(
- $this->equalTo('/tmp/foo1')
+ $this->equalTo(DIRECTORY_SEPARATOR.'tmp'.DIRECTORY_SEPARATOR.'foo1')
)
->will($this->returnValue(true));
@@ -243,7 +243,7 @@ class FileTest extends Base
->expects($this->at(3))
->method('remove')
->with(
- $this->equalTo('/tmp/foo3')
+ $this->equalTo(DIRECTORY_SEPARATOR.'tmp'.DIRECTORY_SEPARATOR.'foo3')
)
->will($this->returnValue(true));
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-23 21:44:59 +0000