A few more tests.

Author: gitlost

tests/db_checkTest.php

@@ -1191,7 +1191,10 @@ function test_db_check_normalize_all() {
 		$option_id1 = intval( $wpdb->get_var( "SELECT option_id FROM {$wpdb->options} WHERE option_name IN ('option1') ORDER BY option_id ASC" ) );
 		$num_updates++;
 		add_option( 'option3', array( 'key1' => 'val3' . $decomposed_str1 ) );
-		$option_id2 = intval( $wpdb->get_var( "SELECT option_id FROM {$wpdb->options} WHERE option_name IN ('option3') ORDER BY option_id ASC" ) );
+		$option_id3 = intval( $wpdb->get_var( "SELECT option_id FROM {$wpdb->options} WHERE option_name IN ('option3') ORDER BY option_id ASC" ) );
+		$num_updates++;
+		add_option( 'option4', array( 'key1' => array( 'key2' => 'val4' . $decomposed_str1 ) ) );
+		$option_id4 = intval( $wpdb->get_var( "SELECT option_id FROM {$wpdb->options} WHERE option_name IN ('option4') ORDER BY option_id ASC" ) );
 		$num_updates++;
 
 		add_site_option( 'option1', 'val1' . $decomposed_str1 );
@@ -1293,6 +1296,27 @@ function test_db_check_normalize_all() {
 		remove_filter( 'unfc_batch_limit', array( $this, 'unfc_batch_limit_filter' ) );
 		remove_filter( 'pre_option_link_manager_enabled', '__return_true', 10 );
 
+		self::clear_func_args();
+
+		$_REQUEST = array();
+		$_REQUEST['unfc_db_check_normalize_all'] = 'unfc_db_check_normalize_all';
+		$_REQUEST['_wpnonce_normalize_all'] = wp_create_nonce( UNFC_DB_CHECK_MENU_SLUG . '-normalize_all' );
+		$this->assertTrue( 1 === wp_verify_nonce( $_REQUEST['_wpnonce_normalize_all'], UNFC_DB_CHECK_MENU_SLUG . '-normalize_all' ) );
+
+		$_SERVER['REQUEST_URI'] = 'http://example.org/wp-admin/tools.php?page=' . UNFC_DB_CHECK_MENU_SLUG;
+
+		$_REQUEST['unfc_type'] = 'post:asdf';
+
+		try {
+			do_action( 'load-' . $hook_suffix );
+		} catch ( WPDieException $e ) {
+			unset( $e );
+		}
+		$this->assertSame( 1, count( self::$func_args['wp_die'] ) );
+		$args = self::$func_args['wp_die'][0]['args'];
+		$this->assertSame( 1, count( $args ) );
+		$this->assertTrue( false !== stripos( $args[0][1], 'nothing' ) );
+
 		global $wpdb;
 		$ready = $wpdb->ready;
 		$last_result = $wpdb->last_result;

tests/toolsTest.php

@@ -131,23 +131,8 @@ function test_utf8_rand_chr() {
 
 		$out = unfc_utf8_rand_str();
         $this->assertTrue( ! isset( $out[ strspn( $out, $ASCII ) ] ) );
-	}
-
-	/**
-	 * @ticket unfc_list_pluck
-	 */
-    function test_list_pluck() {
-		$obj1 = new stdclass;
-		$obj1->id = 1;
-		$obj2 = new stdclass;
-		$obj2->id = 2;
-		$obj3 = new stdclass;
-		$obj4 = new stdclass;
-		$obj4->id = 4;
-
-		$list = array( $obj1, $obj2, $obj3, $obj4 );
-		$out = unfc_list_pluck( $list, 'id' );
-		$this->assertSame( array( 0 => 1, 1 => 2, 3 => 4 ), $out );
+		$out = unfc_utf8_rand_str( 1000, 0x10000 );
+        $this->assertTrue( unfc_is_valid_utf8( $out ) );
 	}
 
 	/**
@@ -171,4 +156,65 @@ function test_utf8_ranges() {
 			$this->assertSame( $expected, $actual );
 		}
 	}
+
+	/**
+	 * @ticket unfc_unicode_fmt
+	 */
+    function test_unicode_fmt() {
+		$arr = array(
+			/**/
+			array( 0, '0x0', '\x00' ),
+			array( 0xa, '0xa', '\x0a' ),
+			array( 0x80, '0x80', '\x80' ),
+			array( 0xff, '0xff', '\xff' ),
+			array( 0x800, '0x800', '\x{800}' ),
+			array( 0x10000, '0x10000', '\x{10000}' ),
+			/**/
+		);
+
+		foreach ( $arr as $item ) {
+			list( $c, $expected, $expected_preg ) = $item;
+			$actual = unfc_unicode_fmt( $c );
+			$this->assertSame( $expected, $actual );
+			$actual_preg = unfc_unicode_preg_fmt( $c );
+			$this->assertSame( $expected_preg, $actual_preg );
+		}
+	}
+
+	/**
+	 * @ticket unfc_get_cb
+	 */
+    function test_get_cb() {
+		$in = "\rasdfasdf\n\r";
+		$expected = "\rasdfasdf\n";
+		$out = unfc_get_cb( $in );
+		$this->assertSame( $expected, $out );
+	}
+
+	/**
+	 * @ticket unfc_array_map_recursive
+	 */
+    function test_array_map_recursive() {
+		$arr = array( 'a' => array( 'b' => array( 'c' => 'a', 'd' => 'b' ), 'e' => 'c' ), 'f' => 'd', 'g' => array( 'h' => 'e' ) ); 
+		$expected = array( 'a' => array( 'b' => array( 'c' => 'A', 'd' => 'B' ), 'e' => 'C' ), 'f' => 'D', 'g' => array( 'h' => 'E' ) );
+		$out = unfc_array_map_recursive( 'strtoupper', $arr );
+		$this->assertSame( $expected, $out );
+	}
+
+	/**
+	 * @ticket unfc_list_pluck
+	 */
+    function test_list_pluck() {
+		$obj1 = new stdclass;
+		$obj1->id = 1;
+		$obj2 = new stdclass;
+		$obj2->id = 2;
+		$obj3 = new stdclass;
+		$obj4 = new stdclass;
+		$obj4->id = 4;
+
+		$list = array( $obj1, $obj2, $obj3, $obj4 );
+		$out = unfc_list_pluck( $list, 'id' );
+		$this->assertSame( array( 0 => 1, 1 => 2, 3 => 4 ), $out );
+	}
 }