fix/migrate-package-conflict (#2427)

Co-authored-by: mikatong <[email protected]>

Author: tongyiming

tencentcloud/resource_tc_gaap_layer4_listener_international_test.go renamed to tencentcloud/services/gaap/resource_tc_gaap_layer4_listener_international_test.go

@@ -1,18 +1,19 @@
-package tencentcloud
+package gaap_test
 
 import (
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
 )
 
 func TestAccTencentCloudInternationalGaapResource_listener4(t *testing.T) {
 	t.Parallel()
 	id := new(string)
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:  func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_PREPAY) },
-		Providers: testAccProviders,
+		PreCheck:  func() { tcacctest.AccPreCheck(t) },
+		Providers: tcacctest.AccProviders,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccInternationalGaapLayer4ListenerBasic,

tencentcloud/resource_tc_gaap_layer7_listener_international_test.go renamed to tencentcloud/services/gaap/resource_tc_gaap_layer7_listener_international_test.go

@@ -1,18 +1,19 @@
-package tencentcloud
+package gaap_test
 
 import (
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
 )
 
 func TestAccTencentCloudInternationalGaapResource_listener7(t *testing.T) {
 	t.Parallel()
 	id := new(string)
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:  func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_PREPAY) },
-		Providers: testAccProviders,
+		PreCheck:  func() { tcacctest.AccPreCheck(t) },
+		Providers: tcacctest.AccProviders,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccInternationalGaapLayer7ListenerBasic,

tencentcloud/resource_tc_gaap_proxy_international_test.go renamed to tencentcloud/services/gaap/resource_tc_gaap_proxy_international_test.go

@@ -1,18 +1,19 @@
-package tencentcloud
+package gaap_test
 
 import (
 	"regexp"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
 )
 
 func TestAccTencentCloudInternationalGaapResource_proxy(t *testing.T) {
 	id := new(string)
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProviders,
+		PreCheck:     func() { tcacctest.AccPreCheck(t) },
+		Providers:    tcacctest.AccProviders,
 		CheckDestroy: testAccCheckGaapProxyDestroy(id),
 		Steps: []resource.TestStep{
 			{