Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of dev.sourcefabric.org:campcaster

Browse source 
Conflicts:
	backend/tests/PlaylistTests.php
This commit is contained in:
naomiaro 2010-11-15 11:01:00 -05:00
commit 65a823561d
32 changed files with 2225 additions and 1997 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backend/tests/SchedulerTests.php
View file

@ -60,7 +60,7 @@ class SchedulerTests extends PHPUnit_TestCase {
function testAddAndRemovePlaylist() {
// Create a playlist
$playlist = new Playlist();
$playlist->create("Scheduler Unit Test");
$playlist->create("Scheduler Unit Test ".uniqid());
$result = $playlist->addAudioClip($this->storedFile->getId());
$result = $playlist->addAudioClip($this->storedFile2->getId());
$result = $playlist->addAudioClip($this->storedFile2->getId());
@ -76,7 +76,7 @@ class SchedulerTests extends PHPUnit_TestCase {
$this->fail("Wrong number of items added.");
}
$items = $group->getItems();
if ($items[1]["starts"] != "2010-11-11 01:30:34.231") {
if (!is_array($items) || ($items[1]["starts"] != "2010-11-11 01:30:34.231")) {
$this->fail("Wrong start time for 2nd item.");
}