update AssetThat

tvd12 · Apr 24, 2021 · 5497670 · 5497670
1 parent ab1ce5e
commit 5497670
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 19 deletions.
diff --git a/src/main/java/com/tvd12/test/assertion/AssertSupplier.java b/src/main/java/com/tvd12/test/assertion/AssertSupplier.java
@@ -1,7 +1,7 @@
 package com.tvd12.test.assertion;
 
-public interface AssertSupplier {
+public interface AssertSupplier<T> {
 
-	Object apply() throws Throwable;
+	T apply() throws Throwable;
 
 }
diff --git a/src/main/java/com/tvd12/test/assertion/AssertThat.java b/src/main/java/com/tvd12/test/assertion/AssertThat.java
@@ -4,16 +4,16 @@
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
-public class AssertThat {
+public class AssertThat<T> {
 
-	private Object actual;
-	private AssertSupplier actualSupplier;
+	private T actual;
+	private AssertSupplier<T> actualSupplier;
 
-	public AssertThat(Object actual) {
+	public AssertThat(T actual) {
 		this.actual = actual;
 	}
 
-	public AssertThat(AssertSupplier actualSupplier) {
+	public AssertThat(AssertSupplier<T> actualSupplier) {
 		this.actualSupplier = actualSupplier;
 	}
 
@@ -37,7 +37,7 @@ public boolean isNotNull() {
 		return Asserts.assertNotNull(actual);
 	}
 
-	public boolean test(Predicate<Object> predicate) {
+	public boolean test(Predicate<T> predicate) {
 		try {
 			actual = getActualValue();
 		}
@@ -73,7 +73,7 @@ public boolean isEqualsTo(Object expected, boolean mustEqualsType) {
 		return Asserts.assertEquals(expected, actual, mustEqualsType);
 	}
 
-	public boolean isEqualsTo(AssertSupplier expectedSupplier) {
+	public boolean isEqualsTo(AssertSupplier<T> expectedSupplier) {
 		Object expected = null;
 		try {
 			expected = expectedSupplier.apply();
@@ -120,11 +120,11 @@ public boolean testException(Predicate<Throwable> exceptionPredicate) {
 		}
 	}
 
-	@SuppressWarnings("rawtypes")
-	private Object getActualValue() throws Throwable {
-		Object answer = actualSupplier != null ? actualSupplier.apply() : actual;
+	@SuppressWarnings("unchecked")
+	private T getActualValue() throws Throwable {
+		T answer = actualSupplier != null ? actualSupplier.apply() : actual;
 		if(answer instanceof Future)
-			answer = ((Future)answer).get();
+			answer = ((Future<T>)answer).get();
 		return answer;
 	}
 

diff --git a/src/main/java/com/tvd12/test/assertion/Asserts.java b/src/main/java/com/tvd12/test/assertion/Asserts.java
@@ -27,12 +27,12 @@ public static boolean assertNotNull(Object actual) {
 		return true;
 	}
 
-	public static AssertThat assertThat(Object actual) {
-		return new AssertThat(actual);
+	public static <T> AssertThat<T> assertThat(T actual) {
+		return new AssertThat<>(actual);
 	}
 
-	public static AssertThat assertThat(AssertSupplier actualSuppler) {
-		return new AssertThat(actualSuppler);
+	public static <T> AssertThat<T> assertThat(AssertSupplier<T> actualSuppler) {
+		return new AssertThat<>(actualSuppler);
 	}
 
 	public static Throwable assertThrows(AssertApplier func) {

diff --git a/src/test/java/com/tvd12/test/testing/util/RandomUtilTest.java b/src/test/java/com/tvd12/test/testing/util/RandomUtilTest.java
@@ -116,7 +116,6 @@ public void randomWrapperArray() {
 	}
 
 	@Test
-	@SuppressWarnings("unchecked")
 	public void randomWrapperListByType() {
 		Asserts.assertThat(RandomUtil.randomList(8, Boolean.class))
 			.test(it -> ((List<Boolean>)it).size() == 8);
@@ -137,7 +136,6 @@ public void randomWrapperListByType() {
 	}
 
 	@Test
-	@SuppressWarnings("unchecked")
 	public void randomWrapperListByRandom() {
 		Asserts.assertThat(RandomUtil.randomList(8, it -> it.nextBoolean()))
 			.test(it -> ((List<Boolean>)it).size() == 8);