From e4d37d685c6f0cec1a9d7bc635cd071f69dc913a Mon Sep 17 00:00:00 2001
From: Anton Makeev <Anton.Makeev@jetbrains.com>
Date: Sat, 8 Oct 2011 18:05:11 +0200
Subject: [PATCH] Platform: DateFormatUtil fixed

---
 .../com/intellij/util/text/DateFormatUtilTest.java | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/platform/util/testSrc/com/intellij/util/text/DateFormatUtilTest.java b/platform/util/testSrc/com/intellij/util/text/DateFormatUtilTest.java
index 31d903077cea..79ed2b4caea7 100644
--- a/platform/util/testSrc/com/intellij/util/text/DateFormatUtilTest.java
+++ b/platform/util/testSrc/com/intellij/util/text/DateFormatUtilTest.java
@@ -16,8 +16,10 @@
 package com.intellij.util.text;
 
 import com.intellij.openapi.util.Clock;
+import com.intellij.openapi.util.SystemInfo;
 import junit.framework.TestCase;
 
+import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -38,8 +40,16 @@ public class DateFormatUtilTest extends TestCase {
   public void testTime() throws ParseException {
     Clock.setTime(2004, 11, 10, 17, 10, 15);
 
-    assertEquals("17:10", DateFormatUtil.formatTime(Clock.getTime()));
-    assertEquals("17:10:15", DateFormatUtil.formatTimeWithSeconds(Clock.getTime()));
+    if (SystemInfo.isMac) {
+      assertEquals("17:10", DateFormatUtil.formatTime(Clock.getTime()));
+      assertEquals("17:10:15", DateFormatUtil.formatTimeWithSeconds(Clock.getTime()));
+    }
+    else {
+      assertEquals(DateFormat.getTimeInstance(DateFormat.SHORT).format(Clock.getTime()),
+                   DateFormatUtil.formatTime(Clock.getTime()));
+      assertEquals(DateFormat.getTimeInstance(DateFormat.MEDIUM).format(Clock.getTime()),
+                   DateFormatUtil.formatTimeWithSeconds(Clock.getTime()));
+    }
   }
 
   public void testPrettyDateTime() throws ParseException {