restore test changes

Author: kachristensen

sumologic/resource_sumologic_cse_match_list_test.go

@@ -40,6 +40,7 @@ func TestAccSumologicSCEMatchList_createAndUpdate(t *testing.T) {
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCSEMatchListDestroy,
 		Steps: []resource.TestStep{
+			// Creates a match list with 1 match list item
 			{
 				Config: testCreateCSEMatchListConfig(nDefaultTtl, nDescription, nName, nTargetColumn, liDescription, liExpiration, liValue, liCount),
 				Check: resource.ComposeTestCheckFunc(
@@ -49,6 +50,17 @@ func TestAccSumologicSCEMatchList_createAndUpdate(t *testing.T) {
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
 				),
 			},
+			// Updates the match list and its 1 match list item
+			{
+				Config: testCreateCSEMatchListConfig(uDefaultTtl, uDescription, nName, nTargetColumn, liDescription, liExpiration, liValue, liCount),
+				Check: resource.ComposeTestCheckFunc(
+					testCheckCSEMatchListExists(resourceName, &matchList),
+					testCheckMatchListValues(&matchList, nDefaultTtl, nDescription, nName, nTargetColumn),
+					testCheckMatchListItemsValuesAndCount(resourceName, liDescription, liExpiration, liValue, liCount),
+					resource.TestCheckResourceAttrSet(resourceName, "id"),
+				),
+			},
+			// Deletes the 1 match list item and adds 3 new ones
 			{
 				Config: testCreateCSEMatchListConfig(uDefaultTtl, uDescription, nName, nTargetColumn, uliDescription, uliExpiration, uliValue, uliCount),
 				Check: resource.ComposeTestCheckFunc(
@@ -57,6 +69,7 @@ func TestAccSumologicSCEMatchList_createAndUpdate(t *testing.T) {
 					testCheckMatchListItemsValuesAndCount(resourceName, uliDescription, uliExpiration, uliValue, uliCount),
 				),
 			},
+			// Deletes all the match list items
 			{
 				Config: testDeleteCSEMatchListItemConfig(uDefaultTtl, uDescription, nName, nTargetColumn),
 				Check: resource.ComposeTestCheckFunc(
@@ -154,16 +167,16 @@ func testCheckCSEMatchListExists(n string, matchList *CSEMatchListGet) resource.
 func testCheckMatchListValues(matchList *CSEMatchListGet, nDefaultTtl int, nDescription string, nName string, nTargetColumn string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		if matchList.DefaultTtl != nDefaultTtl {
-			return fmt.Errorf("bad default ttl, expected \"%s\", got: %#v", nName, matchList.Name)
+			return fmt.Errorf("bad default ttl, expected \"%d\", got: \"%d\"", nDefaultTtl, matchList.DefaultTtl)
 		}
 		if matchList.Description != nDescription {
-			return fmt.Errorf("bad description, expected \"%s\", got: %#v", nDescription, matchList.Description)
+			return fmt.Errorf("bad description, expected \"%s\", got: \"%s\"", nDescription, matchList.Description)
 		}
 		if matchList.Name != nName {
-			return fmt.Errorf("bad name, expected \"%s\", got: %#v", nName, matchList.Name)
+			return fmt.Errorf("bad name, expected \"%s\", got: \"%s\"", nName, matchList.Name)
 		}
 		if matchList.TargetColumn != nTargetColumn {
-			return fmt.Errorf("bad target column, expected \"%s\", got: %#v", nName, matchList.Name)
+			return fmt.Errorf("bad target column, expected \"%s\", got: \"%s\"", nName, matchList.Name)
 		}
 
 		return nil
@@ -184,7 +197,7 @@ func testCheckMatchListItemsValuesAndCount(resourceName string, expectedDescript
 		c := testAccProvider.Meta().(*Client)
 		matchListResp, err := c.GetCSEMatchListItemsInMatchList(rs.Primary.ID)
 		if err != nil {
-			return err
+			return fmt.Errorf("could not get match list items by match list id %s", rs.Primary.ID)
 		}
 
 		actualCount := len(matchListResp.CSEMatchListItemsGetObjects)
@@ -204,12 +217,13 @@ func testCheckMatchListItemsValuesAndCount(resourceName string, expectedDescript
 				return fmt.Errorf("expected match list item description to contain \"%s\", but found \"%s\" instead", expectedDescription, item.Meta.Description)
 			}
 			if !strings.Contains(item.Expiration, expectedExpiration) {
-				return fmt.Errorf("expected expiration to be \"%s\", but found \"%s\" instead", expectedExpiration, item.Expiration)
+				return fmt.Errorf("expected expiration to contain \"%s\", but found \"%s\" instead", expectedExpiration, item.Expiration)
 			}
 			if !strings.Contains(item.Value, expectedValue) {
 				return fmt.Errorf("expected match list item value to contain \"%s\", but found \"%s\" instead", expectedValue, item.Value)
 			}
 		}
+
 		return nil
 	}
 }