Refactor : Adjust resolveFieldName Method Logic to Correctly Handle Primitive boolean Field Names

fixture-monkey-api/src/main/java/com/navercorp/fixturemonkey/api/expression/JavaGetterPropertyFieldNameResolver.java

@@ -28,13 +28,14 @@ public final class JavaGetterPropertyFieldNameResolver {
 
 	@Nullable
 	public String resolveFieldName(Class<?> targetClass, String methodName) {
-		if (hasPrefix(GET_PREFIX, methodName)) {
+
+		if (isValidField(targetClass, methodName)) {
+			// class could be using property-style getters (e.g. java record)
+			return methodName;
+		} else if (hasPrefix(GET_PREFIX, methodName)) {
 			return stripPrefixPropertyName(targetClass, methodName, GET_PREFIX.length());
 		} else if (hasPrefix(IS_PREFIX, methodName)) {
 			return stripPrefixPropertyName(targetClass, methodName, IS_PREFIX.length());
-		} else if (isValidField(targetClass, methodName)) {
-			// class could be using property-style getters (e.g. java record)
-			return methodName;
 		}
 
 		return null;

fixture-monkey-tests/java-tests/src/test/java/com/navercorp/fixturemonkey/tests/java/JavaGetterPropertyFieldNameResolverTest.java

@@ -0,0 +1,78 @@
+package com.navercorp.fixturemonkey.tests.java;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.lang.reflect.Method;
+
+import org.junit.jupiter.api.Test;
+
+import lombok.Getter;
+
+import com.navercorp.fixturemonkey.api.expression.JavaGetterPropertyFieldNameResolver;
+
+public class JavaGetterPropertyFieldNameResolverTest {
+
+	private final JavaGetterPropertyFieldNameResolver resolver = new JavaGetterPropertyFieldNameResolver();
+
+	@Test
+	void testNonBooleanFieldWithIsPrefix() {
+		assertDoesNotThrow(() -> {
+			Method method = TestClass.class.getDeclaredMethod("getIsStatus");
+			String fieldName = resolver.resolveFieldName(TestClass.class, method.getName());
+			assertEquals("isStatus", fieldName,
+				"Should strip 'get' from a non-boolean getter with the 'is' prefix.");
+		}, "Method 'getIsStatus' should exist and not throw an exception.");
+	}
+
+	@Test
+	void testPrimitiveTypeBooleanFieldWithIsPrefix() {
+		assertDoesNotThrow(() -> {
+			Method method = TestClass.class.getDeclaredMethod("isActive");
+			String fieldName = resolver.resolveFieldName(TestClass.class, method.getName());
+			assertEquals("isActive", fieldName,
+				"Should not strip the 'is' prefix from a getter for a primitive boolean field.");
+		}, "Method 'isActive' should exist and not throw an exception.");
+	}
+
+	@Test
+	void testBooleanFieldWithoutIsPrefix() {
+		assertDoesNotThrow(() -> {
+			Method method = TestClass.class.getDeclaredMethod("isEnabled");
+			String fieldName = resolver.resolveFieldName(TestClass.class, method.getName());
+			assertEquals(
+				"enabled", fieldName,
+				"Should strip the 'is' prefix from "
+					+ "a getter for a boolean field without the 'is' prefix in the field name.");
+		}, "Method 'isEnabled' should exist and not throw an exception.");
+	}
+
+	@Test
+	void testNonBooleanFieldWithoutIsPrefix() {
+		assertDoesNotThrow(() -> {
+			Method method = TestClass.class.getDeclaredMethod("getName");
+			String fieldName = resolver.resolveFieldName(TestClass.class, method.getName());
+			assertEquals("name", fieldName,
+				"Should strip 'get' from a getter for a non-boolean field without the 'is' prefix.");
+		}, "Method 'getName' should exist and not throw an exception.");
+	}
+
+	@Test
+	void testWrapperTypeBooleanFieldWithIsPrefix() {
+		assertDoesNotThrow(() -> {
+			Method method = TestClass.class.getDeclaredMethod("getIsDeleted");
+			String fieldName = resolver.resolveFieldName(TestClass.class, method.getName());
+			assertEquals("isDeleted", fieldName,
+				"Should strip 'get' from a getter for a wrapper type Boolean field with the 'is' prefix.");
+		}, "Method 'getIsDeleted' should exist and not throw an exception.");
+	}
+
+	@Getter
+	private static class TestClass {
+		private String isStatus;
+		private boolean isActive;
+		private boolean enabled;
+		private String name;
+		private Boolean isDeleted;
+	}
+}