summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorsten <stenmarsh938@gmail.com>2016-03-17 15:28:44 +0300
committersten <stenmarsh938@gmail.com>2016-03-17 15:28:44 +0300
commit9e4bfd7081c8c26bc566d0aa174aba2edd447bf7 (patch)
tree5cf790e1491d20009b5f2ee3c93b4a7139a98b4b /tests
parent7411904201738524b74f15cdc2ccc3d8d862a94b (diff)
downloadscheduler-helper-php-9e4bfd7081c8c26bc566d0aa174aba2edd447bf7.zip
scheduler-helper-php-9e4bfd7081c8c26bc566d0aa174aba2edd447bf7.tar.gz
scheduler-helper-php-9e4bfd7081c8c26bc566d0aa174aba2edd447bf7.tar.bz2
Add tests data from file converting to assoc array.
Diffstat (limited to 'tests')
-rw-r--r--tests/SchedulerHelperTest.php6
-rw-r--r--tests/TestBaseHelper.php2
-rw-r--r--tests/TestDataHelper.php4
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/SchedulerHelperTest.php b/tests/SchedulerHelperTest.php
index aa5dd5c..70eeff5 100644
--- a/tests/SchedulerHelperTest.php
+++ b/tests/SchedulerHelperTest.php
@@ -62,11 +62,11 @@ class SchedulerHelperTest extends \PHPUnit_Framework_TestCase
}
$this->_baseHelper->resetTable();
- $this->_baseHelper->insertDataFromJSON($source->{'data'});
+ $this->_baseHelper->insertDataFromJSON($source['data']);
- $helperData = $schedHelper->getData($source->settings->start_date, $source->settings->end_date);
+ $helperData = $schedHelper->getData($source["settings"]["start_date"], $source["settings"]["end_date"]);
$dataHelp->writeObjectToFile($helperData, "_helperData.txt", $dataPacks[$i]);
- $this->assertTrue($dataHelp->compareDataBunches($helperData, $target->data, TestConfig::$fields),
+ $this->assertTrue($dataHelp->compareDataBunches($helperData, $target["data"], TestConfig::$fields),
"Helper and Scheduler data has difference");
}
}
diff --git a/tests/TestBaseHelper.php b/tests/TestBaseHelper.php
index 953e4c6..d18ac28 100644
--- a/tests/TestBaseHelper.php
+++ b/tests/TestBaseHelper.php
@@ -84,7 +84,7 @@ class TestBaseHelper
$event = $data[$i];
$elNumb = 1;
foreach($f as $name=>$type) {
- $sql .= isset($event->{$name}) && !is_null($event->{$name}) ? "'".$event->{$name}."'":"''";
+ $sql .= isset($event[$name]) && !is_null($event[$name]) ? "'".$event[$name]."'":"''";
if ($elNumb++ != $fieldsCount)
$sql .= ",";
diff --git a/tests/TestDataHelper.php b/tests/TestDataHelper.php
index 9195ccc..dd3eebd 100644
--- a/tests/TestDataHelper.php
+++ b/tests/TestDataHelper.php
@@ -14,7 +14,7 @@ class TestDataHelper
$file = dirname(__FILE__) . "/" . $this->_dataFolder . "/" . $name . "/" . $type;
if (!file_exists($file)) return null;
- return json_decode(file_get_contents($file));
+ return json_decode(file_get_contents($file),true);
}
public function __construct($testName)
@@ -49,7 +49,7 @@ class TestDataHelper
public function compareDataObjects($helperObj, $schedObj, $fields)
{
foreach($fields as $key=>$value){
- if($helperObj[$key] !== $schedObj -> {$key}) {
+ if($helperObj[$key] !== $schedObj[$key]) {
return false;
}
}