Merged in feature/listtypes (pull request #23)

Feature/listtypes

* started

* cleanuplist

* someunittestfixes

* removemostflakiness

test/queryService/listqueries_test.go

@@ -17,23 +17,24 @@ func TestQueryServiceList(t *testing.T) {
 
 	client := serviceinterfaces.NewQueryServiceClient(conn)
 
-	idRes, err := client.Create(ctx, &serviceinterfaces.QueryCreate{
+	contextRes, err := client.Create(ctx, &serviceinterfaces.QueryCreate{
 		Type:            serviceinterfaces.QueryType_QUERY_TYPE_CONTEXT_FULL,
 		Config:          nil,
 		RequiredQueries: []string{},
 	})
 	assert.Nil(t, err)
-	id := idRes.GetId()
-	assert.NotEmpty(t, id)
+
+	config := "\"path\":\".key\""
+	_, err = client.Create(ctx, &serviceinterfaces.QueryCreate{
+		Type:   serviceinterfaces.QueryType_QUERY_TYPE_JSON_EXTRACTOR,
+		Config: &config,
+		RequiredQueries: []string{
+			contextRes.Id,
+		},
+	})
+	assert.Nil(t, err)
 
 	queriesRes, err := client.List(ctx, &serviceinterfaces.QueryFilter{})
 	assert.Nil(t, err)
-	assert.Len(t, queriesRes.Queries, 1)
-	assert.Equal(t, id, queriesRes.Queries[0].Id)
-
-	res, err := client.Update(ctx, &serviceinterfaces.QueryUpdate{
-		Id: id,
-	})
-	assert.Nil(t, err)
-	assert.NotNil(t, res)
+	assert.Len(t, queriesRes.Queries, 2)
 }