mirror of
https://github.com/Pathduck/gallery3.git
synced 2026-07-11 09:43:51 -04:00
Minor changes to satisfy the G3 code standards.
This commit is contained in:
committed by
Bharat Mediratta
parent
48640005a4
commit
addd384bbd
@@ -130,46 +130,46 @@ class Item_Helper_Test extends Gallery_Unit_Test_Case {
|
||||
$level1 = test::random_album();
|
||||
$level2 = test::random_album($level1);
|
||||
$level3 = test::random_photo($level2);
|
||||
$level3->name = 'same.jpg';
|
||||
$level3->name = "same.jpg";
|
||||
$level3->save();
|
||||
|
||||
$level2b = test::random_album($level1);
|
||||
$level3b = test::random_photo($level2b);
|
||||
$level3b->name = 'same.jpg';
|
||||
$level3b->name = "same.jpg";
|
||||
$level3b->save();
|
||||
|
||||
// Item in album
|
||||
$this->assert_same(
|
||||
item::find_by_path('/' . $level1->name . '/' . $level2->name . '/' . $level3->name)->id,
|
||||
item::find_by_path("/" . $level1->name . "/" . $level2->name . "/" . $level3->name)->id,
|
||||
$level3->id);
|
||||
|
||||
// Album, ends with a slash
|
||||
$this->assert_same(
|
||||
item::find_by_path($level1->name . '/' . $level2->name . '/')->id,
|
||||
item::find_by_path($level1->name . "/" . $level2->name . "/")->id,
|
||||
$level2->id);
|
||||
|
||||
// Album, ends without a slash
|
||||
$this->assert_same(
|
||||
item::find_by_path('/' . $level1->name . '/' . $level2->name)->id,
|
||||
item::find_by_path("/" . $level1->name . "/" . $level2->name)->id,
|
||||
$level2->id);
|
||||
|
||||
// Return root if '' is passed
|
||||
$this->assert_same(
|
||||
item::find_by_path('')->id,
|
||||
item::find_by_path("")->id,
|
||||
"1");
|
||||
|
||||
// Verify that we don't get confused by the part names
|
||||
$this->assert_same(
|
||||
item::find_by_path($level1->name . '/' . $level2->name . '/' . $level3->name)->id,
|
||||
item::find_by_path($level1->name . "/" . $level2->name . "/" . $level3->name)->id,
|
||||
$level3->id);
|
||||
|
||||
$this->assert_same(
|
||||
item::find_by_path($level1->name . '/' . $level2b->name . '/' . $level3b->name)->id,
|
||||
item::find_by_path($level1->name . "/" . $level2b->name . "/" . $level3b->name)->id,
|
||||
$level3b->id);
|
||||
|
||||
// Verify that we don't get false positives
|
||||
$this->assert_same(
|
||||
item::find_by_path('foo/bar/baz'),
|
||||
item::find_by_path("foo/bar/baz"),
|
||||
false);
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user