Skip to content

Commit 7f8793a

Browse files
committed
Merge pull request OfficeDev#481 from easel/fort-nelson-tz
Add America/Fort_Nelson to known OlsonTimeZones
2 parents 61b3fe1 + 56e61b2 commit 7f8793a

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/main/java/microsoft/exchange/webservices/data/util/TimeZoneUtils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ public static Map<String, String> createOlsonTimeZoneToMsMap() {
169169
map.put("America/Eirunepe", "SA Pacific Standard Time");
170170
map.put("America/El_Salvador", "Central America Standard Time");
171171
map.put("America/Ensenada", "Pacific Standard Time");
172+
map.put("America/Fort_Nelson", "Mountain Standard Time");
172173
map.put("America/Fort_Wayne", "US Eastern Standard Time");
173174
map.put("America/Fortaleza", "SA Eastern Standard Time");
174175
map.put("America/Glace_Bay", "Atlantic Standard Time");

src/test/java/microsoft/exchange/webservices/data/property/complex/OlsonTimeZoneTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2121
* THE SOFTWARE.
2222
*/
23-
23+
2424
package microsoft.exchange.webservices.data.property.complex;
2525

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

57-
Assert.assertFalse(StringUtils.isBlank(olsonTimeZoneId));
57+
Assert.assertFalse("olsonTimeZoneId for " + timeZoneId + " is blank", StringUtils.isBlank(olsonTimeZoneId));
5858
Assert.assertEquals(olsonTimeZoneToMsMap.get(timeZoneId), olsonTimeZoneId);
5959
}
6060
}

0 commit comments

Comments
 (0)