Skip to content

parse v4 additive json #121

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 5 commits into from
Jul 5, 2017
Merged

parse v4 additive json #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7fe00f1
create expected project config v4 from test datafile
wangjoshuah Jul 3, 2017
40e1395
revise v4 datafile. check jackson parsing works
wangjoshuah Jul 3, 2017
805d4e8
test GsonParsing works
wangjoshuah Jul 3, 2017
be78de2
add test for json simple parsing
wangjoshuah Jul 3, 2017
9df5647
add test for json config parsing
wangjoshuah Jul 3, 2017
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
11 changes: 9 additions & 2 deletions core-api/src/test/java/com/optimizely/ab/config/ProjectConfigTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import static java.util.Arrays.asList;
import static java.util.Collections.singletonList;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
Expand Down Expand Up @@ -380,7 +381,7 @@ private static ProjectConfig generateNoAudienceProjectConfigV3() {

private static final ProjectConfig VALID_PROJECT_CONFIG_V4 = generateValidProjectConfigV4();
private static ProjectConfig generateValidProjectConfigV4() {
return null;
return ValidProjectConfigV4.generateValidProjectConfigV4();
}

private ProjectConfigTestUtils() { }
Expand All @@ -401,6 +402,10 @@ public static String noAudienceProjectConfigJsonV3() throws IOException {
return Resources.toString(Resources.getResource("config/no-audience-project-config-v3.json"), Charsets.UTF_8);
}

public static String validConfigJsonV4() throws IOException {
return Resources.toString(Resources.getResource("config/valid-project-config-v4.json"), Charsets.UTF_8);
}

/**
* @return the expected {@link ProjectConfig} for the json produced by {@link #validConfigJsonV2()} ()}
*/
Expand Down Expand Up @@ -506,7 +511,9 @@ private static void verifyTrafficAllocations(List<TrafficAllocation> actual,
TrafficAllocation expectedDistribution = expected.get(i);

assertThat(actualDistribution.getEntityId(), is(expectedDistribution.getEntityId()));
assertThat(actualDistribution.getEndOfRange(), is(expectedDistribution.getEndOfRange()));
assertEquals("expectedDistribution: " + expectedDistribution.toString() +
"is not equal to the actualDistribution: " + actualDistribution.toString(),
expectedDistribution.getEndOfRange(), actualDistribution.getEndOfRange());
}
}

Expand Down
614 changes: 614 additions & 0 deletions core-api/src/test/java/com/optimizely/ab/config/ValidProjectConfigV4.java
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions core-api/src/test/java/com/optimizely/ab/config/parser/GsonConfigParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@

import static com.optimizely.ab.config.ProjectConfigTestUtils.validConfigJsonV2;
import static com.optimizely.ab.config.ProjectConfigTestUtils.validConfigJsonV3;
import static com.optimizely.ab.config.ProjectConfigTestUtils.validConfigJsonV4;
import static com.optimizely.ab.config.ProjectConfigTestUtils.validProjectConfigV2;
import static com.optimizely.ab.config.ProjectConfigTestUtils.validProjectConfigV3;
import static com.optimizely.ab.config.ProjectConfigTestUtils.validProjectConfigV4;
import static com.optimizely.ab.config.ProjectConfigTestUtils.verifyProjectConfig;

/**
Expand Down Expand Up @@ -54,6 +56,15 @@ public void parseProjectConfigV3() throws Exception {
verifyProjectConfig(actual, expected);
}

@Test
public void parseProjectCOnfigV4() throws Exception {
GsonConfigParser parser = new GsonConfigParser();
ProjectConfig actual = parser.parseProjectConfig(validConfigJsonV4());
ProjectConfig expected = validProjectConfigV4();

verifyProjectConfig(actual, expected);
}

/**
* Verify that invalid JSON results in a {@link ConfigParseException} being thrown.
*/
Expand Down
11 changes: 11 additions & 0 deletions core-api/src/test/java/com/optimizely/ab/config/parser/JacksonConfigParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@

import static com.optimizely.ab.config.ProjectConfigTestUtils.validConfigJsonV2;
import static com.optimizely.ab.config.ProjectConfigTestUtils.validConfigJsonV3;
import static com.optimizely.ab.config.ProjectConfigTestUtils.validConfigJsonV4;
import static com.optimizely.ab.config.ProjectConfigTestUtils.validProjectConfigV2;
import static com.optimizely.ab.config.ProjectConfigTestUtils.validProjectConfigV3;
import static com.optimizely.ab.config.ProjectConfigTestUtils.validProjectConfigV4;
import static com.optimizely.ab.config.ProjectConfigTestUtils.verifyProjectConfig;

