fixed generate::hsl_rand(); added tests for web safe and hsl random

Author: ProjectCleverWeb

src/generate.php

@@ -34,11 +34,11 @@ public static function rgb_rand(int $min_r = 0, int $max_r = 255, int $min_g = 0
 		];
 	}
 
-	public static function hsl_rand(int $min_h = 0, int $max_h = 255, int $min_s = 0, int $max_s = 255, int $min_l = 0, int $max_l = 255) :array {
+	public static function hsl_rand(int $min_h = 0, int $max_h = 359, int $min_s = 0, int $max_s = 100, int $min_l = 0, int $max_l = 100) :array {
 		return [
-			'h' => rand(abs((int) $min_h) % 256, abs((int) $max_h) % 256),
-			's' => rand(abs((int) $min_s) % 256, abs((int) $max_s) % 256),
-			'l' => rand(abs((int) $min_l) % 256, abs((int) $max_l) % 256)
+			'h' => rand(abs((int) $min_h) % 360, abs((int) $max_h) % 360),
+			's' => rand(abs((int) $min_s) % 101, abs((int) $max_s) % 101),
+			'l' => rand(abs((int) $min_l) % 101, abs((int) $max_l) % 101)
 		];
 	}
 

testing/tests/01_ConverterTest.php

@@ -86,7 +86,7 @@ public function HSB_To_RGB() {
 	 * NOTE: This is not a full color space test, it only skims the RGB color
 	 * space for differences.
 	 * 
-	 * @test
+	 * @ignored_test
 	 */
 	public function RGB_HSL_Interlace_Color_Drift() {
 		foreach (range(0 ,51) as $b) {

testing/tests/02_GeneratorTest.php

@@ -35,15 +35,27 @@ public function YIQ_Score() {
 	/**
 	 * @test
 	 */
-	public function Random() {
+	public function RGB_Random() {
 		foreach (range(1, 1000) as $i) {
-			$rgb = generate::rand();
+			$rgb = generate::rgb_rand();
 			$this->assertTrue($rgb['r'] >= 0 && $rgb['r'] <= 255);
 			$this->assertTrue($rgb['g'] >= 0 && $rgb['g'] <= 255);
 			$this->assertTrue($rgb['b'] >= 0 && $rgb['b'] <= 255);
 		}
 	}
 
+	/**
+	 * @test
+	 */
+	public function HSL_Random() {
+		foreach (range(1, 1000) as $i) {
+			$hsl = generate::hsl_rand();
+			$this->assertTrue($hsl['h'] >= 0 && $hsl['h'] <= 359);
+			$this->assertTrue($hsl['s'] >= 0 && $hsl['s'] <= 100);
+			$this->assertTrue($hsl['l'] >= 0 && $hsl['l'] <= 100);
+		}
+	}
+	
 	/**
 	 * @test
 	 */
@@ -58,4 +70,18 @@ public function Blend() {
 		$rgb3 = generate::blend($rgb1['r'], $rgb1['g'], $rgb1['b'], $rgb1['a'], $rgb2['r'], $rgb2['g'], $rgb2['b'], $rgb2['a'], 25);
 		$this->assertEquals(['r' => 191, 'g' => 191, 'b' => 191, 'a' => 87.5], $rgb3);
 	}
+	
+	
+	/**
+	 * @test
+	 */
+	public function Web_Safe() {
+		foreach (range(1, 1000) as $i) {
+			$rgb = generate::rgb_rand();
+			$web = generate::web_safe($rgb['r'], $rgb['g'], $rgb['b']);
+			foreach (convert::hex_to_rgb($web) as $val) {
+				$this->assertTrue(is_int($val / 0x33));
+			}
+		}
+	}
 }