Fix tests, rename to disassociated

pkg/server/test/property_value_aggregate_test.go

@@ -27,7 +27,7 @@ type test struct {
 	name                                      string
 	query                                     string
 	isExpression                              bool
-	isUnassociated                            bool
+	isDisassociated                           bool
 	expectedMaxPages                          int
 	expectedMaxResults                        int
 	expectedDescribeTimeSeriesWithContextArgs *iotsitewise.DescribeTimeSeriesInput
@@ -196,10 +196,10 @@ func TestPropertyValueAggregate(t *testing.T) {
 	}
 }
 
-func TestPropertyValueAggregateWithUnassociatedStream(t *testing.T) {
+func TestPropertyValueAggregateWithDisassociatedStream(t *testing.T) {
 	tc := test{
-		// an unassociated stream will return nil in DescribeTimeSeriesWithContext for assetId and propertyId
-		name: "query by property alias of an unassociated stream",
+		// an disassociated stream will return nil in DescribeTimeSeriesWithContext for assetId and propertyId
+		name: "query by property alias of an disassociated stream",
 		query: `{
 					"region":"us-west-2",
 					"propertyAlias":"/amazon/renton/1/rpm",
@@ -209,7 +209,7 @@ func TestPropertyValueAggregateWithUnassociatedStream(t *testing.T) {
 		expectedDescribeTimeSeriesWithContextArgs: &iotsitewise.DescribeTimeSeriesInput{Alias: Pointer("/amazon/renton/1/rpm")},
 		expectedMaxPages:   1,
 		expectedMaxResults: 0,
-		isUnassociated:     true,
+		isDisassociated:    true,
 	}
 
 	t.Run(tc.name, func(t *testing.T) {

pkg/server/test/property_value_history_test.go

@@ -297,8 +297,8 @@ func Test_getPropertyValueHistoryFromAliasCaseTable(t *testing.T) {
 	}
 }
 
-func Test_getPropertyValueHistoryFromAliasCaseTableUnassociatedStream(t *testing.T) {
-	propVals := testdata.GetIoTSitewisePropHistoryVals(t, testDataRelativePath("property-history-values-from-alias-unassociated.json"))
+func Test_getPropertyValueHistoryFromAliasCaseTableDisassociatedStream(t *testing.T) {
+	propVals := testdata.GetIoTSitewisePropHistoryVals(t, testDataRelativePath("property-history-values-from-alias-disassociated.json"))
 	propTimeSeries := testdata.GetIoTSitewiseTimeSeries(t, testDataRelativePath("describe-time-series-without-property.json"))
 	mockSw := &mocks.SitewiseClient{}
 	mockSw.On("BatchGetAssetPropertyValueHistoryPageAggregation", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(&propVals, nil)
@@ -333,15 +333,15 @@ func Test_getPropertyValueHistoryFromAliasCaseTableUnassociatedStream(t *testing
 	require.Nil(t, err)
 
 	for i, dr := range qdr.Responses {
-		fname := fmt.Sprintf("%s-%s.golden", "property-history-values-from-alias-table-unassociated", i)
+		fname := fmt.Sprintf("%s-%s.golden", "property-history-values-from-alias-table-disassociated", i)
 		experimental.CheckGoldenJSONResponse(t, "../../testdata", fname, &dr, true)
 	}
 }
 
-func Test_getPropertyValueHistoryFromAliasCaseTimeSeries_associated_stream(t *testing.T) {
-	propVals := testdata.GetIoTSitewisePropHistoryVals(t, testDataRelativePath("property-history-values-unassociated.json"))
+func Test_getPropertyValueHistoryFromAliasCaseTimeSeries(t *testing.T) {
+	propVals := testdata.GetIoTSitewisePropHistoryVals(t, testDataRelativePath("property-history-values.json"))
 	propDesc := testdata.GetIotSitewiseAssetProp(t, testDataRelativePath("describe-asset-property-avg-wind.json"))
-	propTimeSeries := testdata.GetIoTSitewiseTimeSeries(t, testDataRelativePath("describe-time-series-without-property.json"))
+	propTimeSeries := testdata.GetIoTSitewiseTimeSeries(t, testDataRelativePath("describe-time-series.json"))
 	mockSw := &mocks.SitewiseClient{}
 	mockSw.On("BatchGetAssetPropertyValueHistoryPageAggregation", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(&propVals, nil)
 	mockSw.On("DescribeAssetPropertyWithContext", mock.Anything, mock.Anything).Return(&propDesc, nil)
@@ -377,12 +377,12 @@ func Test_getPropertyValueHistoryFromAliasCaseTimeSeries_associated_stream(t *te
 	require.Nil(t, err)
 
 	for i, dr := range qdr.Responses {
-		fname := fmt.Sprintf("%s-%s.golden", "property-history-values-from-alias-timeseries_with_associated_stream", i)
+		fname := fmt.Sprintf("%s-%s.golden", "property-history-values-from-alias-timeseries", i)
 		experimental.CheckGoldenJSONResponse(t, "../../testdata", fname, &dr, true)
 	}
 }
-func Test_getPropertyValueHistoryFromAliasCaseTimeSeries_unassociated_stream(t *testing.T) {
-	propVals := testdata.GetIoTSitewisePropHistoryVals(t, testDataRelativePath("property-history-values-from-alias-unassociated.json"))
+func Test_getPropertyValueHistoryFromAliasCaseTimeSeries_disassociated_stream(t *testing.T) {
+	propVals := testdata.GetIoTSitewisePropHistoryVals(t, testDataRelativePath("property-history-values-from-alias-disassociated.json"))
 	propTimeSeries := testdata.GetIoTSitewiseTimeSeries(t, testDataRelativePath("describe-time-series-without-property.json"))
 	mockSw := &mocks.SitewiseClient{}
 	mockSw.On("BatchGetAssetPropertyValueHistoryPageAggregation", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(&propVals, nil)
@@ -418,12 +418,12 @@ func Test_getPropertyValueHistoryFromAliasCaseTimeSeries_unassociated_stream(t *
 	require.Nil(t, err)
 
 	for i, dr := range qdr.Responses {
-		fname := fmt.Sprintf("%s-%s.golden", "property-history-values-from-alias-timeseries-unassociated", i)
+		fname := fmt.Sprintf("%s-%s.golden", "property-history-values-from-alias-timeseries-disassociated", i)
 		experimental.CheckGoldenJSONResponse(t, "../../testdata", fname, &dr, true)
 	}
 }
 
-func Test_getPropertyValueBooleanFromAliasWithAssociatedStream(t *testing.T) {
+func Test_getPropertyValueBooleanFromAlias(t *testing.T) {
 	propVals := testdata.GetIoTSitewisePropHistoryVals(t, testDataRelativePath("property-history-values-boolean.json"))
 	propDesc := testdata.GetIotSitewiseAssetProp(t, testDataRelativePath("describe-asset-property-is-windy.json"))
 	propTimeSeries := testdata.GetIoTSitewiseTimeSeries(t, testDataRelativePath("describe-time-series.json"))
@@ -466,8 +466,8 @@ func Test_getPropertyValueBooleanFromAliasWithAssociatedStream(t *testing.T) {
 	}
 }
 
-func Test_getPropertyValueBooleanFromAliasWithUnassociatedStream(t *testing.T) {
-	propVals := testdata.GetIoTSitewisePropHistoryVals(t, testDataRelativePath("property-history-values-boolean-unassociated.json"))
+func Test_getPropertyValueBooleanFromAliasWithDisassociatedStream(t *testing.T) {
+	propVals := testdata.GetIoTSitewisePropHistoryVals(t, testDataRelativePath("property-history-values-boolean-disassociated.json"))
 	propTimeSeriesWithoutPropertyId := testdata.GetIoTSitewiseTimeSeries(t, testDataRelativePath("describe-time-series-without-property.json"))
 	mockSw := &mocks.SitewiseClient{}
 	mockSw.On("BatchGetAssetPropertyValueHistoryPageAggregation", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(&propVals, nil)
@@ -502,7 +502,7 @@ func Test_getPropertyValueBooleanFromAliasWithUnassociatedStream(t *testing.T) {
 	require.Nil(t, err)
 
 	for i, dr := range qdr.Responses {
-		fname := fmt.Sprintf("%s-%s.golden", "property-history-values-from-alias-boolean-with-unassociated-stream", i)
+		fname := fmt.Sprintf("%s-%s.golden", "property-history-values-from-alias-boolean-with-disassociated-stream", i)
 		experimental.CheckGoldenJSONResponse(t, "../../testdata", fname, &dr, true)
 	}
 }

pkg/server/test/property_value_test.go

@@ -194,7 +194,7 @@ func Test_property_value_query_by_alias_associated_stream(t *testing.T) {
 		},
 	)
 }
-func Test_property_value_query_by_alias_unassociated_stream(t *testing.T) {
+func Test_property_value_query_by_alias_disassociated_stream(t *testing.T) {
 	mockSw := &mocks.SitewiseClient{}
 	mockSw.On("DescribeTimeSeriesWithContext", mock.Anything, mock.Anything).Return(&iotsitewise.DescribeTimeSeriesOutput{
 		Alias: Pointer("/amazon/renton/1/rpm"),

pkg/sitewise/api/util.go

@@ -33,13 +33,13 @@ func getAssetIdAndPropertyId(query models.AssetPropertyValueQuery, client client
 		if resp.AssetId != nil {
 			result.AssetIds = []string{*resp.AssetId}
 		} else {
-			// For unassociated streams with a propertyAlias
+			// For disassociated streams with a propertyAlias
 			result.AssetIds = []string{}
 		}
 		if resp.PropertyId != nil {
 			result.PropertyId = *resp.PropertyId
 		} else {
-			// For unassociated streams without a propertyAlias
+			// For disassociated streams without a propertyAlias
 			result.PropertyId = ""
 		}
 	}