Skip to content

[MOB-22791] Removal of deprecated updatePropositions overridden method & tests updates #128

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.

Sign up for GitHub

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

Open
siddique-adobe wants to merge 1 commit into
base: dev-v3.4.1
Choose a base branch
from
Open

[MOB-22791] Removal of deprecated updatePropositions overridden method & tests updates #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
163 changes: 119 additions & 44 deletions ...ize/src/androidTest/java/com/adobe/marketing/mobile/optimize/OptimizeFunctionalTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,11 @@ public void testUpdatePropositions_timeoutError() throws Exception {
updateConfiguration(configData);

// Action
Optimize.updatePropositions(
Optimize.updatePropositionsInternal(
Collections.singletonList(new DecisionScope(decisionScopeName)),
null,
null,
10.0,
new AdobeCallbackWithOptimizeError<Map<DecisionScope, OptimizeProposition>>() {
@Override
public void fail(AEPOptimizeError error) {
Expand Down Expand Up @@ -122,8 +123,12 @@ public void testUpdatePropositions_validDecisionScope() throws InterruptedExcept
updateConfiguration(configData);

// Action
Optimize.updatePropositions(
Collections.singletonList(new DecisionScope(decisionScopeName)), null, null);
Optimize.updatePropositionsInternal(
Collections.singletonList(new DecisionScope(decisionScopeName)),
null,
null,
10.0,
null);

// Assert
List<Event> eventsListOptimize =
Expand Down Expand Up @@ -182,8 +187,12 @@ public void testUpdatePropositions_validNonEncodedDecisionScope() throws Interru
updateConfiguration(configData);

// Action
Optimize.updatePropositions(
Collections.singletonList(new DecisionScope(activityId, placementId)), null, null);
Optimize.updatePropositionsInternal(
Collections.singletonList(new DecisionScope(activityId, placementId)),
null,
null,
10.0,
null);

// Assert
List<Event> eventsListOptimize =
Expand Down Expand Up @@ -248,9 +257,11 @@ public void testUpdatePropositions_validNonEncodedDecisionScopeWithItemCount()
updateConfiguration(configData);

// Action
Optimize.updatePropositions(
Optimize.updatePropositionsInternal(
Collections.singletonList(new DecisionScope(activityId, placementId, itemCount)),
null,
null,
10.0,
null);

// Assert
Expand Down Expand Up @@ -329,8 +340,12 @@ public void testUpdatePropositions_validDecisionScopeWithXdmAndDataAndDatasetId(
configData.put("optimize.datasetId", optimizeDatasetId);
updateConfiguration(configData);

Optimize.updatePropositions(
Collections.singletonList(new DecisionScope(decisionScopeName)), xdmMap, dataMap);
Optimize.updatePropositionsInternal(
Collections.singletonList(new DecisionScope(decisionScopeName)),
xdmMap,
dataMap,
10.0,
null);

// Assert
List<Event> eventsListOptimize =
Expand Down Expand Up @@ -398,11 +413,13 @@ public void testUpdatePropositions_multipleValidDecisionScope() throws Interrupt
updateConfiguration(configData);

// Action
Optimize.updatePropositions(
Optimize.updatePropositionsInternal(
Arrays.asList(
new DecisionScope(decisionScopeName1),
new DecisionScope(decisionScopeName2)),
null,
null,
10.0,
null);

// Assert
Expand Down Expand Up @@ -461,8 +478,12 @@ public void testUpdatePropositions_ConfigNotAvailable() throws InterruptedExcept
clearUpdatedConfiguration();

// Action
Optimize.updatePropositions(
Collections.singletonList(new DecisionScope(decisionScopeName)), null, null);
Optimize.updatePropositionsInternal(
Collections.singletonList(new DecisionScope(decisionScopeName)),
null,
null,
10.0,
null);

// Assert
List<Event> eventsListOptimize =
Expand Down Expand Up @@ -493,11 +514,13 @@ public void testUpdatePropositions_validAndInvalidDecisionScopes() throws Interr
updateConfiguration(configData);

// Action
Optimize.updatePropositions(
Optimize.updatePropositionsInternal(
Arrays.asList(
new DecisionScope(decisionScopeName1),
new DecisionScope(decisionScopeName2)),
null,
null,
10.0,
null);

// Assert
Expand Down Expand Up @@ -556,8 +579,12 @@ public void testGetPropositions_decisionScopeInCache()

final String decisionScopeString =
"eyJhY3Rpdml0eUlkIjoieGNvcmU6b2ZmZXItYWN0aXZpdHk6MTExMTExMTExMTExMTExMSIsInBsYWNlbWVudElkIjoieGNvcmU6b2ZmZXItcGxhY2VtZW50OjExMTExMTExMTExMTExMTEifQ==";
Optimize.updatePropositions(
Collections.singletonList(new DecisionScope(decisionScopeString)), null, null);
Optimize.updatePropositionsInternal(
Collections.singletonList(new DecisionScope(decisionScopeString)),
null,
null,
10.0,
null);
List<Event> eventsListEdge =
TestHelper.getDispatchedEventsWith(
OptimizeTestConstants.EventType.EDGE,
Expand Down Expand Up @@ -661,8 +688,9 @@ public void testGetPropositions_decisionScopeInCache()
DecisionScope decisionScope = new DecisionScope(decisionScopeString);
final Map<DecisionScope, OptimizeProposition> propositionMap = new HashMap<>();
final ADBCountDownLatch countDownLatch = new ADBCountDownLatch(1);
Optimize.getPropositions(
Optimize.getPropositionsInternal(
Collections.singletonList(decisionScope),
10.0,
new AdobeCallbackWithError<Map<DecisionScope, OptimizeProposition>>() {
@Override
public void fail(AdobeError adobeError) {
Expand Down Expand Up @@ -717,8 +745,12 @@ public void testGetPropositions_defaultContentItem() throws InterruptedException
updateConfiguration(configData);

final String decisionScopeString = "someDecisionScope";
Optimize.updatePropositions(
Collections.singletonList(new DecisionScope(decisionScopeString)), null, null);
Optimize.updatePropositionsInternal(
Collections.singletonList(new DecisionScope(decisionScopeString)),
null,
null,
10.0,
null);
List<Event> eventsListEdge =
TestHelper.getDispatchedEventsWith(
OptimizeTestConstants.EventType.EDGE,
Expand Down Expand Up @@ -830,8 +862,9 @@ public void testGetPropositions_defaultContentItem() throws InterruptedException
DecisionScope decisionScope = new DecisionScope(decisionScopeString);
final Map<DecisionScope, OptimizeProposition> propositionMap = new HashMap<>();
final ADBCountDownLatch countDownLatch = new ADBCountDownLatch(1);
Optimize.getPropositions(
Optimize.getPropositionsInternal(
Collections.singletonList(decisionScope),
10.0,
new AdobeCallbackWithError<Map<DecisionScope, OptimizeProposition>>() {
@Override
public void fail(AdobeError adobeError) {
Expand Down Expand Up @@ -886,8 +919,12 @@ public void testGetPropositions_decisionScopeInCacheFromTargetResponseWithClickT
updateConfiguration(configData);

final String decisionScopeString = "myMbox1";
Optimize.updatePropositions(
Collections.singletonList(new DecisionScope(decisionScopeString)), null, null);
Optimize.updatePropositionsInternal(
Collections.singletonList(new DecisionScope(decisionScopeString)),
null,
null,
10.0,
null);
List<Event> eventsListEdge =
TestHelper.getDispatchedEventsWith(
OptimizeTestConstants.EventType.EDGE,
Expand Down Expand Up @@ -1020,8 +1057,9 @@ public void testGetPropositions_decisionScopeInCacheFromTargetResponseWithClickT
final DecisionScope decisionScope = new DecisionScope(decisionScopeString);
final Map<DecisionScope, OptimizeProposition> propositionMap = new HashMap<>();
final ADBCountDownLatch countDownLatch = new ADBCountDownLatch(1);
Optimize.getPropositions(
Optimize.getPropositionsInternal(
Collections.singletonList(decisionScope),
10.0,
new AdobeCallbackWithError<Map<DecisionScope, OptimizeProposition>>() {
@Override
public void fail(AdobeError adobeError) {
Expand Down Expand Up @@ -1119,8 +1157,12 @@ public void testGetPropositions_notAllDecisionScopesInCache()

final String decisionScopeString =
"eyJhY3Rpdml0eUlkIjoieGNvcmU6b2ZmZXItYWN0aXZpdHk6MTExMTExMTExMTExMTExMSIsInBsYWNlbWVudElkIjoieGNvcmU6b2ZmZXItcGxhY2VtZW50OjExMTExMTExMTExMTExMTEifQ==";
Optimize.updatePropositions(
Collections.singletonList(new DecisionScope(decisionScopeString)), null, null);
Optimize.updatePropositionsInternal(
Collections.singletonList(new DecisionScope(decisionScopeString)),
null,
null,
10.0,
null);
List<Event> eventsListEdge =
TestHelper.getDispatchedEventsWith(
OptimizeTestConstants.EventType.EDGE,
Expand Down Expand Up @@ -1222,8 +1264,9 @@ public void testGetPropositions_notAllDecisionScopesInCache()
DecisionScope decisionScope2 = new DecisionScope("myMbox");
final Map<DecisionScope, OptimizeProposition> propositionMap = new HashMap<>();
final ADBCountDownLatch countDownLatch = new ADBCountDownLatch(1);
Optimize.getPropositions(
Optimize.getPropositionsInternal(
Arrays.asList(decisionScope1, decisionScope2),
10.0,
new AdobeCallbackWithError<Map<DecisionScope, OptimizeProposition>>() {
@Override
public void fail(AdobeError adobeError) {
Expand Down Expand Up @@ -1360,8 +1403,9 @@ public void testGetPropositions_noDecisionScopeInCache()
DecisionScope decisionScope2 = new DecisionScope("myMbox2");
final Map<DecisionScope, OptimizeProposition> propositionMap = new HashMap<>();
final ADBCountDownLatch countDownLatch = new ADBCountDownLatch(1);
Optimize.getPropositions(
Optimize.getPropositionsInternal(
Arrays.asList(decisionScope1, decisionScope2),
10.0,
new AdobeCallbackWithError<Map<DecisionScope, OptimizeProposition>>() {
@Override
public void fail(AdobeError adobeError) {
Expand Down Expand Up @@ -1412,8 +1456,9 @@ public void testGetPropositions_emptyCache() throws InterruptedException {
final ADBCountDownLatch countDownLatch = new ADBCountDownLatch(1);
final Map<DecisionScope, OptimizeProposition> propositionMap = new HashMap<>();
TestHelper.resetTestExpectations();
Optimize.getPropositions(
Optimize.getPropositionsInternal(
Arrays.asList(decisionScope1, decisionScope2),
10.0,
new AdobeCallbackWithError<Map<DecisionScope, OptimizeProposition>>() {
@Override
public void fail(AdobeError adobeError) {
Expand Down Expand Up @@ -1707,8 +1752,12 @@ public void testClearCachedPropositions() throws InterruptedException, IOExcepti

final String decisionScopeString =
"eyJhY3Rpdml0eUlkIjoieGNvcmU6b2ZmZXItYWN0aXZpdHk6MTExMTExMTExMTExMTExMSIsInBsYWNlbWVudElkIjoieGNvcmU6b2ZmZXItcGxhY2VtZW50OjExMTExMTExMTExMTExMTEifQ==";
Optimize.updatePropositions(
Collections.singletonList(new DecisionScope(decisionScopeString)), null, null);
Optimize.updatePropositionsInternal(
Collections.singletonList(new DecisionScope(decisionScopeString)),
null,
null,
10.0,
null);
List<Event> eventsListEdge =
TestHelper.getDispatchedEventsWith(
OptimizeTestConstants.EventType.EDGE,
Expand Down Expand Up @@ -1811,8 +1860,9 @@ public void testClearCachedPropositions() throws InterruptedException, IOExcepti
DecisionScope decisionScope = new DecisionScope(decisionScopeString);
final Map<DecisionScope, OptimizeProposition> propositionMap = new HashMap<>();
final ADBCountDownLatch countDownLatch = new ADBCountDownLatch(1);
Optimize.getPropositions(
Optimize.getPropositionsInternal(
Collections.singletonList(decisionScope),
10.0,
new AdobeCallbackWithError<Map<DecisionScope, OptimizeProposition>>() {
@Override
public void fail(AdobeError adobeError) {
Expand All @@ -1838,8 +1888,9 @@ public void call(

final ADBCountDownLatch countDownLatch1 = new ADBCountDownLatch(1);
propositionMap.clear();
Optimize.getPropositions(
Optimize.getPropositionsInternal(
Collections.singletonList(decisionScope),
10.0,
new AdobeCallbackWithError<Map<DecisionScope, OptimizeProposition>>() {
@Override
public void fail(AdobeError adobeError) {
Expand Down Expand Up @@ -1868,8 +1919,12 @@ public void testCoreResetIdentities() throws InterruptedException, IOException {

final String decisionScopeString =
"eyJhY3Rpdml0eUlkIjoieGNvcmU6b2ZmZXItYWN0aXZpdHk6MTExMTExMTExMTExMTExMSIsInBsYWNlbWVudElkIjoieGNvcmU6b2ZmZXItcGxhY2VtZW50OjExMTExMTExMTExMTExMTEifQ==";
Optimize.updatePropositions(
Collections.singletonList(new DecisionScope(decisionScopeString)), null, null);
Optimize.updatePropositionsInternal(
Collections.singletonList(new DecisionScope(decisionScopeString)),
null,
null,
10.0,
null);
List<Event> eventsListEdge =
TestHelper.getDispatchedEventsWith(
OptimizeTestConstants.EventType.EDGE,
Expand Down Expand Up @@ -1972,8 +2027,9 @@ public void testCoreResetIdentities() throws InterruptedException, IOException {
DecisionScope decisionScope = new DecisionScope(decisionScopeString);
final Map<DecisionScope, OptimizeProposition> propositionMap = new HashMap<>();
final ADBCountDownLatch countDownLatch = new ADBCountDownLatch(1);
Optimize.getPropositions(
Optimize.getPropositionsInternal(
Collections.singletonList(decisionScope),
10.0,
new AdobeCallbackWithError<Map<DecisionScope, OptimizeProposition>>() {
@Override
public void fail(AdobeError adobeError) {
Expand Down Expand Up @@ -2001,8 +2057,9 @@ public void call(
TestHelper.resetTestExpectations();
propositionMap.clear();
final ADBCountDownLatch countDownLatch1 = new ADBCountDownLatch(1);
Optimize.getPropositions(
Optimize.getPropositionsInternal(
Collections.singletonList(decisionScope),
10.0,
new AdobeCallbackWithError<Map<DecisionScope, OptimizeProposition>>() {
@Override
public void fail(AdobeError adobeError) {
Expand Down Expand Up @@ -2246,8 +2303,12 @@ public void testGetPropositions_multipleUpdatePropositonsCallsBeforeGetPropositi
"eyJhY3Rpdml0eUlkIjoieGNvcmU6b2ZmZXItYWN0aXZpdHk6MTExMTExMTExMTExMTExMSIsInBsYWNlbWVudElkIjoieGNvcmU6b2ZmZXItcGxhY2VtZW50OjExMTExMTExMTExMTExMTEifQ==";

// Setting up the cache with a decision scope and a proposition.
Optimize.updatePropositions(
Collections.singletonList(new DecisionScope(decisionScopeString)), null, null);
Optimize.updatePropositionsInternal(
Collections.singletonList(new DecisionScope(decisionScopeString)),
null,
null,
10.0,
null);
List<Event> eventsListEdge =
TestHelper.getDispatchedEventsWith(
OptimizeTestConstants.EventType.EDGE,
Expand Down Expand Up @@ -2345,8 +2406,12 @@ public void testGetPropositions_multipleUpdatePropositonsCallsBeforeGetPropositi
TestHelper.resetTestExpectations();

// Firing another update event with same decision scope but different proposition data.
Optimize.updatePropositions(
Collections.singletonList(new DecisionScope(decisionScopeString)), null, null);
Optimize.updatePropositionsInternal(
Collections.singletonList(new DecisionScope(decisionScopeString)),
null,
null,
10.0,
null);

List<Event> secondEventsListEdge =
TestHelper.getDispatchedEventsWith(
Expand Down Expand Up @@ -2432,8 +2497,9 @@ public void testGetPropositions_multipleUpdatePropositonsCallsBeforeGetPropositi
DecisionScope decisionScope = new DecisionScope(decisionScopeString);
final Map<DecisionScope, OptimizeProposition> propositionMap = new HashMap<>();

Optimize.getPropositions(
Optimize.getPropositionsInternal(
Collections.singletonList(decisionScope),
10.0,
new AdobeCallbackWithError<Map<DecisionScope, OptimizeProposition>>() {
@Override
public void fail(AdobeError adobeError) {
Expand Down Expand Up @@ -2492,8 +2558,12 @@ public void testGetPropositions_FewDecisionScopesNotInCacheAndGetToBeQueued()
"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhY3Rpdml0eUlkIjoic2NvcGUtYiIsInBsYWNlbWVudElkIjoic2NvcGUtYl9wbGFjZW1lbnQifQ.QzNxT1dBZ1Z1M0Z5dW84SjdKak1nY2c1";

// Setting up the cache with decisionScopeA and a proposition.
Optimize.updatePropositions(
Collections.singletonList(new DecisionScope(decisionScopeAString)), null, null);
Optimize.updatePropositionsInternal(
Collections.singletonList(new DecisionScope(decisionScopeAString)),
null,
null,
10.0,
null);
List<Event> eventsListEdge =
TestHelper.getDispatchedEventsWith(
OptimizeTestConstants.EventType.EDGE,
Expand Down Expand Up @@ -2554,8 +2624,12 @@ public void testGetPropositions_FewDecisionScopesNotInCacheAndGetToBeQueued()
TestHelper.resetTestExpectations();

// Update event with decisionScopeB
Optimize.updatePropositions(
Collections.singletonList(new DecisionScope(decisionScopeBString)), null, null);
Optimize.updatePropositionsInternal(
Collections.singletonList(new DecisionScope(decisionScopeBString)),
null,
null,
10.0,
null);

List<Event> secondEventsListEdge =
TestHelper.getDispatchedEventsWith(
Expand Down Expand Up @@ -2598,10 +2672,11 @@ public void testGetPropositions_FewDecisionScopesNotInCacheAndGetToBeQueued()
Thread.sleep(1000);

// Execute get proposition event with both decisionScopeA and decisionScopeB
Optimize.getPropositions(
Optimize.getPropositionsInternal(
Arrays.asList(
new DecisionScope(decisionScopeAString),
new DecisionScope(decisionScopeBString)),
10.0,
new AdobeCallbackWithError<Map<DecisionScope, OptimizeProposition>>() {
@Override
public void fail(AdobeError adobeError) {
Expand Down
Loading