Skip these enchant tests if no dicts or providers are installed

diff --git a/ext/enchant/tests/broker_describe.phpt b/ext/enchant/tests/broker_describe.phpt
index 224902f579c939adec5e8719afb90e881352922b..721d618df32c6e60adea019896998fbce9b672be 100644 (file)
--- a/ext/enchant/tests/broker_describe.phpt
+++ b/ext/enchant/tests/broker_describe.phpt
@@ -4,8 +4,25 @@ enchant_broker_describe() function
 marcosptf - <marcosptf@yahoo.com.br>
 --SKIPIF--
 <?php
-if(!extension_loaded('enchant')) die('skip, enchant not loader');
-if(!enchant_broker_init()) die("failed, broker_init failure\n");
+if (!extension_loaded('enchant')) {
+       echo "skip: Enchant extension not enabled\n";
+       exit;
+}
+
+$broker = enchant_broker_init();
+
+if (!$broker) {
+       echo "skip: Unable to init broker\n";
+       exit;
+}
+
+if (!enchant_broker_describe($broker)) {
+       enchant_broker_free($broker);
+
+       echo "skip: No broker providers found\n";
+}
+
+enchant_broker_free($broker);
 ?>
 --FILE--
 <?php
@@ -30,6 +47,8 @@ if($broker) {
         echo "failed, brocker describe array \n";
     }
     
+    enchant_broker_free($broker);
+
 } else {
     echo("failed, broker_init failure\n");
 }

diff --git a/ext/enchant/tests/broker_list_dicts.phpt b/ext/enchant/tests/broker_list_dicts.phpt
index a634734a58705e192166fde70d39be18a2d69166..3b29a5d5e510ababd267710784d6b4ca87b22d85 100644 (file)
--- a/ext/enchant/tests/broker_list_dicts.phpt
+++ b/ext/enchant/tests/broker_list_dicts.phpt
@@ -4,8 +4,25 @@ enchant_broker_list_dicts() function
 marcosptf - <marcosptf@yahoo.com.br>
 --SKIPIF--
 <?php
-if(!extension_loaded('enchant')) die('skip, enchant not loader');
-if (!is_resource(enchant_broker_init())) {die("skip, resource dont load\n");}
+if (!extension_loaded('enchant')) {
+       echo "skip: Enchant extension not enabled\n";
+       exit;
+}
+
+$broker = enchant_broker_init();
+
+if (!$broker) {
+       echo "skip: Unable to init broker\n";
+       exit;
+}
+
+if (!enchant_broker_list_dicts($broker)) {
+       enchant_broker_free($broker);
+
+       echo "skip: No broker dicts installed\n";
+}
+
+enchant_broker_free($broker);
 ?>
 --FILE--
 <?php

diff --git a/ext/enchant/tests/bug13181.phpt b/ext/enchant/tests/bug13181.phpt
index 38aec636cf2f31ea3308eec6c1e8a7c9f944f8f8..79b28333d2bc4543cda14793ed911d2c729f07fb 100644 (file)
--- a/ext/enchant/tests/bug13181.phpt
+++ b/ext/enchant/tests/bug13181.phpt
@@ -2,9 +2,26 @@
 bug #13181, leaving a context frees the broker resources
 --SKIPIF--
 <?php 
-if(!extension_loaded('enchant')) die('skip, enchant not loader');
+if (!extension_loaded('enchant')) {
+       echo "skip: Enchant extension not enabled\n";
+       exit;
+}
+
+$broker = enchant_broker_init();
+
+if (!$broker) {
+       echo "skip: Unable to init broker\n";
+       exit;
+}
 
- ?>
+if (!enchant_broker_list_dicts($broker)) {
+       enchant_broker_free($broker);
+
+       echo "skip: No broker dicts installed\n";
+}
+
+enchant_broker_free($broker);
+?>
 --FILE--
 <?php
 function get_dictionnary() {