From 89a27c4839fd2de3509b6ae5037acb151075a90f Mon Sep 17 00:00:00 2001
From: Timandes White <timands@gmail.com>
Date: Sun, 24 Jun 2018 07:47:23 +0800
Subject: [PATCH] Fix test cases

---
 tests/001.phpt                                            | 5 ++++-
 tests/ZookeeperConfig/add.phpt                            | 8 ++++----
 tests/ZookeeperConfig/remove.phpt                         | 7 +++----
 tests/ZookeeperConfig/set_n_get.phpt                      | 7 +++----
 tests/ZookeeperConfig/set_with_no_auth.phpt               | 7 +++----
 tests/add_auth.phpt                                       | 6 +++---
 tests/add_auth_with_callback.phpt                         | 6 +++---
 tests/check_if_exists_after_closing.phpt                  | 6 +++---
 tests/check_if_exists_without_connect.phpt                | 6 +++---
 tests/close.phpt                                          | 6 +++---
 tests/connect.phpt                                        | 6 +++---
 tests/connect_with_invalid_param.phpt                     | 6 +++---
 tests/construct.phpt                                      | 6 +++---
 tests/construct_and_connect.phpt                          | 6 +++---
 tests/construct_retrieve_error_with_invalid_recv.phpt     | 6 +++---
 tests/construct_with_invalid_param.phpt                   | 6 +++---
 tests/create_node.phpt                                    | 6 +++---
 tests/create_node_after_closing_and_connecting_again.phpt | 6 +++---
 tests/create_node_retrieve_invalid_status_error.phpt      | 6 +++---
 tests/create_node_with_invalid_param.phpt                 | 6 +++---
 tests/create_node_without_connect.phpt                    | 6 +++---
 tests/exists_retrieve_error_with_invalid_param.phpt       | 6 +++---
 tests/exists_with_invalid_param.phpt                      | 6 +++---
 tests/extension_info.phpt                                 | 6 +++---
 tests/getConfig.phpt                                      | 7 +++++--
 tests/gh-az-issue-29.phpt                                 | 6 +++---
 tests/remove_invalid_node.phpt                            | 6 +++---
 tests/remove_node.phpt                                    | 6 +++---
 tests/remove_node_with_invalid_param.phpt                 | 6 +++---
 tests/remove_node_without_connect.phpt                    | 6 +++---
 tests/retrieve_acl.phpt                                   | 6 +++---
 tests/retrieve_acl_error_with_invalid_node.phpt           | 6 +++---
 tests/retrieve_acl_without_connect.phpt                   | 6 +++---
 tests/retrieve_bool_is_recoverable.phpt                   | 6 +++---
 tests/retrieve_bool_is_recoverable_without_conect.phpt    | 6 +++---
 tests/retrieve_children.phpt                              | 6 +++---
 tests/retrieve_children_with_invalid_node.phpt            | 6 +++---
 tests/retrieve_children_with_watcher_callback.phpt        | 6 +++---
 tests/retrieve_children_without_connect.phpt              | 6 +++---
 tests/retrieve_client_id.phpt                             | 6 +++---
 tests/retrieve_client_id_with_param.phpt                  | 6 +++---
 tests/retrieve_client_id_without_connect.phpt             | 6 +++---
 tests/retrieve_error_recv_timeout_with_invalid_param.phpt | 6 +++---
 .../retrieve_error_when_get_node_with_invalid_param.phpt  | 6 +++---
 ...etrieve_error_when_getchildren_with_invalid_param.phpt | 6 +++---
 tests/retrieve_error_with_invalid_acl_param.phpt          | 6 +++---
 tests/retrieve_false_when_not_exists.phpt                 | 6 +++---
 tests/retrieve_node.phpt                                  | 6 +++---
 tests/retrieve_node_with_maxsize_param.phpt               | 6 +++---
 tests/retrieve_node_with_watcher_callback.phpt            | 6 +++---
 tests/retrieve_node_without_connect.phpt                  | 6 +++---
 tests/retrieve_null_when_get_empty_node.phpt              | 6 +++---
 tests/retrieve_recv_timeout.phpt                          | 6 +++---
 tests/retrieve_recv_timeout_without_connect.phpt          | 6 +++---
 tests/retrieve_state.phpt                                 | 6 +++---
 tests/retrieve_state_with_param.phpt                      | 6 +++---
 tests/retrieve_state_without_connect.phpt                 | 6 +++---
 tests/retrieve_true_when_exists.phpt                      | 6 +++---
 tests/retrieve_true_when_exists_with_callback.phpt        | 6 +++---
 tests/session-basic.phpt                                  | 6 +++---
 tests/set_node_value_without_connect.phpt                 | 6 +++---
 tests/set_null_value_and_stats_in_node.phpt               | 6 +++---
 tests/set_should_throw_error_with_invalid_node.phpt       | 6 +++---
 tests/set_should_throw_error_with_invalid_param.phpt      | 6 +++---
 tests/set_watcher.phpt                                    | 6 +++---
 tests/setacl_should_throw_error_with_invalid_param.phpt   | 6 +++---
 tests/should_set_acl.phpt                                 | 6 +++---
 tests/should_set_acl_with_invalid_path.phpt               | 6 +++---
 tests/should_set_acl_without_connect.phpt                 | 6 +++---
 tests/should_set_debug_level.phpt                         | 6 +++---
 tests/should_set_debug_level_with_invalid_param.phpt      | 6 +++---
 tests/should_set_deterministic_conn_order.phpt            | 6 +++---
 ...d_set_deterministic_conn_order_with_invalid_param.phpt | 6 +++---
 tests/should_set_log_stream_with_invalid_param.phpt       | 6 +++---
 tests/should_set_log_stream_with_resource.phpt            | 6 +++---
 tests/should_set_log_stream_with_string_path.phpt         | 6 +++---
 tests/should_set_node_value.phpt                          | 6 +++---
 tests/throw_error_when_add_auth.phpt                      | 6 +++---
 tests/throw_error_when_add_auth_without_connect.phpt      | 6 +++---
 tests/throw_error_when_get_non_existent_node.phpt         | 6 +++---
 tests/throw_error_when_set_param_in_isrecoverable.phpt    | 6 +++---
 .../throw_error_when_set_watcher_with_invalid_param.phpt  | 6 +++---
 82 files changed, 250 insertions(+), 247 deletions(-)

