Refactoring of tests/core_userkey_manager_test.php

This commit is contained in:
Dmitrii Metelkin 2016-08-19 14:51:41 +10:00
parent ec059a2191
commit c6d7b60c67

View file

@ -87,19 +87,12 @@ class core_userkey_manager_testcase extends advanced_testcase {
$actualkey = $DB->get_record('user_private_key', array('userid' => $this->user->id)); $actualkey = $DB->get_record('user_private_key', array('userid' => $this->user->id));
$expectedvalue = $value; $this->assertEquals($value, $actualkey->value);
$expecteduserid = $this->user->id; $this->assertEquals($this->user->id, $actualkey->userid);
$expectedscript = 'auth/userkey'; $this->assertEquals('auth/userkey', $actualkey->script);
$expectedinstance = $this->user->id; $this->assertEquals($this->user->id, $actualkey->instance);
$expectediprestriction = null; $this->assertEquals(null, $actualkey->iprestriction);
$expectedvaliduntil = time() + 60; $this->assertEquals(time() + 60, $actualkey->validuntil);
$this->assertEquals($expectedvalue, $actualkey->value);
$this->assertEquals($expecteduserid, $actualkey->userid);
$this->assertEquals($expectedscript, $actualkey->script);
$this->assertEquals($expectedinstance, $actualkey->instance);
$this->assertEquals($expectediprestriction, $actualkey->iprestriction);
$this->assertEquals($expectedvaliduntil, $actualkey->validuntil);
} }
/** /**
@ -115,19 +108,12 @@ class core_userkey_manager_testcase extends advanced_testcase {
$actualkey = $DB->get_record('user_private_key', array('userid' => $this->user->id)); $actualkey = $DB->get_record('user_private_key', array('userid' => $this->user->id));
$expectedvalue = $value; $this->assertEquals($value, $actualkey->value);
$expecteduserid = $this->user->id; $this->assertEquals($this->user->id, $actualkey->userid);
$expectedscript = 'auth/userkey'; $this->assertEquals('auth/userkey', $actualkey->script);
$expectedinstance = $this->user->id; $this->assertEquals($this->user->id, $actualkey->instance);
$expectediprestriction = '192.168.1.1'; $this->assertEquals('192.168.1.1', $actualkey->iprestriction);
$expectedvaliduntil = time() + 60; $this->assertEquals(time() + 60, $actualkey->validuntil);
$this->assertEquals($expectedvalue, $actualkey->value);
$this->assertEquals($expecteduserid, $actualkey->userid);
$this->assertEquals($expectedscript, $actualkey->script);
$this->assertEquals($expectedinstance, $actualkey->instance);
$this->assertEquals($expectediprestriction, $actualkey->iprestriction);
$this->assertEquals($expectedvaliduntil, $actualkey->validuntil);
} }
/** /**
@ -142,19 +128,12 @@ class core_userkey_manager_testcase extends advanced_testcase {
$actualkey = $DB->get_record('user_private_key', array('userid' => $this->user->id)); $actualkey = $DB->get_record('user_private_key', array('userid' => $this->user->id));
$expectedvalue = $value; $this->assertEquals($value, $actualkey->value);
$expecteduserid = $this->user->id; $this->assertEquals($this->user->id, $actualkey->userid);
$expectedscript = 'auth/userkey'; $this->assertEquals('auth/userkey', $actualkey->script);
$expectedinstance = $this->user->id; $this->assertEquals($this->user->id, $actualkey->instance);
$expectediprestriction = '192.168.1.3'; $this->assertEquals('192.168.1.3', $actualkey->iprestriction);
$expectedvaliduntil = time() + 60; $this->assertEquals(time() + 60, $actualkey->validuntil);
$this->assertEquals($expectedvalue, $actualkey->value);
$this->assertEquals($expecteduserid, $actualkey->userid);
$this->assertEquals($expectedscript, $actualkey->script);
$this->assertEquals($expectedinstance, $actualkey->instance);
$this->assertEquals($expectediprestriction, $actualkey->iprestriction);
$this->assertEquals($expectedvaliduntil, $actualkey->validuntil);
} }
/** /**
@ -170,19 +149,12 @@ class core_userkey_manager_testcase extends advanced_testcase {
$actualkey = $DB->get_record('user_private_key', array('userid' => $this->user->id)); $actualkey = $DB->get_record('user_private_key', array('userid' => $this->user->id));
$expectedvalue = $value; $this->assertEquals($value, $actualkey->value);
$expecteduserid = $this->user->id; $this->assertEquals($this->user->id, $actualkey->userid);
$expectedscript = 'auth/userkey'; $this->assertEquals('auth/userkey', $actualkey->script);
$expectedinstance = $this->user->id; $this->assertEquals($this->user->id, $actualkey->instance);
$expectediprestriction = null; $this->assertEquals(null, $actualkey->iprestriction);
$expectedvaliduntil = time() + 60; $this->assertEquals(time() + 60, $actualkey->validuntil);
$this->assertEquals($expectedvalue, $actualkey->value);
$this->assertEquals($expecteduserid, $actualkey->userid);
$this->assertEquals($expectedscript, $actualkey->script);
$this->assertEquals($expectedinstance, $actualkey->instance);
$this->assertEquals($expectediprestriction, $actualkey->iprestriction);
$this->assertEquals($expectedvaliduntil, $actualkey->validuntil);
} }
/** /**
@ -198,19 +170,12 @@ class core_userkey_manager_testcase extends advanced_testcase {
$actualkey = $DB->get_record('user_private_key', array('userid' => $this->user->id)); $actualkey = $DB->get_record('user_private_key', array('userid' => $this->user->id));
$expectedvalue = $value; $this->assertEquals($value, $actualkey->value);
$expecteduserid = $this->user->id; $this->assertEquals($this->user->id, $actualkey->userid);
$expectedscript = 'auth/userkey'; $this->assertEquals('auth/userkey', $actualkey->script);
$expectedinstance = $this->user->id; $this->assertEquals($this->user->id, $actualkey->instance);
$expectediprestriction = null; $this->assertEquals(null, $actualkey->iprestriction);
$expectedvaliduntil = time() + 60; $this->assertEquals(time() + 60, $actualkey->validuntil);
$this->assertEquals($expectedvalue, $actualkey->value);
$this->assertEquals($expecteduserid, $actualkey->userid);
$this->assertEquals($expectedscript, $actualkey->script);
$this->assertEquals($expectedinstance, $actualkey->instance);
$this->assertEquals($expectediprestriction, $actualkey->iprestriction);
$this->assertEquals($expectedvaliduntil, $actualkey->validuntil);
} }
/** /**
@ -226,19 +191,12 @@ class core_userkey_manager_testcase extends advanced_testcase {
$actualkey = $DB->get_record('user_private_key', array('userid' => $this->user->id)); $actualkey = $DB->get_record('user_private_key', array('userid' => $this->user->id));
$expectedvalue = $value; $this->assertEquals($value, $actualkey->value);
$expecteduserid = $this->user->id; $this->assertEquals($this->user->id, $actualkey->userid);
$expectedscript = 'auth/userkey'; $this->assertEquals('auth/userkey', $actualkey->script);
$expectedinstance = $this->user->id; $this->assertEquals($this->user->id, $actualkey->instance);
$expectediprestriction = '192.168.1.1'; $this->assertEquals('192.168.1.1', $actualkey->iprestriction);
$expectedvaliduntil = time() + 60; $this->assertEquals(time() + 60, $actualkey->validuntil);
$this->assertEquals($expectedvalue, $actualkey->value);
$this->assertEquals($expecteduserid, $actualkey->userid);
$this->assertEquals($expectedscript, $actualkey->script);
$this->assertEquals($expectedinstance, $actualkey->instance);
$this->assertEquals($expectediprestriction, $actualkey->iprestriction);
$this->assertEquals($expectedvaliduntil, $actualkey->validuntil);
} }
/** /**
@ -252,19 +210,12 @@ class core_userkey_manager_testcase extends advanced_testcase {
$actualkey = $DB->get_record('user_private_key', array('userid' => $this->user->id)); $actualkey = $DB->get_record('user_private_key', array('userid' => $this->user->id));
$expectedvalue = $value; $this->assertEquals($value, $actualkey->value);
$expecteduserid = $this->user->id; $this->assertEquals($this->user->id, $actualkey->userid);
$expectedscript = 'auth/userkey'; $this->assertEquals('auth/userkey', $actualkey->script);
$expectedinstance = $this->user->id; $this->assertEquals($this->user->id, $actualkey->instance);
$expectediprestriction = null; $this->assertEquals(null, $actualkey->iprestriction);
$expectedvaliduntil = time() + 60; $this->assertEquals(time() + 60, $actualkey->validuntil);
$this->assertEquals($expectedvalue, $actualkey->value);
$this->assertEquals($expecteduserid, $actualkey->userid);
$this->assertEquals($expectedscript, $actualkey->script);
$this->assertEquals($expectedinstance, $actualkey->instance);
$this->assertEquals($expectediprestriction, $actualkey->iprestriction);
$this->assertEquals($expectedvaliduntil, $actualkey->validuntil);
} }
/** /**
@ -280,19 +231,12 @@ class core_userkey_manager_testcase extends advanced_testcase {
$actualkey = $DB->get_record('user_private_key', array('userid' => $this->user->id)); $actualkey = $DB->get_record('user_private_key', array('userid' => $this->user->id));
$expectedvalue = $value; $this->assertEquals($value, $actualkey->value);
$expecteduserid = $this->user->id; $this->assertEquals($this->user->id, $actualkey->userid);
$expectedscript = 'auth/userkey'; $this->assertEquals('auth/userkey', $actualkey->script);
$expectedinstance = $this->user->id; $this->assertEquals($this->user->id, $actualkey->instance);
$expectediprestriction = null; $this->assertEquals(null, $actualkey->iprestriction);
$expectedvaliduntil = time() + 3000; $this->assertEquals(time() + 3000, $actualkey->validuntil);
$this->assertEquals($expectedvalue, $actualkey->value);
$this->assertEquals($expecteduserid, $actualkey->userid);
$this->assertEquals($expectedscript, $actualkey->script);
$this->assertEquals($expectedinstance, $actualkey->instance);
$this->assertEquals($expectediprestriction, $actualkey->iprestriction);
$this->assertEquals($expectedvaliduntil, $actualkey->validuntil);
} }
@ -309,19 +253,13 @@ class core_userkey_manager_testcase extends advanced_testcase {
$actualkey = $DB->get_record('user_private_key', array('userid' => $this->user->id)); $actualkey = $DB->get_record('user_private_key', array('userid' => $this->user->id));
$expectedvalue = $value; $this->assertEquals($value, $actualkey->value);
$expecteduserid = $this->user->id; $this->assertEquals($this->user->id, $actualkey->userid);
$expectedscript = 'auth/userkey'; $this->assertEquals('auth/userkey', $actualkey->script);
$expectedinstance = $this->user->id; $this->assertEquals($this->user->id, $actualkey->instance);
$expectediprestriction = null; $this->assertEquals(null, $actualkey->iprestriction);
$expectedvaliduntil = time() + 3000; $this->assertEquals(time() + 3000, $actualkey->validuntil);
$this->assertEquals($expectedvalue, $actualkey->value);
$this->assertEquals($expecteduserid, $actualkey->userid);
$this->assertEquals($expectedscript, $actualkey->script);
$this->assertEquals($expectedinstance, $actualkey->instance);
$this->assertEquals($expectediprestriction, $actualkey->iprestriction);
$this->assertEquals($expectedvaliduntil, $actualkey->validuntil);
} }
/** /**