Make Offset final, update equals() and hashCode()

src/main/java/org/assertj/core/data/Offset.java

@@ -13,7 +13,6 @@
 package org.assertj.core.data;
 
 import static java.util.Objects.requireNonNull;
-import static org.assertj.core.util.Objects.areEqual;
 import static org.assertj.core.util.Preconditions.checkArgument;
 
 import java.util.Objects;
@@ -26,7 +25,7 @@
  * @author Alex Ruiz
  * @author Yvonne Wang
  */
-public class Offset<T extends Number> {
+public final class Offset<T extends Number> {
 
   public final T value;
   /**
@@ -88,15 +87,14 @@ private Offset(T value, boolean strict) {
   @Override
   public boolean equals(Object obj) {
     if (this == obj) return true;
-    if (obj == null) return false;
-    if (getClass() != obj.getClass()) return false;
+    if (!(obj instanceof Offset)) return false;
     Offset<?> other = (Offset<?>) obj;
-    return strict == other.strict && areEqual(value, other.value);
+    return strict == other.strict && Objects.equals(value, other.value);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(value);
+    return Objects.hash(value, strict);
   }
 
   @Override

src/test/java/org/assertj/core/data/Offset_Test.java

@@ -0,0 +1,106 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * Copyright 2012-2020 the original author or authors.
+ */
+package org.assertj.core.data;
+
+import static org.assertj.core.api.Assertions.catchThrowable;
+import static org.assertj.core.api.BDDAssertions.then;
+import static org.assertj.core.internal.ErrorMessages.offsetValueIsNotPositive;
+import static org.assertj.core.internal.ErrorMessages.strictOffsetValueIsNotStrictlyPositive;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
+
+/**
+ * Tests for {@link Offset}.
+ *
+ * @author Alex Ruiz
+ */
+class Offset_Test {
+
+  @Test
+  void should_honor_equals_contract() {
+    // WHEN/THEN
+    EqualsVerifier.forClass(Offset.class)
+                  .verify();
+  }
+
+  @Test
+  void offset_should_fail_if_value_is_null() {
+    // WHEN
+    Throwable thrown = catchThrowable(() -> Offset.offset(null));
+    // THEN
+    then(thrown).isInstanceOf(NullPointerException.class);
+  }
+
+  @Test
+  void offset_should_fail_if_value_is_negative() {
+    // GIVEN
+    Number value = -0.1;
+    // WHEN
+    Throwable thrown = catchThrowable(() -> Offset.offset(value));
+    // THEN
+    then(thrown).isInstanceOf(IllegalArgumentException.class)
+                .hasMessage(offsetValueIsNotPositive());
+  }
+
+  @ParameterizedTest
+  @ValueSource(doubles = { 0.0, 0.1 })
+  void offset_should_succeed_if_value_is_non_negative(Number value) {
+    // WHEN
+    Offset<Number> offset = Offset.offset(value);
+    // THEN
+    then(offset.value).isSameAs(value);
+  }
+
+  @Test
+  void strict_offset_should_fail_if_value_is_null() {
+    // WHEN
+    Throwable thrown = catchThrowable(() -> Offset.strictOffset(null));
+    // THEN
+    then(thrown).isInstanceOf(NullPointerException.class);
+  }
+
+  @ParameterizedTest
+  @ValueSource(doubles = { -0.1, 0.0 })
+  void strict_offset_should_fail_if_value_is_non_negative(Number value) {
+    // WHEN
+    Throwable thrown = catchThrowable(() -> Offset.strictOffset(value));
+    // THEN
+    then(thrown).isInstanceOf(IllegalArgumentException.class)
+                .hasMessage(strictOffsetValueIsNotStrictlyPositive());
+  }
+
+  @Test
+  void strict_offset_should_succeed_if_value_is_positive() {
+    // GIVEN
+    Number value = 0.1;
+    // WHEN
+    Offset<Number> offset = Offset.strictOffset(value);
+    // THEN
+    then(offset.value).isSameAs(value);
+  }
+
+  @Test
+  void should_implement_toString() {
+    // GIVEN
+    Offset<Number> underTest = Offset.offset(0.0);
+    // WHEN
+    String result = underTest.toString();
+    // THEN
+    then(result).isEqualTo("Offset[value=0.0]");
+  }
+
+}