extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 00:54:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Trying to get tests to pass

Browse Source 
- Intermediate variable throughout
This commit is contained in:
nathangray 2018-09-05 12:04:09 -06:00
parent d98930a4e8
commit c90927a306
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
admin/tests/PreferencesCommandTest.php
View File

@ -128,9 +128,11 @@ class PreferencesCommandTest extends CommandBase
$this->assertEquals($set[$this->preference_name], $post[static::APP][$this->preference_name]); $this->assertEquals($set[$this->preference_name], $post[static::APP][$this->preference_name]);
// At type level // At type level
$this->assertArrayHasKey($this->preference_name, $post_pref->$type[static::APP], // Get type as an array since direct sub-access doesn't work in 5.6
$post_app = $post_pref->$type;
$this->assertArrayHasKey($this->preference_name, $post_app[static::APP],
"$type preferences does not have {$this->preference_name}"); "$type preferences does not have {$this->preference_name}");
$this->assertEquals($set[$this->preference_name], $post_pref->$type[static::APP][$this->preference_name]); $this->assertEquals($set[$this->preference_name], $post_app[static::APP][$this->preference_name]);
$this->assertGreaterThan($log_count, $this->get_log_count(), "Command ($command) did not log"); $this->assertGreaterThan($log_count, $this->get_log_count(), "Command ($command) did not log");
} }
@ -178,9 +180,11 @@ class PreferencesCommandTest extends CommandBase
); );
// At type level // At type level
$this->assertArrayHasKey($this->preference_name, $post_pref->$type[static::APP], // Get type as an array since direct sub-access doesn't work in 5.6
$post_app = $post_pref->$type;
$this->assertArrayHasKey($this->preference_name, $post_app[static::APP],
"$type preferences does not have {$this->preference_name}"); "$type preferences does not have {$this->preference_name}");
$this->assertEquals($set[$this->preference_name], $post_pref->$type[static::APP][$this->preference_name]); $this->assertEquals($set[$this->preference_name], $post_app[static::APP][$this->preference_name]);
$this->assertGreaterThan($log_count, $this->get_log_count(), "Command ($command) did not log"); $this->assertGreaterThan($log_count, $this->get_log_count(), "Command ($command) did not log");
} }
@ -224,9 +228,11 @@ class PreferencesCommandTest extends CommandBase
$post = $post_pref->read_repository(false); $post = $post_pref->read_repository(false);
// At type level - should always be what we set // At type level - should always be what we set
$this->assertArrayHasKey($this->preference_name, $post_pref->$type[static::APP], // Get type as an array since direct sub-access doesn't work in 5.6
$post_app = $post_pref->$type;
$this->assertArrayHasKey($this->preference_name, $post_app[static::APP],
"$type preferences does not have {$this->preference_name}"); "$type preferences does not have {$this->preference_name}");
$this->assertEquals($set[$this->preference_name], $post_pref->$type[static::APP][$this->preference_name]); $this->assertEquals($set[$this->preference_name], $post_app[static::APP][$this->preference_name]);
// At user level - depends on type priority // At user level - depends on type priority
$this->assertArrayHasKey($this->preference_name, $post[static::APP]); $this->assertArrayHasKey($this->preference_name, $post[static::APP]);
@ -272,7 +278,9 @@ class PreferencesCommandTest extends CommandBase
$this->assertEquals($override ? $set[$this->preference_name] : $old[$this->preference_name], $post[static::APP][$this->preference_name]); $this->assertEquals($override ? $set[$this->preference_name] : $old[$this->preference_name], $post[static::APP][$this->preference_name]);
// At type level // At type level
$this->assertNull($post_pref->$check[static::APP][$this->preference_name]); // Get type as an array since direct sub-access doesn't work in 5.6
$post_app = $post_pref->$check;
$this->assertNull($post_app[static::APP][$this->preference_name]);
$this->assertGreaterThan($log_count, $this->get_log_count(), "Command ($command) did not log"); $this->assertGreaterThan($log_count, $this->get_log_count(), "Command ($command) did not log");
} }