diff options
| author | kondou <kondou@ts.unde.re> | 2013-09-04 12:56:40 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-09-04 12:56:40 +0200 |
| commit | 820fd42161a6f61a7ba3252793558f88bc155355 (patch) | |
| tree | b1deef03464ac5cf078cb5ab9c09be8a0dcd4626 /tests | |
| parent | a1e7614d73c1a640521dfb2410349703c9afdc15 (diff) | |
| parent | 09187f3b3b30e6f810c6afff7332615ed472154e (diff) | |
| download | nextcloud-server-820fd42161a6f61a7ba3252793558f88bc155355.tar.gz nextcloud-server-820fd42161a6f61a7ba3252793558f88bc155355.zip | |
Merge branch 'master' into oc_avatars
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/db.php | 2 | ||||
| -rw-r--r-- | tests/lib/dbschema.php | 2 | ||||
| -rw-r--r-- | tests/lib/util.php | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/lib/db.php b/tests/lib/db.php index 51edbf7b309..1977025cf12 100644 --- a/tests/lib/db.php +++ b/tests/lib/db.php @@ -15,7 +15,7 @@ class Test_DB extends PHPUnit_Framework_TestCase { public function setUp() { $dbfile = OC::$SERVERROOT.'/tests/data/db_structure.xml'; - $r = '_'.OC_Util::generate_random_bytes('4').'_'; + $r = '_'.OC_Util::generateRandomBytes('4').'_'; $content = file_get_contents( $dbfile ); $content = str_replace( '*dbprefix*', '*dbprefix*'.$r, $content ); file_put_contents( self::$schema_file, $content ); diff --git a/tests/lib/dbschema.php b/tests/lib/dbschema.php index c2e55eabf4b..7de90c047ca 100644 --- a/tests/lib/dbschema.php +++ b/tests/lib/dbschema.php @@ -16,7 +16,7 @@ class Test_DBSchema extends PHPUnit_Framework_TestCase { $dbfile = OC::$SERVERROOT.'/tests/data/db_structure.xml'; $dbfile2 = OC::$SERVERROOT.'/tests/data/db_structure2.xml'; - $r = '_'.OC_Util::generate_random_bytes('4').'_'; + $r = '_'.OC_Util::generateRandomBytes('4').'_'; $content = file_get_contents( $dbfile ); $content = str_replace( '*dbprefix*', '*dbprefix*'.$r, $content ); file_put_contents( $this->schema_file, $content ); diff --git a/tests/lib/util.php b/tests/lib/util.php index 13aa49c8c6f..d607a3e7725 100644 --- a/tests/lib/util.php +++ b/tests/lib/util.php @@ -71,8 +71,8 @@ class Test_Util extends PHPUnit_Framework_TestCase { $this->assertTrue(\OC_Util::isInternetConnectionEnabled()); } - function testGenerate_random_bytes() { - $result = strlen(OC_Util::generate_random_bytes(59)); + function testGenerateRandomBytes() { + $result = strlen(OC_Util::generateRandomBytes(59)); $this->assertEquals(59, $result); } |