Skip to content

Commit

Permalink
Merge ../connect-java-library-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Devin Smythe committed Oct 24, 2019
2 parents ced413a + a9a2ca5 commit d8479c0
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ Please include link to open issue if applicable.
* If applicable

### Testing
- [ ] If these changes added new functionality, I tested them against the live API with real auth
- [ ] I wrote tests covering these changes
- [ ] I ran the full test suite and it passed

### Test run results, including date and time:

### Urban Airship Contribution Agreement
https://docs.urbanairship.com/contribution-agreement/
[Link here](https://docs.google.com/forms/d/e/1FAIpQLScErfiz-fXSPpVZ9r8Di2Tr2xDFxt5MgzUel0__9vqUgvko7Q/viewform)

- [ ] I've filled out and signed UA's contribution agreement form.

Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2019-10-24 Release 5.2.0

Add device type filters for sms, email, and open channels.

2019-05-29 Release 5.1.0

Add support for specifying an alternate endpoint URL for stream consumption.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

public enum DeviceType {

IOS("ios"), ANDROID("android"), AMAZON("amazon");
IOS("ios"), ANDROID("android"), AMAZON("amazon"), SMS("sms"), OPEN("open"), EMAIL("email");

private final String serializedValue;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,13 @@ public void testSerialization() throws Exception {
types.add(DeviceType.AMAZON);
types.add(DeviceType.ANDROID);
types.add(DeviceType.IOS);
types.add(DeviceType.SMS);
types.add(DeviceType.EMAIL);
types.add(DeviceType.OPEN);

JsonElement obj = GsonUtil.getGson().toJsonTree(types);

JsonElement expected = parser.parse("[\"amazon\", \"android\", \"ios\"]");
JsonElement expected = parser.parse("[\"amazon\", \"android\", \"ios\", \"sms\", \"email\", \"open\"]");

assertEquals(expected, obj);
}
Expand Down

0 comments on commit d8479c0

Please sign in to comment.