测试用例修改 OrderIssueService

tests/Services/OrderIssueService/GetRecycleBinPaginateTest.php

@@ -5,11 +5,11 @@ namespace Tests\Services\OrderIssueService;
 use App\OrderIssue;
 use App\Services\OrderIssueService;
 use Illuminate\Foundation\Testing\RefreshDatabase;
-use Illuminate\Foundation\Testing\WithFaker;
 use Tests\TestCase;
 
 class GetRecycleBinPaginateTest extends TestCase
 {
+    use RefreshDatabase;
     /**
      * @var OrderIssueService $service
      */
@@ -19,24 +19,17 @@ class GetRecycleBinPaginateTest extends TestCase
     {
         parent::setUp(); // TODO: Change the autogenerated stub
         $this->service = app('OrderIssueService');
-        $orderIssues = $this->service->getRecycleBinPaginate([]);
-        if($orderIssues->count() == 0){
-            $orderIssue = OrderIssue::query()->create([
-                'is_new_rejecting' => '无',
-                'rejecting_status' => '无',
-                'imported_status' => '正常',
-            ]);
-            $data['orderIssue'] = $orderIssue;
-            $orderIssue->delete();
-        }
+        $orderIssue = factory(OrderIssue::class)->create([
+            'is_new_rejecting' => '无',
+            'rejecting_status' => '无',
+            'imported_status' => '正常',
+        ]);
+        $orderIssue->delete();
     }
 
     public function testGetRecycleBinPaginate()
     {
         $orderIssue = $this->service->getRecycleBinPaginate([]);
         $this->assertNotEmpty($orderIssue);
-        if(isset($data['orderIssue'])){
-            $data['orderIssue']->delete();
-        }
     }
 }

tests/Services/OrderIssueService/OrderIssueTagTest.php

@@ -3,12 +3,17 @@
 namespace Tests\Services\OrderIssueService\OrderIssueTagTest;
 
 use App\OracleDOCOrderHeader;
+use App\Order;
+use App\OrderIssue;
+use App\OrderPackage;
 use App\Services\OrderIssueService;
 use Carbon\Carbon;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 
 class OrderIssueTagTest extends TestCase
 {
+    use RefreshDatabase;
     /** @var OrderIssueService $service */
     public $service;
     public function setUp(): void
@@ -19,16 +24,25 @@ class OrderIssueTagTest extends TestCase
 
     public function testOrderIssueTag()
     {
-
-        $orderHeader = OracleDOCOrderHeader::query()->orderByDesc('AddTime')->first();
-        $addtime = $orderHeader->addtime;
-        $addtime = Carbon::parse((string)$addtime)->subMinutes(30);
+        $orderHeader = OracleDOCOrderHeader::query()->where('sostatus',99)->orderByDesc('AddTime')->first();
         $orderNos = OracleDOCOrderHeader::query()
-            ->where('AddTime','>=',$addtime)
+            ->where('AddTime','>=',$orderHeader->addtime)
+            ->where('sostatus',99)
             ->get()
             ->map(function($orderHeader){
                 return $orderHeader->orderno;
             });
+        $orderNo_arr = collect($orderNos)->chunk(5)->toArray();
+        $orderNos  = $orderNo_arr[0];
         $this->assertNotNull($orderNos);
+        $arr = [];
+        $arr['orderNos'] = $orderNos;
+        $arr['typeId'] = 0;
+        $arr['result_explain'] = '';
+        $this->service->orderIssueTag($arr);
+        $orderIssue = OrderIssue::query()->whereHas('order',function($query)use($orderNos){
+            $query->whereIn('code',$orderNos);
+        })->get();
+        $this->assertEquals($orderIssue->count(),count($orderNos));
     }
 }

tests/Services/OrderIssueService/RecoverOrderIssueTest.php

@@ -10,6 +10,7 @@ use Tests\TestCase;
 
 class RecoverOrderIssueTest extends TestCase
 {
+    use RefreshDatabase;
     /**
      * @var OrderIssueService $service
      */
@@ -20,13 +21,8 @@ class RecoverOrderIssueTest extends TestCase
     {
         parent::setUp(); // TODO: Change the autogenerated stub
         $this->service = app('OrderIssueService');
-        $orderIssue = OrderIssue::query()->create([
-            'is_new_rejecting' => '无',
-            'rejecting_status' => '无',
-            'imported_status' => '正常',
-        ]);
-        $this->data['orderIssue'] = $orderIssue;
-        $orderIssue->delete();
+        $this->data['orderIssue'] = factory(OrderIssue::class)->create();
+        $this->data['orderIssue']->delete();
     }
 
     public function testRecoverOrderIssue()
@@ -35,6 +31,5 @@ class RecoverOrderIssueTest extends TestCase
         $this->service->recoverOrderIssue($ids);
         $orderIssue = OrderIssue::query()->where('id',$ids[0])->first();
         $this->assertNotEmpty($orderIssue);
-        $orderIssue->forceDelete();
     }
 }