hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-504 #time 8h

Browse Source 
fix: prod / cr-lf in metadata is ok for aggregate  filter
cr,lf,crlf are normalized
- getting field values from recordadapter
- during es indexation (direct sql read in metadata...)
- before querying
This commit is contained in:
Jean-Yves Gaulier
2015-07-13 17:08:36 +02:00
parent 85283c1b90
commit d012978508
13 changed files with 254 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/Alchemy/Tests/Phrasea/Form/Login/PhraseaRegisterFormTest.php
View File

@@ -4,7 +4,6 @@ namespace Alchemy\Tests\Phrasea\Form\Login;
use Alchemy\Phrasea\Form\Login\PhraseaRegisterForm;;
use Alchemy\Tests\Phrasea\Form\FormTestCase;
use Alchemy\Phrasea\Utilities\String\Camelizer;
/**
* @group functional
@@ -27,7 +26,7 @@ class PhraseaRegisterFormTest extends FormTestCase
]
];
return new PhraseaRegisterForm(self::$DI['app'], $available, $params, new Camelizer());
return new PhraseaRegisterForm(self::$DI['app'], $available, $params);
}
public function testFormDoesRegisterValidFields()
@@ -63,7 +62,7 @@ class PhraseaRegisterFormTest extends FormTestCase
$expected[] = 'collections';
}
$form = new PhraseaRegisterForm(self::$DI['app'], $available, $params, new Camelizer());
$form = new PhraseaRegisterForm(self::$DI['app'], $available, $params);
foreach (array_keys(self::$DI['app']->form($form)->createView()->vars['form']->children) as $name) {
$this->assertContains($name, $expected);
@@ -99,7 +98,7 @@ class PhraseaRegisterFormTest extends FormTestCase
$expected[] = 'collections';
}
$form = new PhraseaRegisterForm(self::$DI['app'], $available, $params, new Camelizer());
$form = new PhraseaRegisterForm(self::$DI['app'], $available, $params);
foreach (array_keys(self::$DI['app']->form($form)->createView()->vars['form']->children) as $name) {
$this->assertContains($name, $expected);

7
tests/Alchemy/Tests/Phrasea/Utilities/String/CamelizerTest.php
View File

@@ -2,7 +2,7 @@
namespace Alchemy\Tests\Phrasea\Utilities\String;
use Alchemy\Phrasea\Utilities\String\Camelizer;
use Alchemy\Phrasea\Utilities\StringHelper;
/**
* @group functional
@@ -12,12 +12,11 @@ class CamelizerTest extends \PhraseanetTestCase
{
/**
* @dataProvider provideStrings
* @covers Alchemy\Phrasea\Utilities\String\Camelizer::camelize
* @covers Alchemy\Phrasea\Utilities\StringHelper::camelize
*/
public function testCamelize($string, $separator, $expected, $pascalize)
{
$camelizer = new Camelizer();
$result = $camelizer->camelize($string, $separator, $pascalize);
$result = StringHelper::camelize($string, $separator, $pascalize);
$this->assertEquals($expected, $result);
}

33
tests/Alchemy/Tests/Phrasea/Utilities/String/CrLfNormalizerTest.php Normal file
View File

@@ -0,0 +1,33 @@
<?php
namespace Alchemy\Tests\Phrasea\Utilities\String;
use Alchemy\Phrasea\Utilities\StringHelper;
/**
* @group functional
* @group legacy
*/
class CrLfNormalizerTest extends \PhraseanetTestCase
{
/**
* @dataProvider provideStrings
* @covers Alchemy\Phrasea\Utilities\StringHelper::crlfNormalize
*/
public function testCrLfNormalize($string, $expected)
{
$result = StringHelper::crlfNormalize($string);
$this->assertEquals($expected, $result);
}
public function provideStrings()
{
return [
['ABC\rDEF', 'ABC\nDEF'],
['ABC\nDEF', 'ABC\nDEF'],
['ABC\r\nDEF', 'ABC\nDEF'],
['ABC\n\rDEF', 'ABC\n\nDEF'],
];
}
}