テストパッケージに移動

irof · irof · commit a33f7bc0bc7e · 2025-10-31T19:10:33.000+09:00
TODO解消
diff --git a/jig-core/src/main/java/org/dddjava/jig/domain/model/data/types/TypeId.java b/jig-core/src/main/java/org/dddjava/jig/domain/model/data/types/TypeId.java
@@ -51,15 +51,6 @@ public static TypeId valueOf(String value) {
         return instance;
     }
 
-    /**
-     * クラスオブジェクトからTypeIdを生成するファクトリ。
-     *
-     * TODO JIG実行時のクラスパスに含まれるものしか扱えないため、使用できるクラスは限定的。テストユーティリティなどに持って行って廃止した方がいいかもしれない。
-     */
-    public static TypeId from(Class<?> clz) {
-        return valueOf(clz.getName());
-    }
-
     /**
      * classファイルに記録されている名称からTypeIdを生成するファクトリ。
      * クラスファイル上でのパッケージ名は `/` で区切られている。
diff --git a/jig-core/src/test/java/org/dddjava/jig/adapter/thymeleaf/mermaid/SequenceMermaidDiagramTest.java b/jig-core/src/test/java/org/dddjava/jig/adapter/thymeleaf/mermaid/SequenceMermaidDiagramTest.java
@@ -10,6 +10,7 @@
 import org.dddjava.jig.domain.model.information.members.JigMethod;
 import org.dddjava.jig.domain.model.information.members.JigMethodDeclaration;
 import org.junit.jupiter.api.Test;
+import testing.TestSupport;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -81,7 +82,7 @@ class SequenceMermaidDiagramTest {
                 // Regular class call
                 new MethodCall(TypeId.valueOf("CalleeClass"), "method", List.of(), TypeId.valueOf("ReturnType")),
                 // Java standard library class call (ArrayList)
-                new MethodCall(TypeId.from(ArrayList.class), "add", List.of(TypeId.valueOf("Object")), TypeId.valueOf("boolean"))
+                new MethodCall(TestSupport.getTypeIdFromClass(ArrayList.class), "add", List.of(TypeId.valueOf("Object")), TypeId.valueOf("boolean"))
         ));
 
         var jigMethodDeclaration = new JigMethodDeclaration(
diff --git a/jig-core/src/test/java/org/dddjava/jig/application/ReadableLabelTest.java b/jig-core/src/test/java/org/dddjava/jig/application/ReadableLabelTest.java
@@ -15,6 +15,7 @@
 import stub.domain.model.MethodJavadocStub;
 import stub.domain.model.NotJavadocStub;
 import testing.JigTest;
+import testing.TestSupport;
 
 import java.util.NoSuchElementException;
 import java.util.stream.Stream;
@@ -41,7 +42,7 @@ public ReadableLabelTest(JigDocumentContext jigDocumentContext) {
     @MethodSource
     void クラスコメント取得(Class<?> targetClass, String expectedText, JigRepository jigRepository) {
         var jigTypes = jigRepository.fetchJigTypes();
-        String label = jigTypes.resolveJigType(TypeId.from(targetClass))
+        String label = jigTypes.resolveJigType(TestSupport.getTypeIdFromClass(targetClass))
                 .map(jigType -> jigType.label())
                 .orElseThrow(AssertionError::new);
 
@@ -59,7 +60,7 @@ public ReadableLabelTest(JigDocumentContext jigDocumentContext) {
     @Test
     void メソッド別名取得(JigRepository jigRepository) {
         JigTypes jigTypes = jigRepository.fetchJigTypes();
-        TypeId テスト対象クラス = TypeId.from(MethodJavadocStub.class);
+        TypeId テスト対象クラス = TestSupport.getTypeIdFromClass(MethodJavadocStub.class);
         JigType jigType = jigTypes.listMatches(item -> item.id().equals(テスト対象クラス)).get(0);
 
         JigMethod method = resolveMethodBySignature(jigType, "method()");
diff --git a/jig-core/src/test/java/org/dddjava/jig/domain/model/information/applications/ServiceMethodTest.java b/jig-core/src/test/java/org/dddjava/jig/domain/model/information/applications/ServiceMethodTest.java
@@ -11,6 +11,7 @@
 import stub.domain.model.type.fuga.Fuga;
 import stub.domain.model.type.fuga.FugaIdentifier;
 import testing.JigTest;
+import testing.TestSupport;
 
 import java.util.List;
 import java.util.Optional;
@@ -25,19 +26,19 @@ class ServiceMethodTest {
     void name(JigService jigService, JigRepository jigRepository) {
         JigTypes jigTypes = jigService.jigTypes(jigRepository);
 
-        var targetType = jigTypes.resolveJigType(TypeId.from(CanonicalService.class)).orElseThrow();
+        var targetType = jigTypes.resolveJigType(TestSupport.getTypeIdFromClass(CanonicalService.class)).orElseThrow();
         ServiceMethod sut = targetType.allJigMethodStream()
                 .filter(jigMethod -> jigMethod.name().equals("fuga"))
                 .findAny()
                 .map(jigMethod -> new ServiceMethod(jigMethod, new CallerMethods(Set.of())))
                 .orElseThrow();
 
         Optional<TypeId> primaryType = sut.primaryType();
-        assertEquals(TypeId.from(Fuga.class), primaryType.orElseThrow());
+        assertEquals(TestSupport.getTypeIdFromClass(Fuga.class), primaryType.orElseThrow());
 
         List<TypeId> requireTypes = sut.requireTypes();
         assertEquals(1, requireTypes.size());
-        assertEquals(TypeId.from(FugaIdentifier.class), requireTypes.get(0));
+        assertEquals(TestSupport.getTypeIdFromClass(FugaIdentifier.class), requireTypes.get(0));
 
         UsingMethods usingMethods = sut.usingMethods();
         assertEquals(2, usingMethods.invokedMethodStream().count());
diff --git a/jig-core/src/test/java/org/dddjava/jig/domain/model/information/relation/types/JigTypeRelationshipCreateTest.java b/jig-core/src/test/java/org/dddjava/jig/domain/model/information/relation/types/JigTypeRelationshipCreateTest.java
@@ -32,7 +32,7 @@ void simpleClassTest() {
         assertEquals(1, sut.size());
         assertEquals(
                 TypeRelationship.of(
-                        TypeId.from(SimpleClass.class), TypeId.from(Object.class),
+                        TestSupport.getTypeIdFromClass(SimpleClass.class), TestSupport.getTypeIdFromClass(Object.class),
                         TypeRelationKind.継承クラス),
                 sut.typeRelationships().stream().findFirst().orElseThrow());
     }
@@ -44,13 +44,13 @@ void complexClassTest() {
 
         assertEquals(5, sut.size());
         Comparator<TypeRelationship> comparing = Comparator.comparing(TypeRelationship::to);
-        TypeId from = TypeId.from(ComplexClass.class);
+        TypeId from = TestSupport.getTypeIdFromClass(ComplexClass.class);
         assertEquals(Stream.of(
-                        TypeRelationship.of(from, TypeId.from(CharSequence.class), TypeRelationKind.型引数),
-                        TypeRelationship.of(from, TypeId.from(ComplexSubClass.class), TypeRelationKind.継承クラス),
-                        TypeRelationship.of(from, TypeId.from(String.class), TypeRelationKind.型引数),
-                        TypeRelationship.of(from, TypeId.from(ComplexInterface.class), TypeRelationKind.実装インタフェース),
-                        TypeRelationship.of(from, TypeId.from(Integer.class), TypeRelationKind.型引数)
+                        TypeRelationship.of(from, TestSupport.getTypeIdFromClass(CharSequence.class), TypeRelationKind.型引数),
+                        TypeRelationship.of(from, TestSupport.getTypeIdFromClass(ComplexSubClass.class), TypeRelationKind.継承クラス),
+                        TypeRelationship.of(from, TestSupport.getTypeIdFromClass(String.class), TypeRelationKind.型引数),
+                        TypeRelationship.of(from, TestSupport.getTypeIdFromClass(ComplexInterface.class), TypeRelationKind.実装インタフェース),
+                        TypeRelationship.of(from, TestSupport.getTypeIdFromClass(Integer.class), TypeRelationKind.型引数)
                 ).sorted(comparing).toList(),
                 sut.list().stream().sorted(comparing).toList());
     }
diff --git a/jig-core/src/test/java/org/dddjava/jig/domain/model/information/types/JigTypeTest.java b/jig-core/src/test/java/org/dddjava/jig/domain/model/information/types/JigTypeTest.java
@@ -1,6 +1,5 @@
 package org.dddjava.jig.domain.model.information.types;
 
-import org.dddjava.jig.domain.model.data.types.TypeId;
 import org.junit.jupiter.api.Test;
 import org.springframework.web.bind.annotation.RequestMapping;
 import testing.TestSupport;
@@ -13,7 +12,7 @@ class JigTypeTest {
     void アノテーションの値取得_String() {
         var jigType = TestSupport.buildJigType(MyAnnotatedClass.class);
 
-        var actual = jigType.annotationValueOf(TypeId.from(RequestMapping.class), "name")
+        var actual = jigType.annotationValueOf(TestSupport.getTypeIdFromClass(RequestMapping.class), "name")
                 .orElseThrow(); // 取れなければテスト失敗でよい
 
         assertEquals("hoge", actual);
@@ -23,7 +22,7 @@ class JigTypeTest {
     void アノテーションの値取得_String配列の単一値() {
         var jigType = TestSupport.buildJigType(MyAnnotatedClass.class);
 
-        var actual = jigType.annotationValueOf(TypeId.from(RequestMapping.class), "value")
+        var actual = jigType.annotationValueOf(TestSupport.getTypeIdFromClass(RequestMapping.class), "value")
                 .orElseThrow(); // 取れなければテスト失敗でよい
 
         assertEquals("{id}", actual);
@@ -33,7 +32,7 @@ class JigTypeTest {
     void アノテーションの値取得_aliasなど片方だけとればいいものは最初にマッチしたものがとれる() {
         var jigType = TestSupport.buildJigType(MyAnnotatedClass.class);
 
-        var actual = jigType.annotationValueOf(TypeId.from(RequestMapping.class), "none", "value", "path")
+        var actual = jigType.annotationValueOf(TestSupport.getTypeIdFromClass(RequestMapping.class), "none", "value", "path")
                 .orElseThrow(); // 取れなければテスト失敗でよい
 
         // pathの値がとれている。
diff --git a/jig-core/src/test/java/org/dddjava/jig/domain/model/knowledge/smell/MethodSmellsTest.java b/jig-core/src/test/java/org/dddjava/jig/domain/model/knowledge/smell/MethodSmellsTest.java
@@ -1,7 +1,6 @@
 package org.dddjava.jig.domain.model.knowledge.smell;
 
 import org.dddjava.jig.application.JigService;
-import org.dddjava.jig.domain.model.data.types.TypeId;
 import org.dddjava.jig.domain.model.information.JigRepository;
 import org.dddjava.jig.domain.model.information.types.JigTypes;
 import org.junit.jupiter.api.Test;
@@ -29,7 +28,7 @@ class MethodSmellsTest {
         MethodSmells methodSmells = jigService.methodSmells(jigRepository);
 
         var detectedSmells = methodSmells.list().stream()
-                .filter(methodSmell -> methodSmell.method().declaringType().equals(TypeId.from(SmelledClass.class)))
+                .filter(methodSmell -> methodSmell.method().declaringType().equals(TestSupport.getTypeIdFromClass(SmelledClass.class)))
                 .toList();
 
         assertEquals(9, detectedSmells.size(), detectedSmells.toString());
@@ -106,7 +105,7 @@ private static MethodSmell extractMethod(List<MethodSmell> detectedSmells, Strin
         MethodSmells methodSmells = jigService.methodSmells(jigRepository);
 
         var detectedSmells = methodSmells.list().stream()
-                .filter(methodSmell -> methodSmell.method().declaringType().equals(TypeId.from(SmelledRecord.class)))
+                .filter(methodSmell -> methodSmell.method().declaringType().equals(TestSupport.getTypeIdFromClass(SmelledRecord.class)))
                 .toList();
 
         assertEquals(1, detectedSmells.size(), detectedSmells.toString());
diff --git a/jig-core/src/test/java/org/dddjava/jig/infrastructure/asm/AsmClassSourceReaderTest.java b/jig-core/src/test/java/org/dddjava/jig/infrastructure/asm/AsmClassSourceReaderTest.java
@@ -1,7 +1,6 @@
 package org.dddjava.jig.infrastructure.asm;
 
 import org.dddjava.jig.domain.model.data.types.JigTypeReference;
-import org.dddjava.jig.domain.model.data.types.TypeId;
 import org.dddjava.jig.domain.model.information.types.JigType;
 import org.dddjava.jig.domain.model.information.types.TypeKind;
 import org.junit.jupiter.api.Test;
@@ -67,7 +66,7 @@ public class AsmClassSourceReaderTest {
     private static void assertUsingTypesContainsAll(JigType jigType, Class<?>... classes) {
         var list = jigType.usingTypes().list();
         assertTrue(list.containsAll(Stream.of(classes)
-                .map(TypeId::from)
+                .map(TestSupport::getTypeIdFromClass)
                 .toList()), "UsingTypes " + list + " Should contain all");
     }
 
diff --git a/jig-core/src/test/java/org/dddjava/jig/infrastructure/asm/AsmFieldVisitorTest.java b/jig-core/src/test/java/org/dddjava/jig/infrastructure/asm/AsmFieldVisitorTest.java
@@ -1,7 +1,6 @@
 package org.dddjava.jig.infrastructure.asm;
 
 import org.dddjava.jig.domain.model.data.types.JigAnnotationReference;
-import org.dddjava.jig.domain.model.data.types.TypeId;
 import org.dddjava.jig.domain.model.information.members.JigField;
 import org.dddjava.jig.infrastructure.asm.ut.field.MyEnumFieldSut;
 import org.dddjava.jig.infrastructure.asm.ut.field.MySutClass;
@@ -67,7 +66,7 @@ class AsmFieldVisitorTest {
 
         JigAnnotationReference sut = field.jigFieldHeader().declarationAnnotationStream().findFirst().orElseThrow();
 
-        assertEquals(TypeId.from(VariableAnnotation.class), sut.id());
+        assertEquals(TestSupport.getTypeIdFromClass(VariableAnnotation.class), sut.id());
 
         String text = sut.asText();
         assertTrue(text.contains("string=af"), "Text should contain 'string=af'");
diff --git a/jig-core/src/test/java/org/dddjava/jig/infrastructure/javaparser/JavaparserReaderTest.java b/jig-core/src/test/java/org/dddjava/jig/infrastructure/javaparser/JavaparserReaderTest.java
@@ -6,7 +6,6 @@
 import org.dddjava.jig.domain.model.data.packages.PackageId;
 import org.dddjava.jig.domain.model.data.terms.Term;
 import org.dddjava.jig.domain.model.data.terms.TermKind;
-import org.dddjava.jig.domain.model.data.types.TypeId;
 import org.dddjava.jig.infrastructure.javaparser.ut.ParseTargetCanonicalClass;
 import org.dddjava.jig.infrastructure.onmemoryrepository.OnMemoryGlossaryRepository;
 import org.junit.jupiter.api.BeforeEach;
@@ -45,7 +44,7 @@ void setUp() {
 
         sut.loadPackageInfoJavaFile(targetPath, glossaryRepository);
 
-        PackageId packageId = TypeId.from(this.getClass())
+        PackageId packageId = TestSupport.getTypeIdFromClass(this.getClass())
                 .packageId().subpackageOf(packagePathText.split("/"));
         Term term = glossaryRepository.get(packageId);
 
@@ -59,7 +58,7 @@ void setUp() {
 
         sut.loadPackageInfoJavaFile(getJavaFilePath(path), glossaryRepository);
 
-        PackageId packageId = TypeId.from(this.getClass())
+        PackageId packageId = TestSupport.getTypeIdFromClass(this.getClass())
                 .packageId().subpackageOf("ut", "package_info_typical");
         Term term = glossaryRepository.get(packageId);
 
@@ -78,7 +77,7 @@ void setUp() {
         sut.parseJavaFile(getJavaFilePath(path), glossaryRepository);
 
         var glossary = glossaryRepository.all();
-        var term = glossary.termOf(TypeId.from(ParseTargetCanonicalClass.class).value(), TermKind.クラス);
+        var term = glossary.termOf(TestSupport.getTypeIdFromClass(ParseTargetCanonicalClass.class).value(), TermKind.クラス);
 
         assertEquals("クラスコメント", term.title());
     }
@@ -92,7 +91,7 @@ void setUp() {
 
         var glossary = glossaryRepository.all();
         var term = glossary.termOf(JigMethodId.from(
-                TypeId.from(ParseTargetCanonicalClass.class),
+                TestSupport.getTypeIdFromClass(ParseTargetCanonicalClass.class),
                 "method", List.of()).value(), TermKind.メソッド);
 
         assertEquals("メソッドコメント", term.title());
@@ -107,7 +106,7 @@ void setUp() {
 
         var glossary = glossaryRepository.all();
         var term = glossary.termOf(JigFieldId.from(
-                TypeId.from(ParseTargetCanonicalClass.class),
+                TestSupport.getTypeIdFromClass(ParseTargetCanonicalClass.class),
                 "field").value(), TermKind.フィールド);
 
         assertEquals("フィールドコメント", term.title());
diff --git a/jig-core/src/test/java/testing/TestSupport.java b/jig-core/src/test/java/testing/TestSupport.java
@@ -2,6 +2,7 @@
 
 import org.dddjava.jig.domain.model.data.terms.Glossary;
 import org.dddjava.jig.domain.model.data.types.JigTypeHeader;
+import org.dddjava.jig.domain.model.data.types.TypeId;
 import org.dddjava.jig.domain.model.information.members.JigMethod;
 import org.dddjava.jig.domain.model.information.types.JigType;
 import org.dddjava.jig.domain.model.information.types.JigTypeMembers;
@@ -85,4 +86,11 @@ private static Path getPathFromClass(Class<?> definitionClass) {
     public static JigTypeHeader getJigTypeHeader(Class<?> clz) {
         return buildJigType(clz).jigTypeHeader();
     }
+
+    /**
+     * クラスオブジェクトからTypeIdを生成する。
+     */
+    public static TypeId getTypeIdFromClass(Class<?> clz) {
+        return TypeId.valueOf(clz.getName());
+    }
 }
