From c618071cb3e385aa46e2871a33db6621715052a3 Mon Sep 17 00:00:00 2001 From: Wendy Nestor Date: Wed, 12 Feb 2014 09:33:52 -0400 Subject: [PATCH] Modificaciones a los Features Database Connections, Process y Process Supervisor --- ...egative_tests_database_connections.feature | 16 +++++++------- .../main_tests_supervisor.feature | 2 +- features/bootstrap/RestContext.php | 21 +++++++++++++++---- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/features/backend/database_connections/negative_tests_database_connections.feature b/features/backend/database_connections/negative_tests_database_connections.feature index f51b526fa..55eafef0e 100644 --- a/features/backend/database_connections/negative_tests_database_connections.feature +++ b/features/backend/database_connections/negative_tests_database_connections.feature @@ -25,15 +25,13 @@ Feature: DataBase Connections Negative Tests Examples: - | test_description | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description | error_code | error_message | - | Field required dbs_type | 74737540052e1641ab88249082085472 | | 192.168.11.71 | rb_cochalo | root | atopml2005 | 3306 | utf8 | mysql connection | 400 | dbs_type | - | Field required dbs_server | 74737540052e1641ab88249082085472 | mysql | | rb_cochalo | root | atopml2005 | 3306 | utf8 | mysql connection | 400 | dbs_server | - | Field required dbs_database_name | 74737540052e1641ab88249082085472 | mysql | 192.168.11.71 | | root | atopml2005 | 3306 | utf8 | mysql connection | 400 | dbs_database_name | - | Field required dbs_username | 74737540052e1641ab88249082085472 | mysql | 192.168.11.71 | rb_cochalo | | atopml2005 | 3306 | utf8 | mysql connection | 400 | dbs_username | - | Field required dbs_port | 74737540052e1641ab88249082085472 | mysql | 192.168.11.71 | rb_cochalo | root | atopml2005 | | utf8 | mysql connection | 400 | dbs_port | - | Field required dbs_encode | 74737540052e1641ab88249082085472 | mysql | 192.168.11.71 | rb_cochalo | root | atopml2005 | 3306 | | mysql connection | 400 | dbs_encode | - | Incorrect dbs_password | 74737540052e1641ab88249082085472 | mysql | 192.168.11.71 | rb_cochalo | root | atsample005 | 3306 | utf8 | mysql connection | 400 | dbs_password | - | Field required project | | mysql | 192.168.11.71 | rb_cochalo | root | atopml2005 | 3306 | utf8 | mysql connection | 400 | prj_uid | + | test_description | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description | error_code | error_message | + | Field required dbs_type | 74737540052e1641ab88249082085472 | | 192.168.11.71 | rb_cochalo | root | atopml2005 | 3306 | utf8 | mysql connection | 200 | Trying to connect to host FAILED | + | Field required dbs_server | 74737540052e1641ab88249082085472 | mysql | | rb_cochalo | root | atopml2005 | 3306 | utf8 | mysql connection | 200 | Error Testting Connection | + | Field required dbs_database_name | 74737540052e1641ab88249082085472 | mysql | 192.168.11.71 | | root | atopml2005 | 3306 | utf8 | mysql connection | 200 | The data base does'n exist! | + | Field required dbs_username | 74737540052e1641ab88249082085472 | mysql | 192.168.11.71 | rb_cochalo | | atopml2005 | 3306 | utf8 | mysql connection | 200 | MySql connection refused! | + | Field required dbs_encode | 74737540052e1641ab88249082085472 | mysql | 192.168.11.71 | rb_cochalo | root | atopml2005 | 3306 | | mysql connection | 200 | dbs_encode | + | Field required project | | mysql | 192.168.11.71 | rb_cochalo | root | atopml2005 | 3306 | utf8 | mysql connection | 400 | prj_uid | diff --git a/features/backend/process_supervisor/main_tests_supervisor.feature b/features/backend/process_supervisor/main_tests_supervisor.feature index 7390c6a3f..a4be5e322 100644 --- a/features/backend/process_supervisor/main_tests_supervisor.feature +++ b/features/backend/process_supervisor/main_tests_supervisor.feature @@ -70,7 +70,7 @@ Requirements: Examples: | test_description | project | pu_uid | - | Get the supervisor details | 85794888452ceeef3675164057928956 | 31336919452fa84404e3ac0086239686 | + | Get the supervisor details | 85794888452ceeef3675164057928956 | 45562646852fa827abb79a5097602637 | Scenario Outline: Get a List of dynaforms assigned to a process supervisor diff --git a/features/bootstrap/RestContext.php b/features/bootstrap/RestContext.php index 95e3cae34..407714696 100644 --- a/features/bootstrap/RestContext.php +++ b/features/bootstrap/RestContext.php @@ -1201,13 +1201,26 @@ class RestContext extends BehatContext if(isset($bodyResponse->error->message)){ $message = $bodyResponse->error->message; if (strpos($message,$arg1) === false) { - throw new \Exception("Error message text does not have: '" . $arg1 ."'' (actual: '$message')\n\n"); + throw new \Exception("Error message text does not have: '" . $arg1 ."' (actual: '$message')\n\n"); + } + }elseif(is_array($bodyResponse)){ + $error_found=false; + $messages = array(); + foreach($bodyResponse as $resp){ + if(isset($resp->error)){ + $messages[]=$resp->error; + if (strpos($resp->error,$arg1) !== false){ + $error_found=true; + } + } + + } + if(!$error_found){ + $message=implode("\n- ",$messages); + throw new \Exception("Error message text does not have: '" . $arg1 ."' \nCurrent messages: \n- $message\n\n"); } - - }else{ throw new \Exception('This is not a valid error response'); - } }else{