Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
mcrumiller committed Feb 1, 2025
1 parent d0803dc commit 1cdac2c
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 17 deletions.
13 changes: 5 additions & 8 deletions crates/polars-time/src/chunkedarray/datetime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -198,17 +198,14 @@ pub trait DatetimeMethods: AsDatetime {
error_time_values = Some((h, mnt, s, ns));
None
},
// We have a valid date.
// We have a valid time.
|ndt| {
let t = ndt.and_utc();
Some(match time_unit {
TimeUnit::Milliseconds => {
ndt.and_utc().timestamp_millis()
},
TimeUnit::Microseconds => {
ndt.and_utc().timestamp_micros()
},
TimeUnit::Milliseconds => t.timestamp_millis(),
TimeUnit::Microseconds => t.timestamp_micros(),
TimeUnit::Nanoseconds => {
ndt.and_utc().timestamp_nanos_opt().unwrap()
t.timestamp_nanos_opt().unwrap()
},
})
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import pytest

import polars as pl
from polars.exceptions import ComputeError, PanicException
from polars.exceptions import ComputeError
from polars.testing import assert_frame_equal, assert_series_equal

if TYPE_CHECKING:
Expand Down Expand Up @@ -304,11 +304,11 @@ def test_replace_date_invalid_components() -> None:
df = pl.DataFrame({"a": [date(2025, 1, 1)]})

with pytest.raises(
PanicException, match=r"Invalid date components \(2025, 13, 1\) supplied"
ComputeError, match=r"Invalid date components \(2025, 13, 1\) supplied"
):
df.select(pl.col("a").dt.replace(month=13))
with pytest.raises(
PanicException, match=r"Invalid date components \(2025, 1, 32\) supplied"
ComputeError, match=r"Invalid date components \(2025, 1, 32\) supplied"
):
df.select(pl.col("a").dt.replace(day=32))

Expand All @@ -317,11 +317,11 @@ def test_replace_datetime_invalid_date_components() -> None:
df = pl.DataFrame({"a": [datetime(2025, 1, 1)]})

with pytest.raises(
PanicException, match=r"Invalid date components \(2025, 13, 1\) supplied"
ComputeError, match=r"Invalid date components \(2025, 13, 1\) supplied"
):
df.select(pl.col("a").dt.replace(month=13))
with pytest.raises(
PanicException, match=r"Invalid date components \(2025, 1, 32\) supplied"
ComputeError, match=r"Invalid date components \(2025, 1, 32\) supplied"
):
df.select(pl.col("a").dt.replace(day=32))

Expand All @@ -331,25 +331,25 @@ def test_replace_datetime_invalid_time_components() -> None:

# hour
with pytest.raises(
PanicException, match=r"Invalid time components \(25, 0, 0, 0\) supplied"
ComputeError, match=r"Invalid time components \(25, 0, 0, 0\) supplied"
):
df.select(pl.col("a").dt.replace(hour=25))

# minute
with pytest.raises(
PanicException, match=r"Invalid time components \(0, 61, 0, 0\) supplied"
ComputeError, match=r"Invalid time components \(0, 61, 0, 0\) supplied"
):
df.select(pl.col("a").dt.replace(minute=61))

# second
with pytest.raises(
PanicException, match=r"Invalid time components \(0, 0, 61, 0\) supplied"
ComputeError, match=r"Invalid time components \(0, 0, 61, 0\) supplied"
):
df.select(pl.col("a").dt.replace(second=61))

# microsecond
with pytest.raises(
PanicException,
ComputeError,
match=r"Invalid time components \(0, 0, 0, 2000000000\) supplied",
):
df.select(pl.col("a").dt.replace(microsecond=2_000_000))

0 comments on commit 1cdac2c

Please sign in to comment.