Skip to content
This repository has been archived by the owner on Jun 18, 2024. It is now read-only.

Commit

Permalink
Add America/Fort_Nelson to known OlsonTimeZones
Browse files Browse the repository at this point in the history
- Add more descriptive assertion failures to OlsonTimeZoneTest
- A new timezone for America/Fort_Nelson was added in tzdata2015g, which
  was included in jdk8u71. This timezone had no analog in the TimeZoneUtils
  map, causing the OlsonTimeZoneTest to fail.
  • Loading branch information
easel committed Jan 20, 2016
1 parent ea8f81a commit 56e61b2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ public static Map<String, String> createOlsonTimeZoneToMsMap() {
map.put("America/Eirunepe", "SA Pacific Standard Time");
map.put("America/El_Salvador", "Central America Standard Time");
map.put("America/Ensenada", "Pacific Standard Time");
map.put("America/Fort_Nelson", "Mountain Standard Time");
map.put("America/Fort_Wayne", "US Eastern Standard Time");
map.put("America/Fortaleza", "SA Eastern Standard Time");
map.put("America/Glace_Bay", "Atlantic Standard Time");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/

package microsoft.exchange.webservices.data.property.complex;

import microsoft.exchange.webservices.data.property.complex.time.OlsonTimeZoneDefinition;
Expand Down Expand Up @@ -54,7 +54,7 @@ public void testOlsonTimeZoneConversion() {
final OlsonTimeZoneDefinition olsonTimeZone = new OlsonTimeZoneDefinition(timeZone);
final String olsonTimeZoneId = olsonTimeZone.getId();

Assert.assertFalse(StringUtils.isBlank(olsonTimeZoneId));
Assert.assertFalse("olsonTimeZoneId for " + timeZoneId + " is blank", StringUtils.isBlank(olsonTimeZoneId));
Assert.assertEquals(olsonTimeZoneToMsMap.get(timeZoneId), olsonTimeZoneId);
}
}
Expand Down

0 comments on commit 56e61b2

Please sign in to comment.