Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] accept a list of group values #27

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions Keen.NET.Test/QueryTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public async void Query_ValidRelativeGroup_Success()
{
var client = new KeenClient(SettingsEnv);
var timeframe = QueryRelativeTimeframe.PreviousNDays(2);
var groupby = "field1";
var groupby = new List<string> { "field1" };
IEnumerable<QueryGroupValue<string>> reply = new List<QueryGroupValue<string>>()
{
new QueryGroupValue<string>( "0", "field1" ),
Expand All @@ -162,7 +162,7 @@ public async void Query_ValidRelativeGroup_Success()
It.Is<QueryType>(q => q == QueryType.Count()),
It.Is<string>(c => c == testCol),
It.Is<string>(p => p == ""),
It.Is<string>(g => g == groupby),
It.Is<IEnumerable<string>>(g => g == groupby),
It.Is<QueryTimeframe>(t => t == timeframe),
It.Is<IEnumerable<QueryFilter>>(f => f == null),
It.Is<string>(z => z == "")))
Expand All @@ -184,7 +184,7 @@ public async void Query_ValidRelativeGroupInterval_Success()
var client = new KeenClient(SettingsEnv);
var timeframe = QueryRelativeTimeframe.PreviousNDays(2);
var interval = QueryInterval.EveryNHours(2);
var groupby = "field1";
var groupby = new List<string> { "field1" };

