Add tests for wildcard state save

Signed-off-by: Darko Draskovic <darko.draskovic@gmail.com>

twins/mocks/states.go

@@ -55,12 +55,11 @@ func (srm *stateRepositoryMock) RetrieveAll(ctx context.Context, offset uint64,
 	srm.mu.Lock()
 	defer srm.mu.Unlock()
 
-	items := make([]twins.State, 0)
-
 	if limit <= 0 {
 		return twins.StatesPage{}, nil
 	}
 
+	items := make([]twins.State, 0)
 	for k, v := range srm.states {
 		if (uint64)(len(items)) >= limit {
 			break
@@ -78,11 +77,10 @@ func (srm *stateRepositoryMock) RetrieveAll(ctx context.Context, offset uint64,
 		return items[i].ID < items[j].ID
 	})
 
-	total := uint64(len(srm.states))
 	page := twins.StatesPage{
 		States: items,
 		PageMetadata: twins.PageMetadata{
-			Total:  total,
+			Total:  srm.total(twinID),
 			Offset: offset,
 			Limit:  limit,
 		},
@@ -91,6 +89,16 @@ func (srm *stateRepositoryMock) RetrieveAll(ctx context.Context, offset uint64,
 	return page, nil
 }
 
+func (srm *stateRepositoryMock) total(twinID string) uint64 {
+	var total uint64
+	for k := range srm.states {
+		if strings.HasPrefix(k, twinID) {
+			total++
+		}
+	}
+	return total
+}
+
 // RetrieveLast returns the last state related to twin spec by id
 func (srm *stateRepositoryMock) RetrieveLast(ctx context.Context, twinID string) (twins.State, error) {
 	srm.mu.Lock()

twins/mocks/twins.go

@@ -81,11 +81,7 @@ func (trm *twinRepositoryMock) RetrieveByAttribute(ctx context.Context, channel,
 			}
 		}
 	}
-
-	if len(ids) > 0 {
-		return ids, nil
-	}
-	return ids, twins.ErrNotFound
+	return ids, nil
 }
 
 func (trm *twinRepositoryMock) RetrieveAll(_ context.Context, owner string, offset uint64, limit uint64, name string, metadata twins.Metadata) (twins.Page, error) {

twins/service_test.go

@@ -253,6 +253,10 @@ func TestSaveStates(t *testing.T) {
 	tw, err := svc.AddTwin(context.Background(), token, twin, def)
 	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
 
+	defWildcard := mocks.CreateDefinition(channels[0:2], []string{twins.SubtopicWildcard, twins.SubtopicWildcard})
+	twWildcard, err := svc.AddTwin(context.Background(), token, twin, defWildcard)
+	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
+
 	var recs = make([]senml.Record, numRecs)
 	mocks.CreateSenML(numRecs, recs)
 
@@ -300,12 +304,16 @@ func TestSaveStates(t *testing.T) {
 		require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
 
 		err = svc.SaveStates(message)
-		assert.Equal(t, tc.err, err, fmt.Sprintf("%s: expected %s got %s\n", tc.desc, tc.err, err))
+		require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
 
 		ttlAdded += tc.size
 		page, err := svc.ListStates(context.TODO(), token, 0, 10, tw.ID)
 		require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
 		assert.Equal(t, ttlAdded, page.Total, fmt.Sprintf("%s: expected %d total got %d total\n", tc.desc, ttlAdded, page.Total))
+
+		page, err = svc.ListStates(context.TODO(), token, 0, 10, twWildcard.ID)
+		require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
+		assert.Equal(t, ttlAdded, page.Total, fmt.Sprintf("%s: expected %d total got %d total\n", tc.desc, ttlAdded, page.Total))
 	}
 }