This repository has been archived by the owner on Dec 27, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 60
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '2016.11-develop' into 2016.09
Change-Id: I4e4a53b5c8a1eb7d1c0bb3f0c29dafbc318febd3
- Loading branch information
Showing
103 changed files
with
10,182 additions
and
546 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
tests/tine20/Felamimail/files/tine20_alarm_notifictation.eml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| Return-Path: <noreply@example.org> | ||
| Delivered-To: vagrant@example.org | ||
| Received: from localhost (localhost [127.0.0.1]) | ||
| (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) | ||
| (No client certificate requested) | ||
| by vagrant-ubuntu-trusty-32 (Postfix) with ESMTPS id E16BF419C9 | ||
| for <vagrant@example.org>; Wed, 12 Oct 2016 13:53:06 +0000 (UTC) | ||
| Subject: Alarm for event "ssss" at Oct 12, 2016 4:00:00 PM | ||
| X-Tine20-Type: Notification | ||
| Precedence: bulk | ||
| User-Agent: Tine 2.0 Notification Service(version 12162: 00bc36b852154705a7fac1b892295f4d1ff02317 (2016-10-12 08:39:27) - none) | ||
| From: "vagrant" <vagrant@example.org> | ||
| Sender: "Tine 2.0 notification service" <noreply@example.org> | ||
| To: "vagrant Test" <vagrant@example.org> | ||
| Message-Id: <a9a3697ca976383547057332b1fa128a14d333f0@vagrant-ubuntu-trusty-32> | ||
| X-MailGenerator: Tine 2.0 | ||
| X-Tine20TestMessage: tine20_alarm_notifictation.eml | ||
| Date: Wed, 12 Oct 2016 13:53:06 +0000 | ||
| Content-Type: text/plain; charset=UTF-8 | ||
| Content-Transfer-Encoding: quoted-printable | ||
| Content-Disposition: inline | ||
| MIME-Version: 1.0 | ||
|
|
||
| Event details:=0AStart: Wednesday, Oct 12, 2016 4:00:00 PM= | ||
| =0AEnd: Wednesday, Oct 12, 2016 5:00:00 PM=0ASummary: = | ||
| ssss=0ADescription: dfvsdvsfdv=0AAttender:=0A Test, v= | ||
| agrant (Required, Accepted) =0A=0A |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| <?php | ||
| /** | ||
| * Tine 2.0 - http://www.tine20.org | ||
| * | ||
| * @package MailFiler | ||
| * @license http://www.gnu.org/licenses/agpl.html | ||
| * @copyright Copyright (c) 2010-2016 Metaways Infosystems GmbH (http://www.metaways.de) | ||
| * @author Philipp Schüle <p.schuele@metaways.de> | ||
| */ | ||
| class MailFiler_AllTests | ||
| { | ||
| public static function main () | ||
| { | ||
| PHPUnit_TextUI_TestRunner::run(self::suite()); | ||
| } | ||
|
|
||
| public static function suite () | ||
| { | ||
| $suite = new PHPUnit_Framework_TestSuite('Tine 2.0 MailFiler All Tests'); | ||
| $suite->addTestSuite('MailFiler_Frontend_AllTests'); | ||
|
|
||
| return $suite; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| <?php | ||
| /** | ||
| * Tine 2.0 - http://www.tine20.org | ||
| * | ||
| * @package MailFiler | ||
| * @license http://www.gnu.org/licenses/agpl.html | ||
| * @copyright Copyright (c) 2012-2016 Metaways Infosystems GmbH (http://www.metaways.de) | ||
| * @author Philipp Schüle <p.schuele@metaways.de> | ||
| */ | ||
| class MailFiler_Frontend_AllTests | ||
| { | ||
| public static function main () | ||
| { | ||
| PHPUnit_TextUI_TestRunner::run(self::suite()); | ||
| } | ||
|
|
||
| public static function suite () | ||
| { | ||
| $suite = new PHPUnit_Framework_TestSuite('Tine 2.0 MailFiler Frontend Tests'); | ||
| $suite->addTestSuite('MailFiler_Frontend_JsonTests'); | ||
|
|
||
| return $suite; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| <?php | ||
| /** | ||
| * Tine 2.0 - http://www.tine20.org | ||
| * | ||
| * @package MailFiler | ||
| * @license http://www.gnu.org/licenses/agpl.html | ||
| * @copyright Copyright (c) 2011-2016 Metaways Infosystems GmbH (http://www.metaways.de) | ||
| * @author Philipp Schüle <p.schuele@metaways.de> | ||
| * | ||
| */ | ||
|
|
||
| /** | ||
| * Test class for MailFiler_Frontend_Json | ||
| * | ||
| * @package MailFiler | ||
| */ | ||
| class MailFiler_Frontend_JsonTests extends TestCase | ||
| { | ||
| /** | ||
| * uit | ||
| * | ||
| * @var MailFiler_Frontend_Json | ||
| */ | ||
| protected $_json; | ||
|
|
||
| /** | ||
| * Sets up the fixture. | ||
| * This method is called before a test is executed. | ||
| * | ||
| * @access protected | ||
| */ | ||
| protected function setUp() | ||
| { | ||
| parent::setUp(); | ||
|
|
||
| $this->_json = new MailFiler_Frontend_Json(); | ||
| } | ||
|
|
||
| /** | ||
| * Tears down the fixture | ||
| * This method is called after a test is executed. | ||
| * | ||
| * @access protected | ||
| */ | ||
| protected function tearDown() | ||
| { | ||
| parent::tearDown(); | ||
|
|
||
| Tinebase_FileSystem::getInstance()->clearStatCache(); | ||
| Tinebase_FileSystem::getInstance()->clearDeletedFilesFromFilesystem(); | ||
| } | ||
|
|
||
| /** | ||
| * test search nodes (personal) | ||
| */ | ||
| public function testSearchWithMessageFilter() | ||
| { | ||
| $filter = array(array( | ||
| 'field' => 'path', | ||
| 'operator' => 'equals', | ||
| 'value' => '/' | ||
| ), array( | ||
| 'field' => 'to', | ||
| 'operator' => 'contains', | ||
| 'value' => 'vagrant' | ||
| )); | ||
| $result = $this->_json->searchNodes($filter, array()); | ||
| self::assertEquals(2, count($result['filter'])); | ||
| // TODO is it correct to show the root nodes even if "to" filter is set? | ||
| self::assertEquals(3, $result['totalcount']); | ||
| } | ||
|
|
||
| /** | ||
| * create container in personal folder | ||
| * | ||
| * @return array created node | ||
| */ | ||
| public function testCreateContainerNodeInPersonalFolder($containerName = 'testcontainer') | ||
| { | ||
| $testPath = '/' . Tinebase_Model_Container::TYPE_PERSONAL . '/' . Tinebase_Core::getUser()->accountLoginName . '/' . $containerName; | ||
| $result = $this->_json->createNodes($testPath, Tinebase_Model_Tree_Node::TYPE_FOLDER, array(), FALSE); | ||
| $createdNode = $result[0]; | ||
|
|
||
| $this->_objects['containerids'][] = $createdNode['name']['id']; | ||
|
|
||
| self::assertTrue(is_array($createdNode['name'])); | ||
| self::assertEquals($containerName, $createdNode['name']['name']); | ||
| self::assertEquals(Tinebase_Core::getUser()->getId(), $createdNode['created_by']['accountId']); | ||
|
|
||
| return $createdNode; | ||
| } | ||
|
|
||
| /** | ||
| * test move eml node | ||
| */ | ||
| public function testMoveNode() | ||
| { | ||
| $node1 = $this->testCreateContainerNodeInPersonalFolder('testcontainer1'); | ||
| $node2 = $this->testCreateContainerNodeInPersonalFolder('testcontainer2'); | ||
|
|
||
| $tempFilename = Tinebase_TempFile::getTempPath(); | ||
| file_put_contents($tempFilename, 'my eml content'); | ||
| $tempFile = Tinebase_TempFile::getInstance()->createTempFile($tempFilename); | ||
| $filePath = $node1['path'] . '/my.eml'; | ||
| MailFiler_Controller_Node::getInstance()->createNodes( | ||
| array($filePath), | ||
| Tinebase_Model_Tree_Node::TYPE_FILE, | ||
| array($tempFile->getId()), | ||
| /* $_forceOverwrite */ true | ||
| )->getFirstRecord(); | ||
|
|
||
| // move to testcontainer2 | ||
| $targetFilePath = $node2['path'] . '/my.eml'; | ||
| $result = $this->_json->moveNodes(array($filePath), array($targetFilePath), FALSE); | ||
|
|
||
| self::assertEquals(1, count($result)); | ||
| self::assertEquals($targetFilePath, $result[0]['path']); | ||
| } | ||
| } |
Oops, something went wrong.