IEnumerable<QueryIntervalValue<IEnumerable<QueryGroupValue<string>>>> reply = new List<QueryIntervalValue<IEnumerable<QueryGroupValue<string>>>>()
{
Expand Down Expand Up @@ -214,7 +214,7 @@ public async void Query_ValidRelativeGroupInterval_Success()
It.Is<QueryType>(q => q == QueryType.Count()),
It.Is<string>(c => c == testCol),
It.Is<string>(p => p == ""),
It.Is<string>(g => g == groupby),
It.Is<IEnumerable<string>>(g => g == groupby),
It.Is<QueryTimeframe>(t => t == timeframe),
It.Is<QueryInterval>(i => i == interval),
It.Is<IEnumerable<QueryFilter>>(f => f == null),
Expand Down Expand Up @@ -586,7 +586,7 @@ public async void SelectUnique_ValidRelativeGroup_Success()
{
var client = new KeenClient(SettingsEnv);
var prop = "field1";
var groupby = "field1";
var groupby = new List<string> { "field1" };
var timeframe = QueryRelativeTimeframe.PreviousNDays(5);
IEnumerable<QueryGroupValue<string>> reply = new List<QueryGroupValue<string>>()
{
Expand All @@ -602,7 +602,7 @@ public async void SelectUnique_ValidRelativeGroup_Success()
It.Is<QueryType>(q => q == QueryType.SelectUnique()),
It.Is<string>(c => c == testCol),
It.Is<string>(p => p == prop),
It.Is<string>(g => g == groupby),
It.Is<IEnumerable<string>>(g => g == groupby),
It.Is<QueryRelativeTimeframe>(t => t == timeframe),
It.Is<IEnumerable<QueryFilter>>(f => f == null),
It.Is<string>(t => t == "")
Expand Down Expand Up @@ -691,7 +691,7 @@ public async void SelectUnique_ValidAbsoluteIntervalGroup_Success()
var prop = "field1";
var timeframe = new QueryAbsoluteTimeframe(DateTime.Now.AddDays(-1), DateTime.Now);
var interval = QueryInterval.EveryNHours(4);
var groupby = "field1";
var groupby = new List<string> { "field1" };
var resultl = "hello,goodbye,I'm late";

IEnumerable<QueryIntervalValue<IEnumerable<QueryGroupValue<string>>>> result =
Expand Down Expand Up @@ -721,7 +721,7 @@ public async void SelectUnique_ValidAbsoluteIntervalGroup_Success()
It.Is<QueryType>(q => q == QueryType.SelectUnique()),
It.Is<string>(c => c == testCol),
It.Is<string>(p => p == prop),
It.Is<string>(g => g == groupby),
It.Is<IEnumerable<string>>(g => g == groupby),
It.Is<QueryAbsoluteTimeframe>(t => t == timeframe),
It.Is<QueryInterval>(i => i == interval),
It.Is<IEnumerable<QueryFilter>>(f => f == null),
Expand Down Expand Up @@ -956,7 +956,7 @@ public async void MultiAnalysis_ValidRelativeTimeFrame_Success()
public async void MultiAnalysis_ValidGroupBy_Success()
{
var client = new KeenClient(SettingsEnv);
var groupby = "field1";
var groupby = new List<string> { "field1" };
IEnumerable<MultiAnalysisParam> param = new List<MultiAnalysisParam>()
{
new MultiAnalysisParam("first", MultiAnalysisParam.Metric.Count()),
Expand All @@ -967,11 +967,11 @@ public async void MultiAnalysis_ValidGroupBy_Success()
dict.Add("second", "fff");
dict.Add("third", "aaa");
dict.Add("first", "123");
dict.Add(groupby, "123");
dict.Add(string.Join(",", groupby), "123");
IEnumerable<QueryGroupValue<IDictionary<string, string>>> result = new List<QueryGroupValue<IDictionary<string, string>>>()
{
new QueryGroupValue<IDictionary<string,string>>(dict, groupby),
new QueryGroupValue<IDictionary<string,string>>(dict, groupby),
new QueryGroupValue<IDictionary<string,string>>(dict, string.Join(",", groupby)),
new QueryGroupValue<IDictionary<string,string>>(dict, string.Join(",", groupby)),
};

Mock<IQueries> queryMock = null;
Expand All @@ -983,7 +983,7 @@ public async void MultiAnalysis_ValidGroupBy_Success()
It.Is<IEnumerable<MultiAnalysisParam>>(p => p == param),
It.Is<QueryTimeframe>(t => t == null),
It.Is<IEnumerable<QueryFilter>>(f => f == null),
It.Is<string>(g => g == groupby),
It.Is<IEnumerable<string>>(g => g == groupby),
It.Is<string>(tz => tz == "")
))
.Returns(Task.FromResult(result));
Expand All @@ -1006,7 +1006,7 @@ public async void MultiAnalysis_ValidIntervalGroupBy_Success()
var client = new KeenClient(SettingsEnv);
var timeframe = QueryRelativeTimeframe.PreviousNDays(3);
var interval = QueryInterval.Daily();
var groupby = "field1";
var groupby = new List<string> { "field1" };
IEnumerable<MultiAnalysisParam> param = new List<MultiAnalysisParam>()
{
new MultiAnalysisParam("first", MultiAnalysisParam.Metric.Count()),
Expand All @@ -1018,21 +1018,21 @@ public async void MultiAnalysis_ValidIntervalGroupBy_Success()
dict.Add("second", "fff");
dict.Add("third", "aaa");
dict.Add("first", "123");
dict.Add(groupby, "123");
dict.Add(string.Join(",", groupby), "123");
IEnumerable<QueryIntervalValue<IEnumerable<QueryGroupValue<IDictionary<string, string>>>>> result =
new List<QueryIntervalValue<IEnumerable<QueryGroupValue<IDictionary<string, string>>>>>()
{
new QueryIntervalValue<IEnumerable<QueryGroupValue<IDictionary<string, string>>>>(
new List<QueryGroupValue<IDictionary<string,string>>>(){
new QueryGroupValue<IDictionary<string,string>>(dict, groupby),
new QueryGroupValue<IDictionary<string,string>>(dict, groupby)
new QueryGroupValue<IDictionary<string,string>>(dict, string.Join(",", groupby)),
new QueryGroupValue<IDictionary<string,string>>(dict, string.Join(",", groupby))
},
DateTime.Now, DateTime.Now.AddSeconds(2)
),
new QueryIntervalValue<IEnumerable<QueryGroupValue<IDictionary<string, string>>>>(
new List<QueryGroupValue<IDictionary<string,string>>>(){
new QueryGroupValue<IDictionary<string,string>>(dict, groupby),
new QueryGroupValue<IDictionary<string,string>>(dict, groupby)
new QueryGroupValue<IDictionary<string,string>>(dict, string.Join(",", groupby)),
new QueryGroupValue<IDictionary<string,string>>(dict, string.Join(",", groupby))
},
DateTime.Now, DateTime.Now.AddSeconds(2)
),
Expand All @@ -1048,7 +1048,7 @@ public async void MultiAnalysis_ValidIntervalGroupBy_Success()
It.Is<QueryTimeframe>(t => t == timeframe),
It.Is<QueryInterval>(i=>i==interval),
It.Is<IEnumerable<QueryFilter>>(f => f == null),
It.Is<string>(g => g == groupby),
It.Is<IEnumerable<string>>(g => g == groupby),
It.Is<string>(tz => tz == "")
))
.Returns(Task.FromResult(result));
Expand Down
Loading