diff --git a/src/test/java/jez04/structure/test/ClassStructureTest.java b/src/test/java/jez04/structure/test/ClassStructureTest.java index bd652439a6490a6bd0207194d80e1f0082769fc5..710d8d2ea19892f30c4545f6abc453ac83eac19e 100644 --- a/src/test/java/jez04/structure/test/ClassStructureTest.java +++ b/src/test/java/jez04/structure/test/ClassStructureTest.java @@ -14,25 +14,38 @@ class ClassStructureTest { StructureHelper helper = StructureHelper.getInstance(ClassStructureTest.class); - // @formatting:off + // @formatter:off @ParameterizedTest @CsvSource({ - ".*\\.java,@Entity,2", - ".*\\.java,@OneToMany\\(mappedBy,1", - ".*\\.java,@ManyToOne,1", - ".*\\.java,@Id,2", - ".*\\.java,@GeneratedValue,2", - ".*\\.java,Persistence\\.createEntityManagerFactory,1", - ".*\\.java,emf.createEntityManager,1", - ".*\\.java,\\.persist\\(,1", - ".*\\.java,\\.getTransaction\\(\\),1", - ".*\\.java,.begin\\(\\),1", - ".*\\.java,.commit\\(\\),1", - }) - // @formatting:on - void anotaceTest(String file, String annotation, int count) throws URISyntaxException { - assertThat(TextFileContains.getProjectRoot(getClass()), - new TextFileContains(file, annotation).useRegExpForName(true).count(count)); + "Bullet.java,serialVersionUID", + "Bullet.java,@Serial", + "BulletAnimated.java,serialVersionUID", + "BulletAnimated.java,@Serial", + "Cannon.java,serialVersionUID", + "Cannon.java,@Serial", + "Ufo.java,serialVersionUID", + "Ufo.java,@Serial", + "MyPoint.java,serialVersionUID", + "MyPoint.java,@Serial", + "WorldEntity.java,serialVersionUID", + "WorldEntity.java,@Serial", + + "WorldEntity.java,transient", + "BulletAnimated.java,transient", + + "World.java,new ServerSocket", + "World.java,Socket", + "World.java,accept", + "World.java,ObjectOutputStream", + "World.java,writeObject", + "World.java,new Socket", + "World.java,ObjectInputStream", + "World.java,ObjectInputStream", + "World.java,synchronized", + }) + // @formatter:on + void anotaceTest(String file, String annotation) throws URISyntaxException { + assertThat(TextFileContains.getProjectRoot(getClass()), new TextFileContains(file, annotation)); }