/**
Expand Down Expand Up @@ -54,6 +56,15 @@ public void parseProjectConfigV3() throws Exception {
verifyProjectConfig(actual, expected);
}

@Test
public void parseProjectConfigV4() throws Exception {
JacksonConfigParser parser = new JacksonConfigParser();
ProjectConfig actual = parser.parseProjectConfig(validConfigJsonV4());
ProjectConfig expected = validProjectConfigV4();

verifyProjectConfig(actual, expected);
}

/**
* Verify that invalid JSON results in a {@link ConfigParseException} being thrown.
*/
Expand Down
11 changes: 11 additions & 0 deletions core-api/src/test/java/com/optimizely/ab/config/parser/JsonConfigParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@
import org.junit.rules.ExpectedException;

import static com.optimizely.ab.config.ProjectConfigTestUtils.validConfigJsonV2;
import static com.optimizely.ab.config.ProjectConfigTestUtils.validConfigJsonV4;
import static com.optimizely.ab.config.ProjectConfigTestUtils.validProjectConfigV2;
import static com.optimizely.ab.config.ProjectConfigTestUtils.validConfigJsonV3;
import static com.optimizely.ab.config.ProjectConfigTestUtils.validProjectConfigV3;
import static com.optimizely.ab.config.ProjectConfigTestUtils.validProjectConfigV4;
import static com.optimizely.ab.config.ProjectConfigTestUtils.verifyProjectConfig;

/**
Expand Down Expand Up @@ -55,6 +57,15 @@ public void parseProjectConfigV3() throws Exception {
verifyProjectConfig(actual, expected);
}

@Test
public void parseProjectConfigV4() throws Exception {
JsonConfigParser parser = new JsonConfigParser();
ProjectConfig actual = parser.parseProjectConfig(validConfigJsonV4());
ProjectConfig expected = validProjectConfigV4();

verifyProjectConfig(actual, expected);
}

/**
* Verify that invalid JSON results in a {@link ConfigParseException} being thrown.
*/
Expand Down
11 changes: 11 additions & 0 deletions core-api/src/test/java/com/optimizely/ab/config/parser/JsonSimpleConfigParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@
import org.junit.rules.ExpectedException;

import static com.optimizely.ab.config.ProjectConfigTestUtils.validConfigJsonV2;
import static com.optimizely.ab.config.ProjectConfigTestUtils.validConfigJsonV4;
import static com.optimizely.ab.config.ProjectConfigTestUtils.validProjectConfigV2;
import static com.optimizely.ab.config.ProjectConfigTestUtils.validConfigJsonV3;
import static com.optimizely.ab.config.ProjectConfigTestUtils.validProjectConfigV3;
import static com.optimizely.ab.config.ProjectConfigTestUtils.validProjectConfigV4;
import static com.optimizely.ab.config.ProjectConfigTestUtils.verifyProjectConfig;

/**
Expand Down Expand Up @@ -55,6 +57,15 @@ public void parseProjectConfigV3() throws Exception {
verifyProjectConfig(actual, expected);
}

@Test
public void parseProjectConfigV4() throws Exception {
JsonSimpleConfigParser parser = new JsonSimpleConfigParser();
ProjectConfig actual = parser.parseProjectConfig(validConfigJsonV4());
ProjectConfig expected = validProjectConfigV4();

verifyProjectConfig(actual, expected);
}

/**
* Verify that invalid JSON results in a {@link ConfigParseException} being thrown.
*/
Expand Down
23 changes: 1 addition & 22 deletions core-api/src/test/resources/config/valid-project-config-v4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@
"trafficAllocation": [
{
"entityId": "1647582435",
"endOfRang": 8000
"endOfRange": 8000
}
],
"audienceIds": [],
Expand Down Expand Up @@ -385,27 +385,6 @@
"defaultValue": "arry"
}
]
},
{
"id": "3072915611",
"key": "launched_experiment",
"layerId": "3587821424",
"status": "Launched",
"variations": [
{
"id": "1647582435",
"key": "launch_control",
"variables": []
}
],
"trafficAllocation": [
{
"entityId": "1647582435",
"endOfRange": 8000
}
],
"audienceIds": [],
"forcedVariations": {}
}
],
"liveVariables": []
Expand Down