fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-08 19:42:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fixed failing test for ConditionArgument class.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0-DB@8603 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ucorina 2011-07-18 12:36:39 +00:00
parent bf1d72e478
commit 19c0ba4964
4 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
classes/db/queryparts/condition/Condition.class.php
View file

@ -104,10 +104,10 @@
return $name.' like '.$value;
break;
case 'in' :
return $name.' in ('.$value.')';
return $name.' in '.$value;
break;
case 'notin' :
return $name.' not in ('.$value.')';
return $name.' not in '.$value;
break;
case 'notequal' :
return $name.' <> '.$value;

2
classes/xml/xmlquery/argument/Argument.class.php
View file

@ -38,7 +38,7 @@
}
function toString($value){
if(is_array($value)) return implode(',', $value);
if(is_array($value)) return '('.implode(',', $value).')';
return $value;
}

1
test-phpUnit/classes/xml/xmlquery/argument/ArgumentTest.php
View file

@ -213,6 +213,7 @@ class ArgumentTest extends CubridTest {
public function testCreateConditionValue_In_StringValues() {
$member_srl_argument = new ConditionArgument('"mid"', array('forum', 'board'), 'in');
$member_srl_argument->createConditionValue();
$member_srl_argument->setColumnType('varchar');
$this->assertEquals('(\'forum\',\'board\')', $member_srl_argument->getValue());
}

6
test-phpUnit/classes/xml/xmlquery/queryargument/QueryArgumentTest.php
View file

@ -20,11 +20,11 @@ class QueryArgumentTest extends CubridTest {
$this->assertEquals("member_srl", $tag->getColumnName());
$this->assertEquals(true, $tag->isConditionArgument());
$actual = $tag->toString();
$expected = ' $member_srl_argument = new ConditionArgument(\'member_srl\', $args->member_srl, \'equal\');
$actual = Helper::cleanString($tag->toString());
$expected = Helper::cleanString('$member_srl_argument = new ConditionArgument(\'member_srl\', $args->member_srl, \'equal\');
$member_srl_argument->checkNotNull();
$member_srl_argument->createConditionValue();
if(!$member_srl_argument->isValid()) return $member_srl_argument->getErrorMessage();';
if(!$member_srl_argument->isValid()) return $member_srl_argument->getErrorMessage();');
$this->assertEquals($expected, $actual);
}