Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
Choose a Base Repository
UnionOfRAD/lithium
3d0c/lithium
ALYREZA/lithium
Ciaro/lithium
DMcP89/lithium
Daikoun/lithium
ElizabethN/lithium
FlavioFalcao/lithium
Howard3/lithium
Hyacinth/lithium
JasperTey/lithium
Knodes/lithium
KumarLab/lithium
LulaV14/lithium
MissAllSunday/lithium
Nys/lithium
OmDoctor/lithium
Pixwel/lithium
PrafullaKumarSahu/lithium
RyoAbe/lithium
SayB/lithium
SergSlon/lithium
ShadovvBeast/lithium
Shipow/lithium
SobanVuex/lithium
SoulUED/lithium
TAKEALOT/lithium
WordpressDev/lithium
aaitxcoder/lithium
adamroyle/lithium
agborkowski/lithium
agentile/lithium
ainiaa/lithium
alexbowers-tecmark/lithium
alkemann/lithium
alvarlaigna/lithium
antz29/lithium
asturn/lithium
bihicheng/lithium
blubear83/lithium
bogh/lithium
brandonwestcott/lithium
brighub/lithium
buagern/lithium
butteredtoast/lithium
cameronbc/lithium
cgutierrez/lithium
chanhong/lithium
cinepullit/lithium
civocr/lithium
clexmond/lithium
clickdebt/lithium
cloudconferenceroom/lithium
codebe/lithium
coogle/lithium
coosir/lithium
corabbit/lithium
cynial/lithium
d1rk/lithium
damien-biasotto/lithium
danielmcormond/lithium
daschl/lithium
datachand/lithium
davidpersson/lithium
dbogatsky/lithium
deniskin82/lithium
deutschlion/lithium
digideskio/lithium
dipo/lithium
djoudi/lithium
dktdc91/lithium
dolinsky/lithium
dshafik/lithium
dualforces/lithium
dyster/lithium
e7dal/lithium
eLod/lithium
edude03/lithium
electronbeam/lithium
engnxe/lithium
epinapala/lithium
ericcholis/lithium
farhadi/lithium
fedeisas/lithium
fellars/lithium
feylya/lithium
fitzagard/lithium
garyblack/lithium
geoff-kruss/lithium
globus40000/lithium
gluckzhang/lithium
graphis/lithium
greut/lithium
greylabel/lithium
gwoo/lithium
gzapico/lithium
hagenhantz/lithium
hans-d/lithium
harunyardimci/kapara
heshaohua/lithium
hibrid/lithium
hiromitz/lithium
humanoit1989/lithium
indikarajanayake/lithium
inoui/lithium
jackncoke/lithium
jacobbudin/lithium
jails/lithium
jamalsa/lithium
janseling/lithium
jarroddungan/lithium
java-tester-x/lithium
jbloetz/lithium
jeffvanhees/lithium
jmglsn/lithium
joedevon/lithium
joseym/lithium
jovanialferez/lithium
jrgns/lithium
jsp123/lithium
justinjenkins/lithium
kevin-jones/lithium
kinpro/lithium
koushki/lithium
krsreenatha/lithium
lanisle/lithium
lpirir/lithium
mackstar/lithium
majna/lithium
marcghorayeb/lithium
mariano/lithium
mariuskubilius/lithium
markwilde/lithium
matysanchez/lithium
mauro-moreno/lithium
mcouzinet/lithium
mdx-dev/lithium
mediaprojects/lithium
mehdijamal/lithium
mehlah/lithium
mendo/lithium
mgcrea/lithium
mikeyb/lithium
mingan/lithium
mixer2/lithium
mklarin/lithium
mommel/lithium
muyehub/lithium
nashadalam/lithium
nealerickson/lithium
niel/lithium
notnoopci/lithium
oerd/lithium
omeryar/lithium
orchestra-io/lithium
otm/lithium
pabloingreece/lithium
pangkaiguo/lithium
paveleremin/lithium
phuff/lithium
pianokey/lithium
pixelcog/lithium
pnomolos/lithium
preinheimer/lithium
prettykitten/lithium
rakesh-mohanta/lithium
rikaix/lithium
rmarscher/lithium
romainwurtz/lithium
ronaldsgailis/lithium
rpeterson/lithium
ryannutley/lithium
salahwaisi/lithium
satiri/lithium
screws0ft/lithium
sephiroth88/lithium
sftest/lithium
shopblocks/lithium
sibaz/lithium
skopp/lithium
slicedup/lithium
sokiche/lithium
soleo/lithium
spacemonkey/lithium
sweo/lithium
symbiat/lithium
tefra/lithium
tigrang/lithium
tmaiaroto/lithium
tommoor/lithium
toomuchpete/lithium
tpennock/lithium
ungly/lithium
vigege/lithium
warrenseymour/lithium
web3app4/lithium
wnasich/lithium
wuxq/lithium
x4rMa/lithium
zdrap/lithium
Nothing to show
...
Choose a Head Repository
UnionOfRAD/lithium
3d0c/lithium
ALYREZA/lithium
Ciaro/lithium
DMcP89/lithium
Daikoun/lithium
ElizabethN/lithium
FlavioFalcao/lithium
Howard3/lithium
Hyacinth/lithium
JasperTey/lithium
Knodes/lithium
KumarLab/lithium
LulaV14/lithium
MissAllSunday/lithium
Nys/lithium
OmDoctor/lithium
Pixwel/lithium
PrafullaKumarSahu/lithium
RyoAbe/lithium
SayB/lithium
SergSlon/lithium
ShadovvBeast/lithium
Shipow/lithium
SobanVuex/lithium
SoulUED/lithium
TAKEALOT/lithium
WordpressDev/lithium
aaitxcoder/lithium
adamroyle/lithium
agborkowski/lithium
agentile/lithium
ainiaa/lithium
alexbowers-tecmark/lithium
alkemann/lithium
alvarlaigna/lithium
antz29/lithium
asturn/lithium
bihicheng/lithium
blubear83/lithium
bogh/lithium
brandonwestcott/lithium
brighub/lithium
buagern/lithium
butteredtoast/lithium
cameronbc/lithium
cgutierrez/lithium
chanhong/lithium
cinepullit/lithium
civocr/lithium
clexmond/lithium
clickdebt/lithium
cloudconferenceroom/lithium
codebe/lithium
coogle/lithium
coosir/lithium
corabbit/lithium
cynial/lithium
d1rk/lithium
damien-biasotto/lithium
danielmcormond/lithium
daschl/lithium
datachand/lithium
davidpersson/lithium
dbogatsky/lithium
deniskin82/lithium
deutschlion/lithium
digideskio/lithium
dipo/lithium
djoudi/lithium
dktdc91/lithium
dolinsky/lithium
dshafik/lithium
dualforces/lithium
dyster/lithium
e7dal/lithium
eLod/lithium
edude03/lithium
electronbeam/lithium
engnxe/lithium
epinapala/lithium
ericcholis/lithium
farhadi/lithium
fedeisas/lithium
fellars/lithium
feylya/lithium
fitzagard/lithium
garyblack/lithium
geoff-kruss/lithium
globus40000/lithium
gluckzhang/lithium
graphis/lithium
greut/lithium
greylabel/lithium
gwoo/lithium
gzapico/lithium
hagenhantz/lithium
hans-d/lithium
harunyardimci/kapara
heshaohua/lithium
hibrid/lithium
hiromitz/lithium
humanoit1989/lithium
indikarajanayake/lithium
inoui/lithium
jackncoke/lithium
jacobbudin/lithium
jails/lithium
jamalsa/lithium
janseling/lithium
jarroddungan/lithium
java-tester-x/lithium
jbloetz/lithium
jeffvanhees/lithium
jmglsn/lithium
joedevon/lithium
joseym/lithium
jovanialferez/lithium
jrgns/lithium
jsp123/lithium
justinjenkins/lithium
kevin-jones/lithium
kinpro/lithium
koushki/lithium
krsreenatha/lithium
lanisle/lithium
lpirir/lithium
mackstar/lithium
majna/lithium
marcghorayeb/lithium
mariano/lithium
mariuskubilius/lithium
markwilde/lithium
matysanchez/lithium
mauro-moreno/lithium
mcouzinet/lithium
mdx-dev/lithium
mediaprojects/lithium
mehdijamal/lithium
mehlah/lithium
mendo/lithium
mgcrea/lithium
mikeyb/lithium
mingan/lithium
mixer2/lithium
mklarin/lithium
mommel/lithium
muyehub/lithium
nashadalam/lithium
nealerickson/lithium
niel/lithium
notnoopci/lithium
oerd/lithium
omeryar/lithium
orchestra-io/lithium
otm/lithium
pabloingreece/lithium
pangkaiguo/lithium
paveleremin/lithium
phuff/lithium
pianokey/lithium
pixelcog/lithium
pnomolos/lithium
preinheimer/lithium
prettykitten/lithium
rakesh-mohanta/lithium
rikaix/lithium
rmarscher/lithium
romainwurtz/lithium
ronaldsgailis/lithium
rpeterson/lithium
ryannutley/lithium
salahwaisi/lithium
satiri/lithium
screws0ft/lithium
sephiroth88/lithium
sftest/lithium
shopblocks/lithium
sibaz/lithium
skopp/lithium
slicedup/lithium
sokiche/lithium
soleo/lithium
spacemonkey/lithium
sweo/lithium
symbiat/lithium
tefra/lithium
tigrang/lithium
tmaiaroto/lithium
tommoor/lithium
toomuchpete/lithium
tpennock/lithium
ungly/lithium
vigege/lithium
warrenseymour/lithium
web3app4/lithium
wnasich/lithium
wuxq/lithium
x4rMa/lithium
zdrap/lithium
Nothing to show
  • 3 commits
  • 2 files changed
  • 0 commit comments
  • 2 contributors
