From 4a5aea92fb590dda1cb9f613503e966b44ac6c0b Mon Sep 17 00:00:00 2001 From: Amal Udjir Date: Thu, 8 May 2025 07:47:00 +0700 Subject: [PATCH] 8746 --- app/Http/Controllers/PHP/PHPController.php | 7 ++- .../PHP/Student/WelcomeController.php | 2 +- tests/Unit/HomepageLayoutTest.php | 50 ++++++++++++++----- 3 files changed, 44 insertions(+), 15 deletions(-) diff --git a/app/Http/Controllers/PHP/PHPController.php b/app/Http/Controllers/PHP/PHPController.php index c53a004..503419d 100644 --- a/app/Http/Controllers/PHP/PHPController.php +++ b/app/Http/Controllers/PHP/PHPController.php @@ -238,6 +238,8 @@ function task_submission_(Request $request){ $testing_number_one = "testing_number_four"; }elseif($_POST['testing_number_one'] == 5){ $testing_number_one = "testing_number_five"; + }elseif($_POST['testing_number_one'] == 6){ + $testing_number_one = "testing_number_six"; } DB::select("insert into php_submits_submission(task_id,testing_type,username,userfile,ket) values ('$task_id','$testing_number_one','$val','$file_name','$fileContent')"); @@ -267,6 +269,9 @@ function unittesting(){ }elseif($kode == '5'){ $unitesting_run = 'testLatihanNumberFive'; $testing_number_one = "testing_number_five"; + }elseif($kode == '6'){ + $unitesting_run = 'testLatihanNumberSix'; + $testing_number_one = "testing_number_six"; } /** CODECEPTION TEST */ @@ -283,7 +288,7 @@ function unittesting(){ $sql = DB::select("SELECT * FROM php_testing_rule WHERE testing_name = '$testing_number_one'"); $row = $sql[0]; - $html = $row->testing_rule; + $html = $row->testing_rule; $test = str_replace(array("\r\n","\r","\n"," "),"",$html); $result_test = htmlspecialchars($test); diff --git a/app/Http/Controllers/PHP/Student/WelcomeController.php b/app/Http/Controllers/PHP/Student/WelcomeController.php index 0cfe00f..2c232e1 100644 --- a/app/Http/Controllers/PHP/Student/WelcomeController.php +++ b/app/Http/Controllers/PHP/Student/WelcomeController.php @@ -111,7 +111,7 @@ function result_test_output(){ $result_content = str_replace(array("\r\n", "\r", "\n", " "), "", $studentOutput); return view('php.student.task.result_submssion_task', [ - 'result_up' => $result_content, + 'result_up' => $studentOutput, ]); ob_end_clean(); // echo "$value == $sess_name"; diff --git a/tests/Unit/HomepageLayoutTest.php b/tests/Unit/HomepageLayoutTest.php index 63d63e8..d152166 100644 --- a/tests/Unit/HomepageLayoutTest.php +++ b/tests/Unit/HomepageLayoutTest.php @@ -61,21 +61,45 @@ public function testLatihanNumberTwo():void{ public function testLatihanNumberThree():void{ - - - $response = $this->get("/phpunit/result-test-student/"); - - $sql = DB::select("SELECT * FROM php_testing_rule WHERE testing_name = 'testing_number_three'"); - $row = $sql[0]; - $html = $row->testing_rule; - - $test = str_replace(array("\r\n","\r","\n"," "),"",$html); - $result_test = htmlspecialchars($test); - - $result_content = str_replace(array("\r\n","\r"," "),"", $response->content()); - $this->assertStringContainsString($result_test, $result_content); + $response = $this->get("/phpunit/result-test-student/"); + $sql = DB::select("SELECT * FROM php_testing_rule WHERE testing_name = 'testing_number_three'"); + $row = $sql[0]; + $html = $row->testing_rule; + $hasil_output = $row->output; + $test = str_replace(array("\r\n","\r","\n"," "),"",$html); + $result_test = htmlspecialchars($test); + + $result_content = str_replace(array("\r\n","\r"," "),"", $response->content()); + if($result_test == $result_content){ + $this->assertStringContainsString($result_test, $result_content); + }else{ + $response = $this->get("/phpunit/result-test-student-output/"); + + $nama = "Ali Akbar"; + $umur = 20; + $tinggi = 172.5; + + $gaji_pokok = 1000000; + + $gaji_bulanan = 0; + $gaji_per_tahun = 0; + $ppn = 0; + $gaji_setelah_ppn = 0; + $gaji_bulanan = $gaji_pokok * 0.5; + $gaji_per_tahun = $gaji_bulanan * 12; + $ppn = $gaji_per_tahun * 0.10; + + $gaji_setelah_ppn = $gaji_per_tahun - $ppn; + $response->assertSeeText($umur); + $response->assertSeeText($tinggi); + $response->assertSeeText($gaji_pokok); + $response->assertSeeText($gaji_bulanan); + $response->assertSeeText($gaji_per_tahun); + $response->assertSeeText($ppn); + } + } public function testLatihanNumberFour():void{