测试用例修改

tests/Services/OrderPackageCommoditiesService/SyncOrderPackageCommoditiesTest.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace Tests\Services\OrderPackageService\SyncOrderPackageCommoditiesTest;
-
-use App\Services\OracleDOCOrderHeaderService;
-use App\Services\OrderPackageCommoditiesService;
-use Illuminate\Foundation\Testing\RefreshDatabase;
-use Illuminate\Foundation\Testing\WithFaker;
-use Tests\TestCase;
-
-class SyncOrderPackageCommoditiesTest extends TestCase
-{
-    /**
-     * @var OrderPackageCommoditiesService $service
-     * @var OracleDOCOrderHeaderService $orderHeaderService
-     */
-    public $service;
-    public $orderHeaderService;
-
-    public function setUp(): void
-    {
-        parent::setUp();
-        $this->service = app('OrderPackageCommoditiesService');
-        $this->orderHeaderService = app('OracleDocOrderHeaderService');
-    }
-
-    public function testExample()
-    {
-        $response = $this->get('/');
-
-        $response->assertStatus(200);
-    }
-}

tests/Services/OrderTrackingService/CustomizedOperationTest.php

@@ -12,6 +12,8 @@ use Tests\TestCase;
 
 class CustomizedOperationTest extends TestCase
 {
+    use RefreshDatabase;
+
     /** @var OrderTrackingService $service */
     public $service;
 
@@ -23,16 +25,14 @@ class CustomizedOperationTest extends TestCase
 
     public function testCustomizedOperation()
     {
-        $carbon = Carbon::now()->subHours(12);
-        $orderHeaders = OracleDOCOrderHeader::query()->where('consigneeid',"ZT")->where('addtime',$carbon)->get();
+        $orderHeader = OracleDOCOrderHeader::query()->where('consigneeid',"ZT")->orderByDesc('AddTime')->first();
+        $orderHeaders = OracleDOCOrderHeader::query()->where('consigneeid',"ZT")->where('addtime','>=',$orderHeader->addtime)->get();
         $ZT_Count = $orderHeaders->count();
         /** @var Collection $orderHeader */
-        $orderHeader = $this->service->customizedOperation($orderHeaders);
+        $this->service->customizedOperation($orderHeaders);
         $XJ_Count  = $orderHeaders->filter(function($orderHeader){
             return $orderHeader->userdefine1 == 'XJWL';
         })->count();
-//        var_dump($orderHeaders->count(),$carbon);
-//        $this->assertNotEmpty($orderHeaders);
         $this->assertEquals($ZT_Count,$XJ_Count);
     }
 }

tests/Services/OrderTrackingService/FillInOrderTrackingTest.php

@@ -11,33 +11,32 @@ use Tests\TestCase;
 
 class FillInOrderTrackingTest extends TestCase
 {
+    use RefreshDatabase;
+
     /** @var OrderTrackingService $service */
     public $service;
-    public $data;
     public function setUp(): void
     {
         parent::setUp(); // TODO: Change the autogenerated stub
         $this->service = app('OrderTrackingService');
-        $this->data['orderTracking'] = factory(OrderTracking::class,10)->create();
     }
 
-    public function testFillInOrderTracking()
+    /**
+     * @test
+     */
+    public function fillInOrderTracking()
     {
         $data = new Carbon();
-        $orderTracking =  $this->data['orderTracking'];
+        $orderTracking =  factory(OrderTracking::class,10)->create();
         $this->service->fillInOrderTracking($orderTracking);
-        try {
-            $orderTracking_list = OrderTracking::query()->whereIn('id', data_get($orderTracking, '*.id'))->get();
-            $orderTracking_list->each(function ($item) use ($data, $orderTracking) {
-                $tracking = $orderTracking->where('id', $item->id)->first();
-                if ($item->created_at != '0000-00-00 00:00:00' &&
-                    $item->planning_sent_at !== '0000-00-00 00:00:00' &&
-                    $item->planning_sent_at < $data) {
-                    $this->assertEquals($tracking->planning_sent_at, $item->signed_at);
-                }
-            });
-        } catch (\Exception $e) {
-            OrderTracking::query()->whereIn('id',data_get($orderTracking,'*.id'))->delete();
-        }
+        $orderTracking_list = OrderTracking::query()->whereIn('id', data_get($orderTracking, '*.id'))->get();
+        $orderTracking_list->each(function ($item) use ($data, $orderTracking) {
+            $tracking = $orderTracking->where('id', $item->id)->first();
+            if ($item->created_at != '0000-00-00 00:00:00' &&
+                $item->planning_sent_at !== '0000-00-00 00:00:00' &&
+                $item->planning_sent_at < $data) {
+                $this->assertEquals($tracking->planning_sent_at, $item->signed_at);
+            }
+        });
     }
 }

tests/Services/OrderTrackingService/GetParamsByOrderHeaderAndOrderTest.php

@@ -1,39 +0,0 @@
-<?php
-
-namespace Tests\Services\OrderTrakingSerive\GetParamsByOrderHeaderAndOrderTest;
-
-use App\OracleDOCOrderHeader;
-use App\Order;
-use App\Services\OrderService;
-use App\Services\OrderTrackingService;
-use Illuminate\Foundation\Testing\RefreshDatabase;
-use Illuminate\Foundation\Testing\WithFaker;
-use Tests\TestCase;
-
-class GetParamsByOrderHeaderAndOrderTest extends TestCase
-{
-
-    /** @var OrderTrackingService $service */
-    public $service;
-
-    public function setUp(): void
-    {
-        $this->service=app(OrderTrackingService::class);
-        parent::setUp(); // TODO: Change the autogenerated stub
-    }
-
-    public function testGetParamsByOrderHeaderAndOrderTest()
-    {
-        /**
-         * @var Order $order
-         * @var OracleDOCOrderHeader $orderHeader
-         */
-        $order = Order::query()->first();
-        $orderHeader = OracleDOCOrderHeader::query()->where('OrderNo',$order->code)->first();
-        $this->assertNotEmpty($order);
-        $this->assertNotEmpty($orderHeader);
-        $orderTacking =  $this->service->getParamsByOrderHeaderAndOrder($orderHeader,$order);
-        $this->assertNotEmpty($orderTacking);
-        $this->assertNotEmpty($orderTacking['planning_sent_at']);
-    }
-}

tests/Services/WarehouseService/GetByWmsOrderTest.php

@@ -7,10 +7,12 @@ use App\OracleDOCOrderHeader;
 use App\Services\WarehouseService;
 use App\Warehouse;
 use Carbon\Carbon;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 
 class GetByWmsOrderTest extends TestCase
 {
+    use RefreshDatabase;
 
     /** @var WarehouseService $service */
     public $service;