diff --git a/tests/001.phpt b/tests/001.phpt
index c335494..13433ca 100644
--- a/tests/001.phpt
+++ b/tests/001.phpt
@@ -1,7 +1,10 @@
 --TEST--
 Check for zookeeper presence
 --SKIPIF--
-<?php if (!extension_loaded("zookeeper")) print "skip"; ?>
+<?php
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php 
 echo "zookeeper extension is available";
diff --git a/tests/ZookeeperConfig/add.phpt b/tests/ZookeeperConfig/add.phpt
index a72d37a..e95285a 100644
--- a/tests/ZookeeperConfig/add.phpt
+++ b/tests/ZookeeperConfig/add.phpt
@@ -2,11 +2,10 @@
 ZookeeperConfig::add();
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'ZooKeeper extension is not loaded'
-}
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
 if (!class_exists('ZookeeperConfig'))
-    echo 'Skipping';
+    echo 'skip Class ZookeeperConfig is not defined';
 ?>
 --FILE--
 <?php
@@ -18,6 +17,7 @@ $zkConfig->set("server.1=localhost:2888:3888:participant;0.0.0.0:2181");
 
 $zkConfig->add("server.2=localhost:2889:3889:participant;0.0.0.0:2182");
 echo $zkConfig->get();
+?>
 --EXPECTF--
 server.1=localhost:2888:3888:participant;0.0.0.0:2181
 server.2=localhost:2889:3889:participant;0.0.0.0:2182
diff --git a/tests/ZookeeperConfig/remove.phpt b/tests/ZookeeperConfig/remove.phpt
index 50ae89e..97bd28b 100644
--- a/tests/ZookeeperConfig/remove.phpt
+++ b/tests/ZookeeperConfig/remove.phpt
@@ -2,11 +2,10 @@
 ZookeeperConfig::remove();
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'ZooKeeper extension is not loaded'
-}
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
 if (!class_exists('ZookeeperConfig'))
-    echo 'Skipping';
+    echo 'skip Class ZookeeperConfig is not defined';
 ?>
 --FILE--
 <?php
diff --git a/tests/ZookeeperConfig/set_n_get.phpt b/tests/ZookeeperConfig/set_n_get.phpt
index d94db87..def4dc1 100644
--- a/tests/ZookeeperConfig/set_n_get.phpt
+++ b/tests/ZookeeperConfig/set_n_get.phpt
@@ -2,11 +2,10 @@
 ZookeeperConfig::set() & ZookeeperConfig::get()
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'ZooKeeper extension is not loaded'
-}
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
 if (!class_exists('ZookeeperConfig'))
-    echo 'Skipping';
+    echo 'skip Class ZookeeperConfig is not defined';
 ?>
 --FILE--
 <?php
