chalec
/
ctrlv-privatebin
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small unit testing improvements, removing never accessed code

This commit is contained in:
El RIDO 2015-08-15 16:37:44 +02:00
parent c918a9fe2e
commit 134d22c958
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -49,6 +49,6 @@
* ADDED: Deletion URL. * ADDED: Deletion URL.
* small refactoring. * small refactoring.
* improved regex checks. * improved regex checks.
* larger server alt on installation. * larger server alt on installation.

17
lib/vizhash16x16.php
View File

@ -85,15 +85,6 @@ class vizhash16x16
return $imagedata; return $imagedata;
} }
// Generate a large random hexadecimal salt.
private function randomSalt()
{
$randomSalt='';
for($i=0;$i<6;$i++) { $randomSalt.=base_convert(mt_rand(),10,16); }
return $randomSalt;
}
private function getInt() // Returns a single integer from the $VALUES array (0...255) private function getInt() // Returns a single integer from the $VALUES array (0...255)
{ {
$v= $this->VALUES[$this->VALUES_INDEX]; $v= $this->VALUES[$this->VALUES_INDEX];
@ -101,6 +92,7 @@ class vizhash16x16
$this->VALUES_INDEX %= count($this->VALUES); // Warp around the array $this->VALUES_INDEX %= count($this->VALUES); // Warp around the array
return $v; return $v;
} }
private function getX() // Returns a single integer from the array (roughly mapped to image width) private function getX() // Returns a single integer from the array (roughly mapped to image width)
{ {
return $this->width*$this->getInt()/256; return $this->width*$this->getInt()/256;
@ -148,14 +140,9 @@ class vizhash16x16
$points = array($this->getX(), $this->getY(), $this->getX(), $this->getY(), $this->getX(), $this->getY(),$this->getX(), $this->getY()); $points = array($this->getX(), $this->getY(), $this->getX(), $this->getY(), $this->getX(), $this->getY(),$this->getX(), $this->getY());
ImageFilledPolygon ($image, $points, 4, $color); ImageFilledPolygon ($image, $points, 4, $color);
break; break;
case 4: default:
case 5:
case 6:
$start=$this->getInt()*360/256; $end=$start+$this->getInt()*180/256; $start=$this->getInt()*360/256; $end=$start+$this->getInt()*180/256;
ImageFilledArc ($image, $this->getX(), $this->getY(), $this->getX(), $this->getY(),$start,$end,$color,IMG_ARC_PIE); ImageFilledArc ($image, $this->getX(), $this->getY(), $this->getX(), $this->getY(),$start,$end,$color,IMG_ARC_PIE);
break;
} }
} }
} }
?>

9
tst/RainTPL.php
View File

@ -91,4 +91,13 @@ class RainTPLTest extends PHPUnit_Framework_TestCase
'outputs version correctly' 'outputs version correctly'
); );
} }
/**
* @expectedException RainTpl_Exception
*/
public function testMissingTemplate()
{
$test = new RainTPL;
$test->draw('123456789 does not exist!');
}
} }