From 5d1b432d9a089dbebce2ac0fc996898a0da17643 Mon Sep 17 00:00:00 2001 From: Summers Pittman Date: Sun, 23 Aug 2015 14:12:09 -0400 Subject: [PATCH] Fixing tests: There were two types of errors * Some tests had nonutf-8 characters but expected a UTF-8 decoding * Some tests expected certain things query params to be in order * Code was not properly escaping to UTF-8. --- .../CalendarTemplate_CalendarUrlTests.java | 2 +- .../CalendarTemplate_EventUrlTests.java | 32 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/spring-social-google/src/test/java/org/springframework/social/google/api/calendar/CalendarTemplate_CalendarUrlTests.java b/spring-social-google/src/test/java/org/springframework/social/google/api/calendar/CalendarTemplate_CalendarUrlTests.java index de8086c9..b3da7787 100644 --- a/spring-social-google/src/test/java/org/springframework/social/google/api/calendar/CalendarTemplate_CalendarUrlTests.java +++ b/spring-social-google/src/test/java/org/springframework/social/google/api/calendar/CalendarTemplate_CalendarUrlTests.java @@ -167,7 +167,7 @@ public void getCalendar_escaped() { .andRespond( withSuccess(jsonResource("mock_get_calendar_primary"), APPLICATION_JSON)); - Calendar cal = google.calendarOperations().getCalendar("abc123!\"£$%^&*()_+-=[]{};'#:@~,./<>?"); + Calendar cal = google.calendarOperations().getCalendar("abc123!\"£$%^&*()_+-=[]{};'#:@~,./<>?"); assertNotNull(cal); // NB queried for "primary" but actually get back the real ID. diff --git a/spring-social-google/src/test/java/org/springframework/social/google/api/calendar/CalendarTemplate_EventUrlTests.java b/spring-social-google/src/test/java/org/springframework/social/google/api/calendar/CalendarTemplate_EventUrlTests.java index b2c1c92f..f878ba97 100644 --- a/spring-social-google/src/test/java/org/springframework/social/google/api/calendar/CalendarTemplate_EventUrlTests.java +++ b/spring-social-google/src/test/java/org/springframework/social/google/api/calendar/CalendarTemplate_EventUrlTests.java @@ -96,7 +96,7 @@ public void listEvents_primary_fromPage_escaping() { EventPage eventPage = google.calendarOperations() .eventListQuery(CalendarOperations.PRIMARY_CALENDAR_ID) - .fromPage("abc123_¬!£$%^&*()_+-=[]{};'#:@~,./<>?") + .fromPage("abc123_¬!£$%^&*()_+-=[]{};'#:@~,./<>?") .getPage(); assertNotNull(eventPage); @@ -436,18 +436,18 @@ public void listEvents_primary_combined_options() { EventPage eventPage = google.calendarOperations() .eventListQuery(CalendarOperations.PRIMARY_CALENDAR_ID) - .fromPage("pretendPageToken") - .alwaysIncludeEmail(true) - .iCalUID("test-iCalUID") - .maxAttendees(9) - .maxResultsNumber(50) - .orderBy(OrderBy.START_TIME) + .alwaysIncludeEmail(true) + .orderBy(OrderBy.START_TIME) + .timeZone(TEST_TIMEZONE) + .fromPage("pretendPageToken") + .singleEvents(true) + .showHiddenInvitations(true) + .maxResultsNumber(50) + .maxAttendees(9) + .timeMin(TEST_TIME_MIN) + .iCalUID("test-iCalUID") .showDeleted(true) - .showHiddenInvitations(true) - .singleEvents(true) - .timeMax(TEST_TIME_MAX) - .timeMin(TEST_TIME_MIN) - .timeZone(TEST_TIMEZONE) + .timeMax(TEST_TIME_MAX) .updatedMin(TEST_UPDATED_MIN) .getPage(); @@ -464,7 +464,7 @@ public void listEvents_escape_calendarId() { withSuccess(jsonResource("mock_get_event"), APPLICATION_JSON)); EventPage eventPage = google.calendarOperations() - .eventListQuery("abc123!\"£$%^&*()_+-=[]{};'#:@~,./<>?") + .eventListQuery("abc123!\"£$%^&*()_+-=[]{};'#:@~,./<>?") .getPage(); assertNotNull(eventPage); @@ -480,8 +480,8 @@ public void listEvents_escape_pageToken() { withSuccess(jsonResource("mock_list_events_empty"), APPLICATION_JSON)); EventPage eventPage = google.calendarOperations() - .eventListQuery("abc123!\"£$%^&*()_+-=[]{};'#:@~,./<>?") - .fromPage("abc123!\"£$%^&*()_+-=[]{};'#:@~,./<>?") + .eventListQuery("abc123!\"£$%^&*()_+-=[]{};'#:@~,./<>?") + .fromPage("abc123!\"£$%^&*()_+-=[]{};'#:@~,./<>?") .getPage(); assertNotNull(eventPage); @@ -512,7 +512,7 @@ public void getEvent_escape_calendarId() { .andRespond( withSuccess(jsonResource("mock_get_event"), APPLICATION_JSON)); - Event event = google.calendarOperations().getEvent("abc123!\"£$%^&*()_+-=[]{};'#:@~,./<>?", "abc123!\"£$%^&*()_+-=[]{};'#:@~,./<>?"); + Event event = google.calendarOperations().getEvent("abc123!\"£$%^&*()_+-=[]{};'#:@~,./<>?", "abc123!\"£$%^&*()_+-=[]{};'#:@~,./<>?"); assertNotNull(event); }