diff --git a/tests/ZookeeperConfig/set_with_no_auth.phpt b/tests/ZookeeperConfig/set_with_no_auth.phpt
index c047e98..063a2f8 100644
--- a/tests/ZookeeperConfig/set_with_no_auth.phpt
+++ b/tests/ZookeeperConfig/set_with_no_auth.phpt
@@ -2,11 +2,10 @@
 ZookeeperConfig::set() with no auth
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'ZooKeeper extension is not loaded'
-}
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
 if (!class_exists('ZookeeperConfig'))
-    echo 'Skipping';
+    echo 'skip Class ZookeeperConfig is not defined';
 ?>
 --FILE--
 <?php
diff --git a/tests/add_auth.phpt b/tests/add_auth.phpt
index a5c981b..a139532 100644
--- a/tests/add_auth.phpt
+++ b/tests/add_auth.phpt
@@ -2,9 +2,9 @@
 Should add auth
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/add_auth_with_callback.phpt b/tests/add_auth_with_callback.phpt
index 0eae73e..cdc86bc 100644
--- a/tests/add_auth_with_callback.phpt
+++ b/tests/add_auth_with_callback.phpt
@@ -2,9 +2,9 @@
 Should add auth and trigger completion callback
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $fh = fopen('/dev/null', 'w');
diff --git a/tests/check_if_exists_after_closing.phpt b/tests/check_if_exists_after_closing.phpt
index f469cbc..37d8ae8 100644
--- a/tests/check_if_exists_after_closing.phpt
+++ b/tests/check_if_exists_after_closing.phpt
@@ -2,9 +2,9 @@
 Should check if node exists after closing
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'ZooKeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper();
diff --git a/tests/check_if_exists_without_connect.phpt b/tests/check_if_exists_without_connect.phpt
index f68c4ee..54104e3 100644
--- a/tests/check_if_exists_without_connect.phpt
+++ b/tests/check_if_exists_without_connect.phpt
@@ -2,9 +2,9 @@
 Should check if node exists without connect
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper();
diff --git a/tests/close.phpt b/tests/close.phpt
index 3981acf..5cc0b59 100644
--- a/tests/close.phpt
+++ b/tests/close.phpt
@@ -2,9 +2,9 @@
 Should connect to the ZooKeeper and close it
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'ZooKeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper();
diff --git a/tests/connect.phpt b/tests/connect.phpt
index 09ab841..684d2c6 100644
--- a/tests/connect.phpt
+++ b/tests/connect.phpt
@@ -2,9 +2,9 @@
 Should connect the Zookeeper
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper();
diff --git a/tests/connect_with_invalid_param.phpt b/tests/connect_with_invalid_param.phpt
index fa3fb05..b7b8c70 100644
--- a/tests/connect_with_invalid_param.phpt
+++ b/tests/connect_with_invalid_param.phpt
@@ -2,9 +2,9 @@
 Should connect the Zookeeper with invalid parameter
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper();
diff --git a/tests/construct.phpt b/tests/construct.phpt
index 0589bb7..a2978f4 100644
--- a/tests/construct.phpt
+++ b/tests/construct.phpt
@@ -2,9 +2,9 @@
 Should construct
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper();
diff --git a/tests/construct_and_connect.phpt b/tests/construct_and_connect.phpt
index a18f026..446b13b 100644
--- a/tests/construct_and_connect.phpt
+++ b/tests/construct_and_connect.phpt
@@ -2,9 +2,9 @@
 Should construct and connect the zookeeper
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/construct_retrieve_error_with_invalid_recv.phpt b/tests/construct_retrieve_error_with_invalid_recv.phpt
index 55ca0bf..a99617b 100644
--- a/tests/construct_retrieve_error_with_invalid_recv.phpt
+++ b/tests/construct_retrieve_error_with_invalid_recv.phpt
@@ -2,9 +2,9 @@
 Should construct and connect the zookeeper
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 try {
diff --git a/tests/construct_with_invalid_param.phpt b/tests/construct_with_invalid_param.phpt
index d994dbb..33713c3 100644
--- a/tests/construct_with_invalid_param.phpt
+++ b/tests/construct_with_invalid_param.phpt
@@ -2,9 +2,9 @@
 Should construct with invalid parameters
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181', 10);
diff --git a/tests/create_node.phpt b/tests/create_node.phpt
index 6f81f2e..ba4a71f 100644
--- a/tests/create_node.phpt
+++ b/tests/create_node.phpt
@@ -2,9 +2,9 @@
 Should create node
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/create_node_after_closing_and_connecting_again.phpt b/tests/create_node_after_closing_and_connecting_again.phpt
index fe612f1..6ad2229 100644
--- a/tests/create_node_after_closing_and_connecting_again.phpt
+++ b/tests/create_node_after_closing_and_connecting_again.phpt
@@ -2,9 +2,9 @@
 Should create node after closing and connecting again
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'ZooKeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/create_node_retrieve_invalid_status_error.phpt b/tests/create_node_retrieve_invalid_status_error.phpt
index eb8cd27..24ccf93 100644
--- a/tests/create_node_retrieve_invalid_status_error.phpt
+++ b/tests/create_node_retrieve_invalid_status_error.phpt
@@ -2,9 +2,9 @@
 Should throw error when retrieve invalid status
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/create_node_with_invalid_param.phpt b/tests/create_node_with_invalid_param.phpt
index 2e9fc1d..d8f7f4e 100644
--- a/tests/create_node_with_invalid_param.phpt
+++ b/tests/create_node_with_invalid_param.phpt
@@ -2,9 +2,9 @@
 Should throw error when create node with invalid parameter
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/create_node_without_connect.phpt b/tests/create_node_without_connect.phpt
index 9b6e9e6..1451560 100644
--- a/tests/create_node_without_connect.phpt
+++ b/tests/create_node_without_connect.phpt
@@ -2,9 +2,9 @@
 Should create node without connect
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper();
diff --git a/tests/exists_retrieve_error_with_invalid_param.phpt b/tests/exists_retrieve_error_with_invalid_param.phpt
index 3dad98a..5348f5a 100644
--- a/tests/exists_retrieve_error_with_invalid_param.phpt
+++ b/tests/exists_retrieve_error_with_invalid_param.phpt
@@ -2,9 +2,9 @@
 Should retrieve error when set invalid parameter
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/exists_with_invalid_param.phpt b/tests/exists_with_invalid_param.phpt
index 80f97c4..b364d99 100644
--- a/tests/exists_with_invalid_param.phpt
+++ b/tests/exists_with_invalid_param.phpt
@@ -2,9 +2,9 @@
 Should retrieve error when set invalid data in second parameter
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/extension_info.phpt b/tests/extension_info.phpt
index 32c8a80..ce7e218 100644
--- a/tests/extension_info.phpt
+++ b/tests/extension_info.phpt
@@ -2,9 +2,9 @@
 Show extension info
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 
diff --git a/tests/getConfig.phpt b/tests/getConfig.phpt
index fc4d106..6568a7d 100644
--- a/tests/getConfig.phpt
+++ b/tests/getConfig.phpt
@@ -3,8 +3,11 @@ Zookeeper::getConfig()
 --SKIPIF--
 <?php
 if (!extension_loaded('zookeeper')) {
-    echo 'ZooKeeper extension is not loaded'
-};
+    echo 'skip ZooKeeper extension is not loaded';
+}
+if (!class_exists('ZookeeperConfig'))
+    echo 'skip Class ZookeeperConfig is not defined';
+?>
 --FILE--
 <?php
 $client = new Zookeeper();
