From 17893bfb20652725f97a95602f3f6a5e8c2662e5 Mon Sep 17 00:00:00 2001
From: Tom Goodsell <56050072+tgoodsell-tempus@users.noreply.github.com>
Date: Fri, 22 Sep 2023 13:38:07 -0500
Subject: [PATCH] consolidate test

---
 ...rce_okta_app_oauth_role_assignment_test.go | 32 +++----------------
 1 file changed, 5 insertions(+), 27 deletions(-)

diff --git a/okta/resource_okta_app_oauth_role_assignment_test.go b/okta/resource_okta_app_oauth_role_assignment_test.go
index a26d23ea6..1f525f3e5 100644
--- a/okta/resource_okta_app_oauth_role_assignment_test.go
+++ b/okta/resource_okta_app_oauth_role_assignment_test.go
@@ -24,6 +24,11 @@ func TestAccResourceOktaAppOAuthRoleAssignment_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("okta_app_oauth_role_assignment.test", "label"),
 				),
 			},
+			{
+				ResourceName:      "okta_app_oauth_role_assignment.test",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 			{
 				Config: mgr.GetFixtures("basic_updated.tf", t),
 				Check: resource.ComposeTestCheckFunc(
@@ -73,30 +78,3 @@ func TestAccResourceOktaAppOAuthRoleAssignment_custom(t *testing.T) {
 		},
 	})
 }
-
-func TestAccResourceOktaAppOAuthRoleAssignment_import(t *testing.T) {
-	mgr := newFixtureManager("okta_app_oauth_role_assignment", t.Name())
-
-	oktaResourceTest(t, resource.TestCase{
-		PreCheck:                 testAccPreCheck(t),
-		ErrorCheck:               testAccErrorChecks(t),
-		ProtoV5ProviderFactories: testAccMergeProvidersFactories,
-		Steps: []resource.TestStep{
-			{
-				Config: mgr.GetFixtures("basic.tf", t),
-				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr("okta_app_oauth_role_assignment.test", "type", "HELP_DESK_ADMIN"),
-					resource.TestCheckResourceAttr("okta_app_oauth_role_assignment.test", "status", "ACTIVE"),
-					resource.TestCheckResourceAttrSet("okta_app_oauth_role_assignment.test", "id"),
-					resource.TestCheckResourceAttrSet("okta_app_oauth_role_assignment.test", "client_id"),
-					resource.TestCheckResourceAttrSet("okta_app_oauth_role_assignment.test", "label"),
-				),
-			},
-			{
-				ResourceName:      "okta_app_oauth_role_assignment.test",
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-		},
-	})
-}