using random name for topics in the test.

neverdreams · codycushing · commit 755bad8b5b01 · 2019-05-06T16:42:54.000-07:00
diff --git a/oci/monitoring_alarm_history_collection_test.go b/oci/monitoring_alarm_history_collection_test.go
@@ -21,7 +21,7 @@ var (
 	}
 
 	AlarmHistoryCollectionResourceConfig = DefinedTagsDependencies + AvailabilityDomainConfig +
-		generateResourceFromRepresentationMap("oci_ons_notification_topic", "test_notification_topic", Required, Create, getTopicRepresentationCopyWithSuffixName("alarmhistorycollection")) +
+		generateResourceFromRepresentationMap("oci_ons_notification_topic", "test_notification_topic", Required, Create, getTopicRepresentationCopyWithRandomNameOrHttpReplayValue(20, charsetWithoutDigits, "talarmhistorycollection")) +
 		generateResourceFromRepresentationMap("oci_monitoring_alarm", "test_alarm", Required, Create, alarmRepresentation)
 )
 
diff --git a/oci/monitoring_alarm_status_test.go b/oci/monitoring_alarm_status_test.go
@@ -20,7 +20,7 @@ var (
 	}
 
 	AlarmStatusResourceConfig = DefinedTagsDependencies + AvailabilityDomainConfig +
-		generateResourceFromRepresentationMap("oci_ons_notification_topic", "test_notification_topic", Required, Create, getTopicRepresentationCopyWithSuffixName("alarmstatus")) +
+		generateResourceFromRepresentationMap("oci_ons_notification_topic", "test_notification_topic", Required, Create, getTopicRepresentationCopyWithRandomNameOrHttpReplayValue(10, charsetWithoutDigits, "talarmstatus")) +
 		generateResourceFromRepresentationMap("oci_monitoring_alarm", "test_alarm", Required, Create, alarmRepresentation)
 )
 
diff --git a/oci/monitoring_alarm_test.go b/oci/monitoring_alarm_test.go
@@ -64,8 +64,8 @@ var (
 	}
 
 	AlarmResourceDependencies = DefinedTagsDependencies + AvailabilityDomainConfig +