diff --git a/tests/gh-az-issue-29.phpt b/tests/gh-az-issue-29.phpt
index 4783df1..0cf8ee2 100644
--- a/tests/gh-az-issue-29.phpt
+++ b/tests/gh-az-issue-29.phpt
@@ -2,9 +2,9 @@
 AndreiZ/php-zookeeper's issue #29
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded';
-}
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $path = '/test_az_issue_29';
diff --git a/tests/remove_invalid_node.phpt b/tests/remove_invalid_node.phpt
index bcff76d..b74702a 100644
--- a/tests/remove_invalid_node.phpt
+++ b/tests/remove_invalid_node.phpt
@@ -2,9 +2,9 @@
 Should delete invalid node
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/remove_node.phpt b/tests/remove_node.phpt
index bfb314c..199db43 100644
--- a/tests/remove_node.phpt
+++ b/tests/remove_node.phpt
@@ -2,9 +2,9 @@
 Should delete node
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/remove_node_with_invalid_param.phpt b/tests/remove_node_with_invalid_param.phpt
index d4e1576..6892597 100644
--- a/tests/remove_node_with_invalid_param.phpt
+++ b/tests/remove_node_with_invalid_param.phpt
@@ -2,9 +2,9 @@
 Should throw erro when delete node with invalid paramater
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/remove_node_without_connect.phpt b/tests/remove_node_without_connect.phpt
index ab80cc7..f5d8143 100644
--- a/tests/remove_node_without_connect.phpt
+++ b/tests/remove_node_without_connect.phpt
@@ -2,9 +2,9 @@
 Should delete node without connect
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper();
diff --git a/tests/retrieve_acl.phpt b/tests/retrieve_acl.phpt
index 6d693d7..aa25294 100644
--- a/tests/retrieve_acl.phpt
+++ b/tests/retrieve_acl.phpt
@@ -2,9 +2,9 @@
 Should retrieve acl
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/retrieve_acl_error_with_invalid_node.phpt b/tests/retrieve_acl_error_with_invalid_node.phpt
index 4b5cb9f..a77cb5e 100644
--- a/tests/retrieve_acl_error_with_invalid_node.phpt
+++ b/tests/retrieve_acl_error_with_invalid_node.phpt
@@ -2,9 +2,9 @@
 Should retrieve error when set invalid node
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/retrieve_acl_without_connect.phpt b/tests/retrieve_acl_without_connect.phpt
index d17dab0..5482df3 100644
--- a/tests/retrieve_acl_without_connect.phpt
+++ b/tests/retrieve_acl_without_connect.phpt
@@ -2,9 +2,9 @@
 Should retrieve acl without connect
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper();
diff --git a/tests/retrieve_bool_is_recoverable.phpt b/tests/retrieve_bool_is_recoverable.phpt
index 49bc0cf..8dcfb0b 100644
--- a/tests/retrieve_bool_is_recoverable.phpt
+++ b/tests/retrieve_bool_is_recoverable.phpt
@@ -2,9 +2,9 @@
 Should retrieve bool if is recoverable
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/retrieve_bool_is_recoverable_without_conect.phpt b/tests/retrieve_bool_is_recoverable_without_conect.phpt
index 9633494..afd35b3 100644
--- a/tests/retrieve_bool_is_recoverable_without_conect.phpt
+++ b/tests/retrieve_bool_is_recoverable_without_conect.phpt
@@ -2,9 +2,9 @@
 Should retrieve bool if is recoverable without connect
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper();
diff --git a/tests/retrieve_children.phpt b/tests/retrieve_children.phpt
index 11dac95..fe01500 100644
--- a/tests/retrieve_children.phpt
+++ b/tests/retrieve_children.phpt
@@ -2,9 +2,9 @@
 Should retrieve children
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/retrieve_children_with_invalid_node.phpt b/tests/retrieve_children_with_invalid_node.phpt
index a028fbc..20a6c0e 100644
--- a/tests/retrieve_children_with_invalid_node.phpt
+++ b/tests/retrieve_children_with_invalid_node.phpt
@@ -2,9 +2,9 @@
 Should retrieve children with invalid node
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/retrieve_children_with_watcher_callback.phpt b/tests/retrieve_children_with_watcher_callback.phpt
index 1241190..4231fa7 100644
--- a/tests/retrieve_children_with_watcher_callback.phpt
+++ b/tests/retrieve_children_with_watcher_callback.phpt
@@ -2,9 +2,9 @@
 Should retrieve children with watcher callback
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/retrieve_children_without_connect.phpt b/tests/retrieve_children_without_connect.phpt
index 727eafc..f47aac3 100644
--- a/tests/retrieve_children_without_connect.phpt
+++ b/tests/retrieve_children_without_connect.phpt
@@ -2,9 +2,9 @@
 Should retrieve children without connect
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper();
diff --git a/tests/retrieve_client_id.phpt b/tests/retrieve_client_id.phpt
index ede1c66..90f46d1 100644
--- a/tests/retrieve_client_id.phpt
+++ b/tests/retrieve_client_id.phpt
@@ -2,9 +2,9 @@
 Should get Zookeeper client id
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/retrieve_client_id_with_param.phpt b/tests/retrieve_client_id_with_param.phpt
index 3138b22..b35810d 100644
--- a/tests/retrieve_client_id_with_param.phpt
+++ b/tests/retrieve_client_id_with_param.phpt
@@ -2,9 +2,9 @@
 Get client id should throw error with parameter
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/retrieve_client_id_without_connect.phpt b/tests/retrieve_client_id_without_connect.phpt
index 7f71a01..a86a73c 100644
--- a/tests/retrieve_client_id_without_connect.phpt
+++ b/tests/retrieve_client_id_without_connect.phpt
@@ -2,9 +2,9 @@
 Should get client id without_connect
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper();
diff --git a/tests/retrieve_error_recv_timeout_with_invalid_param.phpt b/tests/retrieve_error_recv_timeout_with_invalid_param.phpt
index c2cbb5f..e1a9ee7 100644
--- a/tests/retrieve_error_recv_timeout_with_invalid_param.phpt
+++ b/tests/retrieve_error_recv_timeout_with_invalid_param.phpt
@@ -2,9 +2,9 @@
 Should retrieve error recv timeout with invalid parameter
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/retrieve_error_when_get_node_with_invalid_param.phpt b/tests/retrieve_error_when_get_node_with_invalid_param.phpt
index 9acb376..cb2817c 100644
--- a/tests/retrieve_error_when_get_node_with_invalid_param.phpt
+++ b/tests/retrieve_error_when_get_node_with_invalid_param.phpt
@@ -2,9 +2,9 @@
 Should get Zookeeper node with invalid parameter
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/retrieve_error_when_getchildren_with_invalid_param.phpt b/tests/retrieve_error_when_getchildren_with_invalid_param.phpt
index 8b1e034..8a79ce3 100644
--- a/tests/retrieve_error_when_getchildren_with_invalid_param.phpt
+++ b/tests/retrieve_error_when_getchildren_with_invalid_param.phpt
@@ -2,9 +2,9 @@
 Should retrieve error when get children with invalid param
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/retrieve_error_with_invalid_acl_param.phpt b/tests/retrieve_error_with_invalid_acl_param.phpt
index 45a2707..1cde456 100644
--- a/tests/retrieve_error_with_invalid_acl_param.phpt
+++ b/tests/retrieve_error_with_invalid_acl_param.phpt
@@ -2,9 +2,9 @@
 Should retrieve error when set invalid acl parameter
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/retrieve_false_when_not_exists.phpt b/tests/retrieve_false_when_not_exists.phpt
index f44a800..1f31efc 100644
--- a/tests/retrieve_false_when_not_exists.phpt
+++ b/tests/retrieve_false_when_not_exists.phpt
@@ -2,9 +2,9 @@
 Should retrieve false if node not exists
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/retrieve_node.phpt b/tests/retrieve_node.phpt
index d397c1a..f80a27d 100644
--- a/tests/retrieve_node.phpt
+++ b/tests/retrieve_node.phpt
@@ -2,9 +2,9 @@
 Should get Zookeeper node
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/retrieve_node_with_maxsize_param.phpt b/tests/retrieve_node_with_maxsize_param.phpt
index 48ba207..d1e83a6 100644
--- a/tests/retrieve_node_with_maxsize_param.phpt
+++ b/tests/retrieve_node_with_maxsize_param.phpt
@@ -2,9 +2,9 @@
 Should get node with max size
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/retrieve_node_with_watcher_callback.phpt b/tests/retrieve_node_with_watcher_callback.phpt
index 4d3c401..ff9dbe4 100644
--- a/tests/retrieve_node_with_watcher_callback.phpt
+++ b/tests/retrieve_node_with_watcher_callback.phpt
@@ -2,9 +2,9 @@
 Should get Zookeeper node with watcher callback
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 class Test extends Zookeeper
diff --git a/tests/retrieve_node_without_connect.phpt b/tests/retrieve_node_without_connect.phpt
index f9024f9..f6453a8 100644
--- a/tests/retrieve_node_without_connect.phpt
+++ b/tests/retrieve_node_without_connect.phpt
@@ -2,9 +2,9 @@
 Should get node without connect
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper();
diff --git a/tests/retrieve_null_when_get_empty_node.phpt b/tests/retrieve_null_when_get_empty_node.phpt
index 462edeb..fe429cd 100644
--- a/tests/retrieve_null_when_get_empty_node.phpt
+++ b/tests/retrieve_null_when_get_empty_node.phpt
@@ -2,9 +2,9 @@
 Should retrieve null when get empty node
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/retrieve_recv_timeout.phpt b/tests/retrieve_recv_timeout.phpt
index f141098..b700d49 100644
--- a/tests/retrieve_recv_timeout.phpt
+++ b/tests/retrieve_recv_timeout.phpt
@@ -2,9 +2,9 @@
 Should retrieve recv timeout
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/retrieve_recv_timeout_without_connect.phpt b/tests/retrieve_recv_timeout_without_connect.phpt
index b242c83..881be32 100644
--- a/tests/retrieve_recv_timeout_without_connect.phpt
+++ b/tests/retrieve_recv_timeout_without_connect.phpt
@@ -2,9 +2,9 @@
 Should retrieve recv timeout without connect
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper();
diff --git a/tests/retrieve_state.phpt b/tests/retrieve_state.phpt
index 179c7a6..49d6a68 100644
--- a/tests/retrieve_state.phpt
+++ b/tests/retrieve_state.phpt
@@ -2,9 +2,9 @@
 Should get Zookeeper state
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/retrieve_state_with_param.phpt b/tests/retrieve_state_with_param.phpt
index 4474e84..3065cc3 100644
--- a/tests/retrieve_state_with_param.phpt
+++ b/tests/retrieve_state_with_param.phpt
@@ -2,9 +2,9 @@
 Get state should throw error when define parameter
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/retrieve_state_without_connect.phpt b/tests/retrieve_state_without_connect.phpt
index b25efa2..8e87aae 100644
--- a/tests/retrieve_state_without_connect.phpt
+++ b/tests/retrieve_state_without_connect.phpt
@@ -2,9 +2,9 @@
 Should get state without connect
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper();
diff --git a/tests/retrieve_true_when_exists.phpt b/tests/retrieve_true_when_exists.phpt
index 57b3705..cf30b88 100644
--- a/tests/retrieve_true_when_exists.phpt
+++ b/tests/retrieve_true_when_exists.phpt
@@ -2,9 +2,9 @@
 Should retrieve true if node exists
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/retrieve_true_when_exists_with_callback.phpt b/tests/retrieve_true_when_exists_with_callback.phpt
index 9e5e4b3..6e547bd 100644
--- a/tests/retrieve_true_when_exists_with_callback.phpt
+++ b/tests/retrieve_true_when_exists_with_callback.phpt
@@ -2,9 +2,9 @@
 Should retrieve true if node exists with callback
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/session-basic.phpt b/tests/session-basic.phpt
index d3ceafb..dc98407 100644
--- a/tests/session-basic.phpt
+++ b/tests/session-basic.phpt
@@ -5,9 +5,9 @@ session.save_handler=zookeeper
 session.save_path=localhost:2181
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 session_start();
diff --git a/tests/set_node_value_without_connect.phpt b/tests/set_node_value_without_connect.phpt
index bdc421d..121eb15 100644
--- a/tests/set_node_value_without_connect.phpt
+++ b/tests/set_node_value_without_connect.phpt
@@ -2,9 +2,9 @@
 Test should set node value without connect
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper();
diff --git a/tests/set_null_value_and_stats_in_node.phpt b/tests/set_null_value_and_stats_in_node.phpt
index f26ae2b..b2ee136 100644
--- a/tests/set_null_value_and_stats_in_node.phpt
+++ b/tests/set_null_value_and_stats_in_node.phpt
@@ -2,9 +2,9 @@
 Set null value and stats in node
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/set_should_throw_error_with_invalid_node.phpt b/tests/set_should_throw_error_with_invalid_node.phpt
index 1640a64..51238a0 100644
--- a/tests/set_should_throw_error_with_invalid_node.phpt
+++ b/tests/set_should_throw_error_with_invalid_node.phpt
@@ -2,9 +2,9 @@
 Set should throw error with invalid node
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/set_should_throw_error_with_invalid_param.phpt b/tests/set_should_throw_error_with_invalid_param.phpt
index ce03bbb..60a4933 100644
--- a/tests/set_should_throw_error_with_invalid_param.phpt
+++ b/tests/set_should_throw_error_with_invalid_param.phpt
@@ -2,9 +2,9 @@
 Set should throw error with invalid paramater
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/set_watcher.phpt b/tests/set_watcher.phpt
index c432b7e..68c78e6 100644
--- a/tests/set_watcher.phpt
+++ b/tests/set_watcher.phpt
@@ -2,9 +2,9 @@
 Should set watcher
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/setacl_should_throw_error_with_invalid_param.phpt b/tests/setacl_should_throw_error_with_invalid_param.phpt
index b7206f2..10b88d6 100644
--- a/tests/setacl_should_throw_error_with_invalid_param.phpt
+++ b/tests/setacl_should_throw_error_with_invalid_param.phpt
@@ -2,9 +2,9 @@
 Set acl should throw erro with invalid param
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/should_set_acl.phpt b/tests/should_set_acl.phpt
index cc942e9..ed1b716 100644
--- a/tests/should_set_acl.phpt
+++ b/tests/should_set_acl.phpt
@@ -2,9 +2,9 @@
 Test should set acl
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/should_set_acl_with_invalid_path.phpt b/tests/should_set_acl_with_invalid_path.phpt
index de80b77..8a1dadb 100644
--- a/tests/should_set_acl_with_invalid_path.phpt
+++ b/tests/should_set_acl_with_invalid_path.phpt
@@ -2,9 +2,9 @@
 Test should set acl with invalid path
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/should_set_acl_without_connect.phpt b/tests/should_set_acl_without_connect.phpt
index 30d6230..a9327b7 100644
--- a/tests/should_set_acl_without_connect.phpt
+++ b/tests/should_set_acl_without_connect.phpt
@@ -2,9 +2,9 @@
 Test should set acl without connect
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper();
diff --git a/tests/should_set_debug_level.phpt b/tests/should_set_debug_level.phpt
index 0227562..85d99d1 100644
--- a/tests/should_set_debug_level.phpt
+++ b/tests/should_set_debug_level.phpt
@@ -2,9 +2,9 @@
 Test should set debug level
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/should_set_debug_level_with_invalid_param.phpt b/tests/should_set_debug_level_with_invalid_param.phpt
index afd4527..74d46e5 100644
--- a/tests/should_set_debug_level_with_invalid_param.phpt
+++ b/tests/should_set_debug_level_with_invalid_param.phpt
@@ -2,9 +2,9 @@
 Test should set debug level with invalid parameter
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/should_set_deterministic_conn_order.phpt b/tests/should_set_deterministic_conn_order.phpt
index c5e5c8c..4827103 100644
--- a/tests/should_set_deterministic_conn_order.phpt
+++ b/tests/should_set_deterministic_conn_order.phpt
@@ -2,9 +2,9 @@
 Test should set deterministic conn order
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper();
diff --git a/tests/should_set_deterministic_conn_order_with_invalid_param.phpt b/tests/should_set_deterministic_conn_order_with_invalid_param.phpt
index f49f942..64b1bc9 100644
--- a/tests/should_set_deterministic_conn_order_with_invalid_param.phpt
+++ b/tests/should_set_deterministic_conn_order_with_invalid_param.phpt
@@ -2,9 +2,9 @@
 Test should set deterministic conn order with invalid parameter
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/should_set_log_stream_with_invalid_param.phpt b/tests/should_set_log_stream_with_invalid_param.phpt
index 7ee8e09..6de98ac 100644
--- a/tests/should_set_log_stream_with_invalid_param.phpt
+++ b/tests/should_set_log_stream_with_invalid_param.phpt
@@ -2,9 +2,9 @@
 Test should set log stream with invalid parameter
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper();
diff --git a/tests/should_set_log_stream_with_resource.phpt b/tests/should_set_log_stream_with_resource.phpt
index 8887f69..1c48b18 100644
--- a/tests/should_set_log_stream_with_resource.phpt
+++ b/tests/should_set_log_stream_with_resource.phpt
@@ -2,9 +2,9 @@
 Test should set log stream with resource
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper();
diff --git a/tests/should_set_log_stream_with_string_path.phpt b/tests/should_set_log_stream_with_string_path.phpt
index 0976801..cfd558d 100644
--- a/tests/should_set_log_stream_with_string_path.phpt
+++ b/tests/should_set_log_stream_with_string_path.phpt
@@ -2,9 +2,9 @@
 Test should set log stream with string path file
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper();
diff --git a/tests/should_set_node_value.phpt b/tests/should_set_node_value.phpt
index 9307677..ba3ceab 100644
--- a/tests/should_set_node_value.phpt
+++ b/tests/should_set_node_value.phpt
@@ -2,9 +2,9 @@
 Test should set node value
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/throw_error_when_add_auth.phpt b/tests/throw_error_when_add_auth.phpt
index 697ebe8..392fc52 100644
--- a/tests/throw_error_when_add_auth.phpt
+++ b/tests/throw_error_when_add_auth.phpt
@@ -2,9 +2,9 @@
 Should throw error when add auth
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/throw_error_when_add_auth_without_connect.phpt b/tests/throw_error_when_add_auth_without_connect.phpt
index b5002ce..dff62fd 100644
--- a/tests/throw_error_when_add_auth_without_connect.phpt
+++ b/tests/throw_error_when_add_auth_without_connect.phpt
@@ -2,9 +2,9 @@
 Should throw error when add auth without connect
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper();
diff --git a/tests/throw_error_when_get_non_existent_node.phpt b/tests/throw_error_when_get_non_existent_node.phpt
index d64172f..1d92e23 100644
--- a/tests/throw_error_when_get_non_existent_node.phpt
+++ b/tests/throw_error_when_get_non_existent_node.phpt
@@ -2,9 +2,9 @@
 Throw error when get non existent node
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/throw_error_when_set_param_in_isrecoverable.phpt b/tests/throw_error_when_set_param_in_isrecoverable.phpt
index 35080b1..b0f443e 100644
--- a/tests/throw_error_when_set_param_in_isrecoverable.phpt
+++ b/tests/throw_error_when_set_param_in_isrecoverable.phpt
@@ -2,9 +2,9 @@
 Throw error when set parameter in isRecoverable method
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');
diff --git a/tests/throw_error_when_set_watcher_with_invalid_param.phpt b/tests/throw_error_when_set_watcher_with_invalid_param.phpt
index 55e2257..38f3f65 100644
--- a/tests/throw_error_when_set_watcher_with_invalid_param.phpt
+++ b/tests/throw_error_when_set_watcher_with_invalid_param.phpt
@@ -2,9 +2,9 @@
 Throw error when set watcher with invalid parameter
 --SKIPIF--
 <?php
-if (!extension_loaded('zookeeper')) {
-    echo 'Zookeeper extension is not loaded'
-};
+if (!extension_loaded('zookeeper'))
+    echo 'skip ZooKeeper extension is not loaded';
+?>
 --FILE--
 <?php
 $client = new Zookeeper('localhost:2181');