Skip to content

Upgrade to Java 2.1.1 which fixes feature impression sending for vari… #205

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

Merged
merged 3 commits into from
Jun 21, 2018
Merged

Upgrade to Java 2.1.1 which fixes feature impression sending for vari… #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
013def2
Upgrade to Java 2.0.2 which fixes feature impression sending for vari…
Jun 20, 2018
bbb442c
Upgrade to 2.1.1.
Jun 20, 2018
91c6a2a
Fix breaking tests.
Jun 20, 2018
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
8 changes: 5 additions & 3 deletions android-sdk/src/androidTest/java/com/optimizely/ab/android/sdk/OptimizelyClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@

@RunWith(Parameterized.class)
public class OptimizelyClientTest {
static String BUCKETING_ATTRIBUTE = "$opt_bucketing_id";

@Parameterized.Parameters
public static Collection<Object[]> data() throws IOException {
return Arrays.asList(new Object[][] {
Expand Down Expand Up @@ -311,7 +313,7 @@ public void testGoodActivationBucketingId() {
final HashMap<String, String> attributes = new HashMap<>();
String bucketingId = "1";
Experiment experiment = optimizelyClient.getProjectConfig().getExperimentKeyMapping().get(FEATURE_ANDROID_EXPERIMENT_KEY);
attributes.put(DecisionService.BUCKETING_ATTRIBUTE, bucketingId);
attributes.put(BUCKETING_ATTRIBUTE, bucketingId);
Variation v = optimizelyClient.activate(FEATURE_ANDROID_EXPERIMENT_KEY, GENERIC_USER_ID, attributes);
verify(bucketer).bucket( experiment, bucketingId);
}
Expand Down Expand Up @@ -453,7 +455,7 @@ public void testGoodTrackBucketing() {
Map<String,String> attributes = new HashMap<>();
String bucketingId = "1";
Experiment experiment = optimizelyClient.getProjectConfig().getExperimentsForEventKey("test_event").get(0);
attributes.put(DecisionService.BUCKETING_ATTRIBUTE, bucketingId);
attributes.put(BUCKETING_ATTRIBUTE, bucketingId);
optimizelyClient.track("test_event", "userId", attributes);
verify(bucketer).bucket(experiment, bucketingId);
verifyZeroInteractions(logger);
Expand Down Expand Up @@ -853,7 +855,7 @@ public void testGoodGetVariationBucketingId() {
Experiment experiment = optimizelyClient.getProjectConfig().getExperimentKeyMapping().get("android_experiment_key");
String bucketingId = "1";
Map<String, String> attributes = new HashMap<>();
attributes.put(DecisionService.BUCKETING_ATTRIBUTE, bucketingId);
attributes.put(BUCKETING_ATTRIBUTE, bucketingId);
Variation v = optimizelyClient.getVariation("android_experiment_key", "userId", attributes);
verify(bucketer).bucket(experiment, bucketingId);
}
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ ext {
build_tools_version = "27.0.0"
min_sdk_version = 14
target_sdk_version = 26
java_core_ver = "2.0.1"
java_core_ver = "2.1.1"
android_logger_ver = "1.3.6"
support_annotations_ver = "24.2.1"
junit_ver = "4.12"
Expand Down
4 changes: 2 additions & 2 deletions ...app/src/androidTest/java/com/optimizely/ab/android/test_app/MainActivityEspressoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,10 @@ protected void before() throws Throwable {
super.before();

dataFileServiceIntent = new Intent(context, DatafileService.class);
dataFileServiceIntent.putExtra(DatafileService.EXTRA_DATAFILE_CONFIG, new DatafileConfig(MyApplication.PROJECT_ID).toJSONString());
dataFileServiceIntent.putExtra(DatafileService.EXTRA_DATAFILE_CONFIG, new DatafileConfig(MyApplication.PROJECT_ID, null).toJSONString());

eventIntentService = new Intent(context, EventIntentService.class);
eventIntentService.putExtra(DatafileService.EXTRA_DATAFILE_CONFIG, new DatafileConfig(MyApplication.PROJECT_ID).toJSONString());
eventIntentService.putExtra(DatafileService.EXTRA_DATAFILE_CONFIG, new DatafileConfig(MyApplication.PROJECT_ID, null).toJSONString());

Context applicationContext = context.getApplicationContext();
ServiceScheduler.PendingIntentFactory pendingIntentFactory = new ServiceScheduler.PendingIntentFactory(applicationContext);
Expand Down