From fc38efb7d47977ef77668a3ed4c04c4a7ac11dd6 Mon Sep 17 00:00:00 2001
From: loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
Date: Sat, 5 Jun 2021 11:23:12 +0800
Subject: [PATCH] Fix lint and format code in adapter/httplib dir

---
 CHANGELOG.md                    |  1 +
 adapter/httplib/httplib_test.go | 22 ++++++++++------------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9eed8490..aafdfaab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - Add: Convenient way to generate mock object [4620](https://github.com/beego/beego/issues/4620)
 - Infra: use dependabot to update dependencies. [4623](https://github.com/beego/beego/pull/4623)
 - Lint: use golangci-lint. [4619](https://github.com/beego/beego/pull/4619)
+- Fix lint and format code in adapter/httplib dir [4648](https://github.com/beego/beego/pull/4648)
 - Chore: format code. [4615](https://github.com/beego/beego/pull/4615)
 - Test on Go v1.15.x & v1.16.x. [4614](https://github.com/beego/beego/pull/4614)
 - Env: non-empty GOBIN & GOPATH. [4613](https://github.com/beego/beego/pull/4613)
diff --git a/adapter/httplib/httplib_test.go b/adapter/httplib/httplib_test.go
index 298d84f9..41018c19 100644
--- a/adapter/httplib/httplib_test.go
+++ b/adapter/httplib/httplib_test.go
@@ -26,11 +26,13 @@ import (
 	"time"
 )
 
-const getUrl = "http://httpbin.org/get"
-const ipUrl = "http://httpbin.org/ip"
+const (
+	getURL = "http://httpbin.org/get"
+	ipURL  = "http://httpbin.org/ip"
+)
 
 func TestResponse(t *testing.T) {
-	req := Get(getUrl)
+	req := Get(getURL)
 	resp, err := req.Response()
 	if err != nil {
 		t.Fatal(err)
@@ -63,12 +65,10 @@ func TestDoRequest(t *testing.T) {
 	if elapsedTime < delayedTime {
 		t.Errorf("Not enough retries. Took %dms. Delay was meant to take %dms", elapsedTime, delayedTime)
 	}
-
 }
 
 func TestGet(t *testing.T) {
-
-	req := Get(getUrl)
+	req := Get(getURL)
 	b, err := req.Bytes()
 	if err != nil {
 		t.Fatal(err)
@@ -210,7 +210,7 @@ func TestWithSetting(t *testing.T) {
 	setting.ReadWriteTimeout = 5 * time.Second
 	SetDefaultSetting(setting)
 
-	str, err := Get(getUrl).String()
+	str, err := Get(getURL).String()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -223,8 +223,7 @@ func TestWithSetting(t *testing.T) {
 }
 
 func TestToJson(t *testing.T) {
-
-	req := Get(ipUrl)
+	req := Get(ipURL)
 	resp, err := req.Response()
 	if err != nil {
 		t.Fatal(err)
@@ -250,12 +249,11 @@ func TestToJson(t *testing.T) {
 			t.Fatal("response is not valid ip")
 		}
 	}
-
 }
 
 func TestToFile(t *testing.T) {
 	f := "beego_testfile"
-	req := Get(ipUrl)
+	req := Get(ipURL)
 	err := req.ToFile(f)
 	if err != nil {
 		t.Fatal(err)
@@ -269,7 +267,7 @@ func TestToFile(t *testing.T) {
 
 func TestToFileDir(t *testing.T) {
 	f := "./files/beego_testfile"
-	req := Get(ipUrl)
+	req := Get(ipURL)
 	err := req.ToFile(f)
 	if err != nil {
 		t.Fatal(err)