Skip to content

Commit 8bebb8b

Browse files
fix: test failing locally but passing on CI
1 parent bf3f6b7 commit 8bebb8b

File tree

1 file changed

+9
-5
lines changed
  • MobileBuy/buy3/src/main/java/com/shopify/buy3

1 file changed

+9
-5
lines changed

MobileBuy/buy3/src/main/java/com/shopify/buy3/Utils.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,29 @@
2929
import java.time.Instant;
3030
import java.util.Date;
3131
import java.util.Locale;
32+
import java.util.TimeZone;
3233

3334
final class Utils {
34-
private static final SimpleDateFormat Z_DATE_TIME_FORMATTER = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.US);
35+
private static final SimpleDateFormat Z_DATE_TIME_FORMATTER = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
3536
private static final SimpleDateFormat DATE_TIME_FORMATTER = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.US);
37+
private static final TimeZone timeZone = TimeZone.getTimeZone("UTC");
3638

3739
static Date parseDateTime(String dateTime) {
40+
DATE_TIME_FORMATTER.setTimeZone(timeZone);
41+
Z_DATE_TIME_FORMATTER.setTimeZone(timeZone);
42+
3843
try {
3944
return Z_DATE_TIME_FORMATTER.parse(dateTime);
40-
} catch (Exception ignored) {}
45+
} catch (Exception ignored) { }
4146

4247
try {
43-
// Fixes: https://github.com/Shopify/mobile-buy-sdk-android/issues/773
4448
return DATE_TIME_FORMATTER.parse(dateTime);
45-
} catch (ParseException ignored) {}
49+
} catch (ParseException ignored) { }
4650

4751
try {
4852
return DATE_TIME_FORMATTER.parse(new Date().toString());
4953
} catch (ParseException e) {
50-
return new Date() ;
54+
return new Date();
5155
}
5256
}
5357

0 commit comments

Comments
 (0)