Create test for HitCounterService and fix some vars type to text

coderius · coderius · commit a8a4b1fc51dd · 2019-10-07T19:56:37.000Z
diff --git a/migrations/m190926_110717_hit_counter__table.php b/migrations/m190926_110717_hit_counter__table.php
@@ -20,14 +20,14 @@ public function safeUp()
         $this->createTable('{{%hit_counter}}', [
             'id' => $this->primaryKey()->unsigned(),
             'counter_id' => $this->string()->notNull(),
-            'cookie_mark'=> $this->char(32),
+            'cookie_mark'=> $this->char(32)->null(),
             'js_cookei_enabled' => $this->boolean()->notNull()->defaultValue(0),
             'js_java_enabled' => $this->boolean()->notNull()->defaultValue(0),
             'js_timezone_offset' => $this->integer()->null(),
-            'js_timezone' => $this->string(),
+            'js_timezone' => $this->string()->null(),
             'js_connection' => $this->string()->null(),
-            'js_current_url' => $this->string()->notNull(),
-            'js_referer_url' => $this->string(),
+            'js_current_url' => $this->text()->null(),
+            'js_referer_url' => $this->text()->null(),
             'js_screen_width' => $this->integer()->null(),
             'js_screen_height' => $this->integer()->null(),
             'js_color_depth' => $this->integer()->null(),
@@ -36,21 +36,21 @@ public function safeUp()
             'js_is_toutch_device' => $this->boolean()->notNull()->defaultValue(0),
             'js_processor_ram' => $this->integer()->null(),
 
-            'serv_ip' => $this->char(20)->notNull(),
-            'serv_user_agent' => $this->string(),
-            'serv_referer_url' => $this->string(),
-            'serv_server_name' => $this->string(),
+            'serv_ip' => $this->char(20)->null(),
+            'serv_user_agent' => $this->text()->null(),
+            'serv_referer_url' => $this->text()->null(),
+            'serv_server_name' => $this->string()->null(),
             'serv_auth_user_id' => $this->integer()->unsigned()->null(),
             'serv_port' => $this->integer()->unsigned()->null(),
             'serv_cookies' => 'JSON',
             
-            'serv_os' => $this->string(),
-            'serv_client' => $this->string(),
-            'serv_device' => $this->string(),
-            'serv_brand' => $this->string(),
-            'serv_model' => $this->string(),
-            'serv_bot' => $this->string(),
-            'serv_host_by_ip' => $this->string(),
+            'serv_os' => $this->string()->null(),
+            'serv_client' => $this->string()->null(),
+            'serv_device' => $this->string()->null(),
+            'serv_brand' => $this->string()->null(),
+            'serv_model' => $this->string()->null(),
+            'serv_bot' => $this->string()->null(),
+            'serv_host_by_ip' => $this->string()->null(),
             'serv_is_proxy_or_vpn' => $this->boolean()->notNull()->defaultValue(0),
 
             'created_at' => $this->dateTime()->notNull(),
diff --git a/models/HitCounterModel.php b/models/HitCounterModel.php
@@ -60,14 +60,14 @@ class HitCounterModel extends Model{
     public function rules()
     {
         return [
-            [['counter_id', 'js_current_url', 'serv_ip'], 'required'],
+            [['counter_id'], 'required'],
             [['js_cookei_enabled', 'js_java_enabled', 'js_timezone_offset', 'js_screen_width', 'js_screen_height', 'js_color_depth', 'js_history_length', 'js_is_toutch_device', 'js_processor_ram', 'serv_auth_user_id', 'serv_is_proxy_or_vpn', 'serv_port'], 'integer'],
-            [['serv_cookies'], 'string'],
-            [['counter_id', 'js_timezone', 'js_connection','js_current_url', 'js_referer_url', 'js_browser_language', 'serv_user_agent', 'serv_referer_url', 'serv_server_name', 'serv_os', 'serv_client', 'serv_device', 'serv_brand', 'serv_model', 'serv_bot', 'serv_host_by_ip'], 'string', 'max' => 255],
+            [['serv_cookies','js_current_url', 'js_referer_url','serv_referer_url','serv_user_agent'], 'string'],
+            [['counter_id', 'js_timezone', 'js_connection', 'js_browser_language',  'serv_server_name', 'serv_os', 'serv_client', 'serv_device', 'serv_brand', 'serv_model', 'serv_bot', 'serv_host_by_ip'], 'string', 'max' => 255],
             [['cookie_mark'], 'string', 'max' => 32],
             [['serv_ip'], 'string', 'max' => 20],
             [['serv_auth_user_id'], 'exist', 'skipOnError' => true, 'targetClass' => Module::getInstance()->userIdentityClass, 'targetAttribute' => ['serv_auth_user_id' => 'id']],
-            [['cookie_mark', 'js_timezone_offset','js_timezone', 'js_connection','js_referer_url','js_screen_width','js_screen_height','js_color_depth','js_browser_language','js_history_length','js_processor_ram','serv_user_agent','serv_referer_url','serv_server_name','serv_auth_user_id','serv_port','serv_cookies','serv_os','serv_client','serv_device','serv_brand','serv_model','serv_bot','serv_host_by_ip'], 'default', 'value' => null],
+            [['cookie_mark', 'js_current_url', 'serv_ip', 'js_timezone_offset','js_timezone', 'js_connection','js_referer_url','js_screen_width','js_screen_height','js_color_depth','js_browser_language','js_history_length','js_processor_ram','serv_user_agent','serv_referer_url','serv_server_name','serv_auth_user_id','serv_port','serv_cookies','serv_os','serv_client','serv_device','serv_brand','serv_model','serv_bot','serv_host_by_ip'], 'default', 'value' => null],
         ];
     }
   
diff --git a/services/HitCounterService.php b/services/HitCounterService.php
@@ -19,6 +19,7 @@
 use coderius\hitCounter\entities\HitCounter;
 use yii\helpers\ArrayHelper;
 use coderius\hitCounter\dto\HitDTO;
+use yii\web\BadRequestHttpException;
 
 class HitCounterService extends Component{
 
@@ -57,28 +58,33 @@ private function detectJsVisitInfo(Request $request)
         $array = $request->get();
         $data = [];
         
-        $data['counter_id']         = $array['i'];
-        $data['js_cookei_enabled']  = ArrayHelper::getValue($array, 'c', 0);
-        $data['js_java_enabled']    = ArrayHelper::getValue($array, 'j', 0);
-        $data['js_timezone_offset'] = $array['t'];
-        $data['js_timezone']        = $array['tz'];
-        $data['js_connection']      = $array['cnt'];
-        $data['js_current_url']     = $array['u'];
-        $data['js_referer_url']     = $array['r'];
-        $data['js_screen_width']    = $array['w'];
-        $data['js_screen_height']   = $array['h'];
-        $data['js_color_depth']     = $array['d'];
-        $data['js_browser_language']= $array['lg'];
-        $data['js_history_length']  = $array['hl'];
-        $data['js_is_toutch_device']= ArrayHelper::getValue($array, 'td', 0);
-        $data['js_processor_ram']   = $array['ram'];
+        if(isset($array['i'])){
+            $data['counter_id']         = $array['i'];
+            $data['js_cookei_enabled']  = ArrayHelper::getValue($array, 'c', 0);
+            $data['js_java_enabled']    = ArrayHelper::getValue($array, 'j', 0);
+            $data['js_timezone_offset'] = ArrayHelper::getValue($array, 't');
+            $data['js_timezone']        = ArrayHelper::getValue($array, 'tz');
+            $data['js_connection']      = ArrayHelper::getValue($array, 'cnt');
+            $data['js_current_url']     = ArrayHelper::getValue($array, 'u');
+            $data['js_referer_url']     = ArrayHelper::getValue($array, 'r');
+            $data['js_screen_width']    = ArrayHelper::getValue($array, 'w');
+            $data['js_screen_height']   = ArrayHelper::getValue($array, 'h');
+            $data['js_color_depth']     = ArrayHelper::getValue($array, 'd');
+            $data['js_browser_language']= ArrayHelper::getValue($array, 'lg');
+            $data['js_history_length']  = ArrayHelper::getValue($array, 'hl');
+            $data['js_is_toutch_device']= ArrayHelper::getValue($array, 'td', 0);
+            $data['js_processor_ram']   = ArrayHelper::getValue($array, 'ram');
+
+            return $data;
+        }else{
+           throw new BadRequestHttpException('required get param "i" cannot be empty.'); 
+        }
 
-        return $data;
     }   
     
     private function detectServerVisitInfo(Request $request)
     {
-        $request = Yii::$app->request;
+        // $request = Yii::$app->request;
         $data = [];
 
         //Common user data
@@ -110,7 +116,7 @@ private function detectServerVisitInfo(Request $request)
         
     }
 
-    public static function pastCookieMark()
+    private static function pastCookieMark()
     {
         $request = Yii::$app->request;
         $response = Yii::$app->response;
@@ -135,7 +141,7 @@ public static function pastCookieMark()
 
     public static function defaultNameCookieMark()
     {
-        return Inflector::camel2id(StringHelper::basename(get_called_class()));
+        return Inflector::camel2id(StringHelper::basename(__CLASS__));
     }
 
 }
diff --git a/tests/functional/HitCounterWidgetTest.php b/tests/functional/HitCounterWidgetTest.php
@@ -17,7 +17,7 @@ public function setUp(): void
 
   public function testRenderWidget()
   {
-    $expected = file_get_contents(__DIR__ . '/data/test-counter-html.bin');  
+    $expected = file_get_contents(__DIR__ . '/_data/test-counter-html.bin');  
     $out = \coderius\hitCounter\widgets\hitCounter\HitCounterWidget::widget([]);
     $this->assertEqualsWithoutLE($expected, $out);
   }
diff --git a/tests/functional/_data/test-counter-html.bin b/tests/functional/_data/test-counter-html.bin
diff --git a/tests/unit/HitCounterEntityTest.php b/tests/unit/HitCounterEntityTest.php
@@ -15,7 +15,7 @@ protected function setUp(): void
             'components' => [
                 'db' => [
                     'class' => 'yii\db\Connection',
-                    'dsn' => 'mysql:host=172.27.0.3;port=3306;dbname=test_db',
+                    'dsn' => 'mysql:host=172.27.0.3;port=3306;dbname=coderius',//test_db
                     'username' => 'root',
                     'password' => 'root',
                     'charset' => 'utf8',
diff --git a/tests/unit/HitCounterModelTest.php b/tests/unit/HitCounterModelTest.php
@@ -43,9 +43,9 @@ public function testValidRequiredTrue()
     {
         $this->model->load([
             'counter_id' =>  'w0', 
-            'js_current_url' => 'http://localhost', 
-            'serv_ip' => "172.27.0.1", 
-            'created_at' => "2019-10-05 20:44:32"
+            // 'js_current_url' => 'http://localhost', 
+            // 'serv_ip' => "172.27.0.1", 
+            // 'created_at' => "2019-10-05 20:44:32"
         ], '');
         
         $this->assertTrue($this->model->validate());
diff --git a/tests/unit/HitCounterServiceTest.php b/tests/unit/HitCounterServiceTest.php
@@ -5,21 +5,91 @@
 
 namespace tests\unit;
 
-use coderius\hitCounter\widgets\hitCounter\HitCounterWidget;
+use coderius\hitCounter\services\HitCounterService;
+use coderius\hitCounter\models\HitCounterModel;
+use coderius\hitCounter\entities\HitCounter;
+use coderius\hitCounter\Module;
+use yii\web\Request;
+use yii\di\Container;
+use Yii;
 
 class HitCounterServiceTest extends \tests\TestCase
 {
   
+    private $service;
+    // private $request;
 
-  public function test()
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Yii::configure(\Yii::$app, [
+          'components' => [
+            'user' => [
+                'class' => 'yii\web\User',
+                'identityClass' => '\tests\unit\user\User',
+            ],
+            'db' => [
+              'class' => 'yii\db\Connection',
+              'dsn' => 'mysql:host=172.27.0.3;port=3306;dbname=coderius',//test_db
+              'username' => 'root',
+              'password' => 'root',
+              'charset' => 'utf8',
+            ],
+          ],
+        ]);
+        Module::setInstance(new Module('hitCounter'));
+
+        // $this->request = $this->createMock(Request::class);  
+
+        $dd = $this->createMock('\coderius\hitCounter\components\deviceDetect\DeviceDetector');
+        $hcr = $this->createMock('coderius\hitCounter\repositories\HitCounterRepository');
+        $hcr->method('save');
+       
+        $this->service = new HitCounterService($dd, $hcr);
+    }
+
+  public function testDefaultNameCookieMarkExpectation()
   {
-      // Optional: Test anything here, if you want.
-      $this->assertTrue(true, 'This should already work.');
+    $cookieNameExpected = 'hit-counter-service';
+    $cookieNameActual = HitCounterService::defaultNameCookieMark();
 
-      // Stop here and mark this test as incomplete.
-      $this->markTestIncomplete(
-        'This test has not been implemented yet.'
-      );
+    $this->assertEquals($cookieNameExpected, $cookieNameActual);
   }
 
+  public function testLoadModel()
+  {
+    $request = \Yii::$app->request;
+    $values = ['i' => 'w0'];
+    $request->setQueryParams($values);
+    $model = $this->service->loadModel($request);
+
+    $this->assertInstanceOf(HitCounterModel::class, $model);
+    $this->assertEquals($values['i'], $model->counter_id);
+
+  }
+
+  public function testCreate()
+  {
+    $model = new HitCounterModel();
+    $model->setAttributes(['counter_id' => 'w0']);
+    $hit = $this->service->create($model);
+    $this->assertInstanceOf(HitCounter::class, $hit);
+    $this->assertEquals('w0', $hit->counter_id);
+    $this->assertNull($hit->js_is_toutch_device);
+    $this->assertNotNull($hit->created_at);
+  }
+
+
+  // public function test()
+  // {
+  //     // Optional: Test anything here, if you want.
+  //     $this->assertTrue(true, 'This should already work.');
+
+  //     // Stop here and mark this test as incomplete.
+  //     $this->markTestIncomplete(
+  //       'This test has not been implemented yet.'
+  //     );
+  // }
+
 } 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public function setUp(): void`
`17`	`17`
`18`	`18`	`public function testRenderWidget()`
`19`	`19`	`{`
`20`		`- $expected = file_get_contents(__DIR__ . '/data/test-counter-html.bin');`
	`20`	`+ $expected = file_get_contents(__DIR__ . '/_data/test-counter-html.bin');`
`21`	`21`	`$out = \coderius\hitCounter\widgets\hitCounter\HitCounterWidget::widget([]);`
`22`	`22`	`$this->assertEqualsWithoutLE($expected, $out);`
`23`	`23`	`}`