Showing with 26 additions and 5 deletions.
  1. +2 −3 test/Unit.php
  2. +24 −2 tests/cases/test/UnitTest.php
View
@@ -900,8 +900,7 @@ protected function _compare($type, $expected, $result = null, $trace = null) {
if (!empty($data)) {
return $data;
}
- }
- if (!is_scalar($result)) {
+ } elseif (!is_scalar($result)) {
$data = $this->_compare($type, $result, $expected);
if (!empty($data)) {
@@ -1055,4 +1054,4 @@ protected function _hasNetwork($config = array()) {
}
}
-?>
+?>
@@ -622,6 +622,28 @@ public function testCompareIdenticalArray() {
$this->assertEqual($expected, $result);
}
+ public function testCompareIdenticalMixedArray() {
+ $array1 = array(
+ 'command' => 'test',
+ 'action' => 'action',
+ 'args' => array(),
+ 'long' => 'something',
+ 'i' => 1
+ );
+
+ $array2 = array(
+ 'command' => 'test',
+ 'action' => 'action',
+ 'long' => 'something',
+ 'args' => array(),
+ 'i' => 1
+ );
+
+ $result = $this->compare('identical', $array1, $array2);
+ $expected = array('trace' => null, 'expected' => $array1, 'result' => $array2);
+ $this->assertEqual($expected, $result);
+ }
+
public function imethods() {
return array('testCompareIdenticalArray');
}
@@ -643,7 +665,7 @@ public function testCompareIdenticalNullArray() {
*
*/
public function testResults() {
- $expected = 107;
+ $expected = 108;
$result = count($this->results());
$this->assertEqual($expected, $result);
}
@@ -671,7 +693,7 @@ public function testTestMethods() {
'testGetTest', 'testAssertCookie', 'testAssertCookieWithHeaders',
'testCompareWithEmptyResult',
'testExceptionCatching', 'testErrorHandling', 'testAssertObjects',
- 'testAssertArrayIdentical', 'testCompareIdenticalArray',
+ 'testAssertArrayIdentical', 'testCompareIdenticalArray','testCompareIdenticalMixedArray',
'testCompareEqualNullArray', 'testCompareIdenticalNullArray',
'testResults', 'testTestMethods'
);

No commit comments for this range