-		generateResourceFromRepresentationMap("oci_ons_notification_topic", "test_notification_topic", Required, Create, getTopicRepresentationCopyWithSuffixName("alarm1")) +
-		generateResourceFromRepresentationMap("oci_ons_notification_topic", "test_notification_topic2", Required, Create, getTopicRepresentationCopyWithSuffixName("alarm2"))
+		generateResourceFromRepresentationMap("oci_ons_notification_topic", "test_notification_topic", Required, Create, getTopicRepresentationCopyWithRandomNameOrHttpReplayValue(10, charsetWithoutDigits, "talarm1")) +
+		generateResourceFromRepresentationMap("oci_ons_notification_topic", "test_notification_topic2", Required, Create, getTopicRepresentationCopyWithRandomNameOrHttpReplayValue(10, charsetWithoutDigits, "talarm2"))
 )
 
 func TestMonitoringAlarmResource_basic(t *testing.T) {
diff --git a/oci/ons_notification_topic_test.go b/oci/ons_notification_topic_test.go
@@ -54,9 +54,9 @@ var (
 	NotificationTopicResourceDependencies = DefinedTagsDependencies
 )
 
-func getTopicRepresentationCopyWithSuffixName(suffix string) map[string]interface{} {
+func getTopicRepresentationCopyWithRandomNameOrHttpReplayValue(length int, charset string, httpReplayValue string) map[string]interface{} {
 	return representationCopyWithNewProperties(notificationTopicRepresentation, map[string]interface{}{
-		"name": Representation{repType: Required, create: "t" + suffix},
+		"name": Representation{repType: Required, create: randomStringOrHttpReplayValue(length, charset, httpReplayValue)},
 	})
 }
 
diff --git a/oci/ons_subscription_test.go b/oci/ons_subscription_test.go
@@ -49,7 +49,7 @@ var (
 	}
 
 	SubscriptionResourceDependencies = NotificationTopicResourceDependencies +
-		generateResourceFromRepresentationMap("oci_ons_notification_topic", "test_notification_topic", Required, Create, getTopicRepresentationCopyWithSuffixName("subscription"))
+		generateResourceFromRepresentationMap("oci_ons_notification_topic", "test_notification_topic", Required, Create, getTopicRepresentationCopyWithRandomNameOrHttpReplayValue(10, charsetWithoutDigits, "tsubscription"))
 )
 
 func TestOnsSubscriptionResource_basic(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ var (`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`AlarmHistoryCollectionResourceConfig = DefinedTagsDependencies + AvailabilityDomainConfig +`
`24`		`- generateResourceFromRepresentationMap("oci_ons_notification_topic", "test_notification_topic", Required, Create, getTopicRepresentationCopyWithSuffixName("alarmhistorycollection")) +`
	`24`	`+ generateResourceFromRepresentationMap("oci_ons_notification_topic", "test_notification_topic", Required, Create, getTopicRepresentationCopyWithRandomNameOrHttpReplayValue(20, charsetWithoutDigits, "talarmhistorycollection")) +`
`25`	`25`	`generateResourceFromRepresentationMap("oci_monitoring_alarm", "test_alarm", Required, Create, alarmRepresentation)`
`26`	`26`	`)`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ var (`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`AlarmStatusResourceConfig = DefinedTagsDependencies + AvailabilityDomainConfig +`
`23`		`- generateResourceFromRepresentationMap("oci_ons_notification_topic", "test_notification_topic", Required, Create, getTopicRepresentationCopyWithSuffixName("alarmstatus")) +`
	`23`	`+ generateResourceFromRepresentationMap("oci_ons_notification_topic", "test_notification_topic", Required, Create, getTopicRepresentationCopyWithRandomNameOrHttpReplayValue(10, charsetWithoutDigits, "talarmstatus")) +`
`24`	`24`	`generateResourceFromRepresentationMap("oci_monitoring_alarm", "test_alarm", Required, Create, alarmRepresentation)`
`25`	`25`	`)`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,8 @@ var (`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`AlarmResourceDependencies = DefinedTagsDependencies + AvailabilityDomainConfig +`
`67`		`- generateResourceFromRepresentationMap("oci_ons_notification_topic", "test_notification_topic", Required, Create, getTopicRepresentationCopyWithSuffixName("alarm1")) +`
`68`		`- generateResourceFromRepresentationMap("oci_ons_notification_topic", "test_notification_topic2", Required, Create, getTopicRepresentationCopyWithSuffixName("alarm2"))`
	`67`	`+ generateResourceFromRepresentationMap("oci_ons_notification_topic", "test_notification_topic", Required, Create, getTopicRepresentationCopyWithRandomNameOrHttpReplayValue(10, charsetWithoutDigits, "talarm1")) +`
	`68`	`+ generateResourceFromRepresentationMap("oci_ons_notification_topic", "test_notification_topic2", Required, Create, getTopicRepresentationCopyWithRandomNameOrHttpReplayValue(10, charsetWithoutDigits, "talarm2"))`
`69`	`69`	`)`
`70`	`70`
`71`	`71`	`func TestMonitoringAlarmResource_basic(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -54,9 +54,9 @@ var (`
`54`	`54`	`NotificationTopicResourceDependencies = DefinedTagsDependencies`
`55`	`55`	`)`
`56`	`56`
`57`		`-func getTopicRepresentationCopyWithSuffixName(suffix string) map[string]interface{} {`
	`57`	`+func getTopicRepresentationCopyWithRandomNameOrHttpReplayValue(length int, charset string, httpReplayValue string) map[string]interface{} {`
`58`	`58`	`return representationCopyWithNewProperties(notificationTopicRepresentation, map[string]interface{}{`
`59`		`- "name": Representation{repType: Required, create: "t" + suffix},`
	`59`	`+ "name": Representation{repType: Required, create: randomStringOrHttpReplayValue(length, charset, httpReplayValue)},`
`60`	`60`	`})`
`61`	`61`	`}`
`62`	`62`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ var (`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`SubscriptionResourceDependencies = NotificationTopicResourceDependencies +`
`52`		`- generateResourceFromRepresentationMap("oci_ons_notification_topic", "test_notification_topic", Required, Create, getTopicRepresentationCopyWithSuffixName("subscription"))`
	`52`	`+ generateResourceFromRepresentationMap("oci_ons_notification_topic", "test_notification_topic", Required, Create, getTopicRepresentationCopyWithRandomNameOrHttpReplayValue(10, charsetWithoutDigits, "tsubscription"))`
`53`	`53`	`)`
`54`	`54`
`55`	`55`	`func TestOnsSubscriptionResource_basic(t *testing.T) {`