Skip to content

Commit fa0848d

Browse files
authored
TNT-42554 ODD - include default content with response tokens options in the response (#31)
* TNT-42554 ODD - include default content options in the response * Fix test models so we don't have empty objects in expected responses
1 parent b70bf31 commit fa0848d

File tree

4 files changed

+48
-3
lines changed

4 files changed

+48
-3
lines changed

Source/Adobe.Target.Client/OnDevice/DecisioningDetailsExecutor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ private static bool HandleMboxRequest(
205205
option.EventToken = null;
206206
return option;
207207
})
208-
.Where(option => option.Type != null || option.Content != null)
208+
.Where(option => option.Type != null || option.Content != null || option.ResponseTokens != null)
209209
.ToList(),
210210
Trace = traceHandler?.CurrentTrace,
211211
};
@@ -249,7 +249,7 @@ private static bool HandlePageLoad(
249249
option.EventToken = null;
250250
}
251251

252-
if (option.Type == null && option.Content == null && option.EventToken == null)
252+
if (option.Type == null && option.Content == null && option.EventToken == null && option.ResponseTokens == null)
253253
{
254254
continue;
255255
}

Tests/Adobe.Target.Client.Test/Models/TEST_SUITE_PAGELOAD_VEC_AB.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@
6868
}
6969
}
7070
]
71+
},
72+
{
73+
"responseTokens": {}
7174
}
7275
],
7376
"metrics": [
@@ -173,6 +176,15 @@
173176
}
174177
}
175178
]
179+
},
180+
{
181+
"responseTokens": {}
182+
},
183+
{
184+
"responseTokens": {}
185+
},
186+
{
187+
"responseTokens": {}
176188
}
177189
],
178190
"metrics": [
@@ -301,6 +313,21 @@
301313
}
302314
}
303315
]
316+
},
317+
{
318+
"responseTokens": {}
319+
},
320+
{
321+
"responseTokens": {}
322+
},
323+
{
324+
"responseTokens": {}
325+
},
326+
{
327+
"responseTokens": {}
328+
},
329+
{
330+
"responseTokens": {}
304331
}
305332
],
306333
"metrics": [

Tests/Adobe.Target.Client.Test/Models/TEST_SUITE_PAGELOAD_VEC_XT.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,12 @@
5959
"content": "greg is correct"
6060
}
6161
]
62+
},
63+
{
64+
"responseTokens": {}
65+
},
66+
{
67+
"responseTokens": {}
6268
}
6369
],
6470
"metrics": [
@@ -123,6 +129,12 @@
123129
"content": "jason is correct"
124130
}
125131
]
132+
},
133+
{
134+
"responseTokens": {}
135+
},
136+
{
137+
"responseTokens": {}
126138
}
127139
],
128140
"metrics": [
@@ -183,6 +195,12 @@
183195
"content": "all visitors"
184196
}
185197
]
198+
},
199+
{
200+
"responseTokens": {}
201+
},
202+
{
203+
"responseTokens": {}
186204
}
187205
],
188206
"metrics": [

Tests/Adobe.Target.Client.Test/Util/IntegrationTestUtils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ private static EquivalencyAssertionOptions<T> NestedResponseEquivalenceOptions<T
163163
.ComparingByMembers<Action>()
164164
.Using<Dictionary<string, object>>(ctx =>
165165
{
166-
if (ctx.Expectation == null)
166+
if (ctx.Expectation == null || ctx.Expectation.Count == 0)
167167
{
168168
return;
169169
}

0 commit comments

Comments
 (0)