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.

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

[DEV] Fixes for code analyzer and jacoco warnings #39

Merged
merged 5 commits into from
Feb 17, 2022
Merged

[DEV] Fixes for code analyzer and jacoco warnings #39

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
74113af
[DEV] Fix analyzer/lint warnings
emdobrin Sep 21, 2021
d61b357
[DEV] Ignore jacoco output for test app
emdobrin Sep 21, 2021
249529f
[DEV] Increase timeout for tests, ignore jacoco output for android tests
emdobrin Sep 21, 2021
386a54b
[DEV] Small test fixes
emdobrin Sep 21, 2021
11380f5
[DEV] Tests clenaup
emdobrin Sep 23, 2021
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
Prev Previous commit
Next Next commit
[DEV] Increase timeout for tests, ignore jacoco output for android tests
  • Loading branch information
@emdobrin
emdobrin committed Sep 21, 2021
commit 249529f2e847f001686836111012a72f3096503a
8 changes: 4 additions & 4 deletions ...sent/src/androidTest/java/com/adobe/marketing/mobile/edge/consent/ConsentBootUpTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public void test_BootUp_loadsFromPersistence() throws Exception {
assertEquals(SAMPLE_METADATA_TIMESTAMP, responseMap.get("consents.metadata.time"));

// verify xdm shared state
Map<String, String> xdmSharedState = flattenMap(getXDMSharedStateFor(ConsentConstants.EXTENSION_NAME, 1000));
Map<String, String> xdmSharedState = flattenMap(getXDMSharedStateFor(ConsentConstants.EXTENSION_NAME, 2000));
assertEquals(4, xdmSharedState.size());
assertEquals("p", xdmSharedState.get("consents.collect.val"));
assertEquals("n", xdmSharedState.get("consents.adID.val"));
Expand Down Expand Up @@ -124,7 +124,7 @@ public void test_BootUp_noPersistedData_withConfigDefault() throws Exception {
assertEquals("y", responseMap.get("consents.collect.val"));

// verify xdm shared state //
Map<String, String> xdmSharedState = flattenMap(getXDMSharedStateFor(ConsentConstants.EXTENSION_NAME, 1000));
Map<String, String> xdmSharedState = flattenMap(getXDMSharedStateFor(ConsentConstants.EXTENSION_NAME, 2000));
assertEquals(1, xdmSharedState.size());
assertEquals("y", xdmSharedState.get("consents.collect.val"));
}
Expand Down Expand Up @@ -164,7 +164,7 @@ public void test_BootUp_withPersistedData_withConfigDefault() throws Exception {
assertEquals("n", responseMap.get("consents.collect.val"));

// verify xdm shared state //
Map<String, String> xdmSharedState = flattenMap(getXDMSharedStateFor(ConsentConstants.EXTENSION_NAME, 1000));
Map<String, String> xdmSharedState = flattenMap(getXDMSharedStateFor(ConsentConstants.EXTENSION_NAME, 2000));
assertEquals(1, xdmSharedState.size());
assertEquals("n", xdmSharedState.get("consents.collect.val"));
}
Expand Down Expand Up @@ -228,7 +228,7 @@ public void test_BootUp_CompleteWorkflow() throws Exception {
assertNotNull(consentResponseData.get("consents.metadata.time"));

// verify xdm shared state
Map<String, String> xdmSharedState = flattenMap(getXDMSharedStateFor(ConsentConstants.EXTENSION_NAME, 1000));
Map<String, String> xdmSharedState = flattenMap(getXDMSharedStateFor(ConsentConstants.EXTENSION_NAME, 2000));
assertEquals(4, xdmSharedState.size());
assertEquals("n", xdmSharedState.get("consents.collect.val"));
assertEquals("n", xdmSharedState.get("consents.adID.val"));
Expand Down
6 changes: 3 additions & 3 deletions ...nt/src/androidTest/java/com/adobe/marketing/mobile/edge/consent/ConsentDefaultsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public void test_ConsentExtension_UsesDefaultConsent() throws Exception {
assertEquals("y", consentResponseData.get("consents.collect.val"));

// verify xdm shared state
Map<String, String> xdmSharedState = flattenMap(getXDMSharedStateFor(ConsentConstants.EXTENSION_NAME, 1000));
Map<String, String> xdmSharedState = flattenMap(getXDMSharedStateFor(ConsentConstants.EXTENSION_NAME, 2000));
assertEquals(1, xdmSharedState.size()); // verify that only collect consent is set
assertEquals("y", xdmSharedState.get("consents.collect.val"));

Expand Down Expand Up @@ -98,7 +98,7 @@ public void test_DefaultConsent_GetsOverridden() throws Exception {
waitForThreads(1000);

// verify xdm shared state
Map<String, String> xdmSharedState = flattenMap(getXDMSharedStateFor(ConsentConstants.EXTENSION_NAME, 1000));
Map<String, String> xdmSharedState = flattenMap(getXDMSharedStateFor(ConsentConstants.EXTENSION_NAME, 2000));
assertEquals(3, xdmSharedState.size()); // verify that only collect consent is set
assertEquals("n", xdmSharedState.get("consents.collect.val"));
assertEquals("n", xdmSharedState.get("consents.adID.val"));
Expand Down Expand Up @@ -128,7 +128,7 @@ public void test_Reset_DefaultConsent() throws Exception {
waitForThreads(1000);

// verify xdm shared state
Map<String, String> xdmSharedState = flattenMap(getXDMSharedStateFor(ConsentConstants.EXTENSION_NAME, 1000));
Map<String, String> xdmSharedState = flattenMap(getXDMSharedStateFor(ConsentConstants.EXTENSION_NAME, 2000));
assertEquals(1, xdmSharedState.size()); // verify that only collect consent is set
assertEquals("n", xdmSharedState.get("consents.collect.val"));
}
Expand Down
1 change: 1 addition & 0 deletions code/edgeconsent/src/androidTest/resources/jacoco-agent.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
output=none