From f8965f1785b2c299e79fb17739cefa8cf7db9eba Mon Sep 17 00:00:00 2001 From: Nabeel Shahzad Date: Thu, 3 May 2018 15:36:26 -0500 Subject: [PATCH] Fix tests for new datatypes --- app/Database/factories/AcarsFactory.php | 2 ++ tests/AcarsTest.php | 8 +++----- tests/TestCase.php | 6 +++++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/Database/factories/AcarsFactory.php b/app/Database/factories/AcarsFactory.php index a10bfcd6..129f1731 100644 --- a/app/Database/factories/AcarsFactory.php +++ b/app/Database/factories/AcarsFactory.php @@ -9,12 +9,14 @@ $factory->define(App\Models\Acars::class, function (Faker $faker) { 'log' => $faker->text(100), 'lat' => $faker->latitude, 'lon' => $faker->longitude, + 'distance' => $faker->randomFloat(2, 0, 6000), 'heading' => $faker->numberBetween(0, 359), 'altitude' => $faker->numberBetween(20, 400), 'vs' => $faker->numberBetween(-5000, 5000), 'gs' => $faker->numberBetween(300, 500), 'transponder' => $faker->numberBetween(200, 9999), 'autopilot' => $faker->text(10), + 'fuel' => $faker->randomFloat(2, 100, 1000), 'fuel_flow' => $faker->randomFloat(2, 100, 1000), 'sim_time' => $faker->dateTime('now', 'UTC'), ]; diff --git a/tests/AcarsTest.php b/tests/AcarsTest.php index 2c555f6a..282e96e0 100644 --- a/tests/AcarsTest.php +++ b/tests/AcarsTest.php @@ -348,11 +348,9 @@ class AcarsTest extends TestCase $response->assertStatus(400); # Post an ACARS update - $acars = factory(App\Models\Acars::class)->make( - [ - 'id' => null, - ] - )->toArray(); + $acars = factory(App\Models\Acars::class)->make(['pirep_id' => $pirep_id])->toArray(); + + $acars = $this->transformData($acars); $update = ['positions' => [$acars]]; $response = $this->post($uri, $update); diff --git a/tests/TestCase.php b/tests/TestCase.php index 7f9c2a5a..c911b753 100755 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -116,9 +116,13 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase * @param array $data * @return array */ - protected function transformData(array $data): array + protected function transformData($data) { foreach($data as $key => $value) { + if(is_object($value)) { + $value = $this->transformData($value); + } + if (is_subclass_of($value, App\Interfaces\Unit::class)) { $data[$key] = $value->__toString(); }