From dbd64934f11a8340fcc83af43a36117195323e40 Mon Sep 17 00:00:00 2001
From: jez04 <david.jezek@post.cz>
Date: Wed, 23 Apr 2025 11:25:17 +0200
Subject: [PATCH] Auto stash before rebase of "solution" onto "master"

---
 .../structure/test/ClassStructureTest.java    | 47 ++++++++++++-------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/src/test/java/jez04/structure/test/ClassStructureTest.java b/src/test/java/jez04/structure/test/ClassStructureTest.java
index bd65243..710d8d2 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));
 	}
 
 
-- 
GitLab