diff options
| author | Aaqib Ismail <aaqibismail@google.com> | 2023-12-05 02:32:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-05 02:32:13 +0000 |
| commit | 83f059c9478ba1a93834f72b4e17be7000cfc22b (patch) | |
| tree | b57180179f7f60549fc828a724ed6b5c7625cfab | |
| parent | 5e5b086a80a27c1e873d259561cd0f780f23e33e (diff) | |
| parent | eb79fe317512b39a8a9c770dc81f81c02689653f (diff) | |
| download | cts-83f059c9478ba1a93834f72b4e17be7000cfc22b.tar.gz | |
Merge "Fix missing rounding and incorrect float to int conversions" into android14-tests-dev am: 86a35e1427 am: eb79fe3175
Original change: https://android-review.googlesource.com/c/platform/cts/+/2855472
Change-Id: I88b7b465566644f39362a55e9f2fe646b6754ee3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tests/tests/car/src/android/car/cts/utils/VehiclePropertyVerifier.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/tests/car/src/android/car/cts/utils/VehiclePropertyVerifier.java b/tests/tests/car/src/android/car/cts/utils/VehiclePropertyVerifier.java index 20a1c69ecd8..5bea216ef0c 100644 --- a/tests/tests/car/src/android/car/cts/utils/VehiclePropertyVerifier.java +++ b/tests/tests/car/src/android/car/cts/utils/VehiclePropertyVerifier.java @@ -1678,25 +1678,25 @@ public class VehiclePropertyVerifier<T> { verifyHvacTemperatureIsValid(suggestedTempInFahrenheit, minTempInFahrenheitTimesTen, maxTempInFahrenheitTimesTen, incrementInFahrenheitTimesTen); - int suggestedTempInCelsiusTimesTen = suggestedTempInCelsius.intValue() * 10; - int suggestedTempInFahrenheitTimesTen = suggestedTempInFahrenheit.intValue() * 10; + int suggestedTempInCelsiusTimesTen = (int) (suggestedTempInCelsius * 10f); + int suggestedTempInFahrenheitTimesTen = (int) (suggestedTempInFahrenheit * 10f); int numIncrementsCelsius = - (suggestedTempInCelsiusTimesTen - minTempInCelsiusTimesTen) - / incrementInCelsiusTimesTen; + Math.round((suggestedTempInCelsiusTimesTen - minTempInCelsiusTimesTen) + / incrementInCelsiusTimesTen.floatValue()); int numIncrementsFahrenheit = - (suggestedTempInFahrenheitTimesTen - minTempInFahrenheitTimesTen) - / incrementInFahrenheitTimesTen; + Math.round((suggestedTempInFahrenheitTimesTen - minTempInFahrenheitTimesTen) + / incrementInFahrenheitTimesTen.floatValue()); assertWithMessage( - "The temperature in Celsius must be equivalent to the temperature in" - + " Fahrenheit.") + "The temperature in celsius must map to the same temperature in fahrenheit" + + " using the HVAC_TEMPERATURE_SET config array: " + + hvacTemperatureSetConfigArray) .that(numIncrementsFahrenheit) .isEqualTo(numIncrementsCelsius); } public static void verifyHvacTemperatureIsValid(float temp, int minTempTimesTen, int maxTempTimesTen, int incrementTimesTen) { - Float tempMultiplied = temp * 10.0f; - int intTempTimesTen = tempMultiplied.intValue(); + int intTempTimesTen = (int) (temp * 10f); assertWithMessage( "The temperature value " + intTempTimesTen + " must be at least " + minTempTimesTen + " and at most " + maxTempTimesTen) |