OZG-5677 more changes from code review

src/test/java/de/ozgcloud/formcycle/formdata/FormStructureParserITCase.java

@@ -36,9 +36,11 @@ import de.xima.fc.form.common.items.XItem;
 class FormStructureParserITCase {
 
 	private static final String FS_CONTAINER_ID = "xi-fs-n";
-	private static final String NESTED_ITEM_ID1 = "nested1";
 	private static final String NEXT_ITEM_ID = "new-item";
 
+	private static final FormNode EXPECTED_FIELD_SET_NODE = FormNodeTestFactory.createBuilder().values(null).itemId(FS_CONTAINER_ID).build();
+	private static final FormNode EXPECTED_TEXT_FIELD_NODE = FormNodeTestFactory.createBuilder().values(null).itemId(NEXT_ITEM_ID).build();
+
 	@Test
 	void shouldParseInputItem() {
 		var expected = FormNodeTestFactory.createBuilder().values(null).build();
@@ -69,18 +71,11 @@ class FormStructureParserITCase {
 		var formNodes = new FormStructureParser(initNestedMap()).parse();
 
 		assertThat(formNodes).hasSize(2);
-		assertHasContainerNodes(formNodes.get(0));
-		assertThat(formNodes.get(1).getItemId()).isEqualTo(ITEM_ID);
-	}
-
-	private void assertHasContainerNodes(FormNode containerNode) {
-		var expectedFieldSetNode = FormNodeTestFactory.createBuilder().values(null).itemId(FS_CONTAINER_ID).build();
-		var expectedTextFieldNode = FormNodeTestFactory.createBuilder().values(null).itemId(NEXT_ITEM_ID).build();
-
-		var containerNodes = containerNode.getNestedElements();
+		var containerNodes = formNodes.get(0).getNestedElements();
 		assertThat(containerNodes).hasSize(2);
-		assertThat(containerNodes.get(0)).usingRecursiveComparison().isEqualTo(expectedFieldSetNode);
-		assertThat(containerNodes.get(1)).usingRecursiveComparison().isEqualTo(expectedTextFieldNode);
+		assertThat(containerNodes.get(0)).usingRecursiveComparison().isEqualTo(EXPECTED_FIELD_SET_NODE);
+		assertThat(containerNodes.get(1)).usingRecursiveComparison().isEqualTo(EXPECTED_TEXT_FIELD_NODE);
+		assertThat(formNodes.get(1).getItemId()).isEqualTo(ITEM_ID);
 	}
 
 	private Map<String, XItem> initNestedMap() {

src/test/java/de/ozgcloud/formcycle/formdata/FormStructureParserTest.java

@@ -39,6 +39,20 @@ class FormStructureParserTest {
 			assertThat(result).isEmpty();
 		}
 
+		@Test
+		void shouldReturnResultNodes() {
+			structureParser = new FormStructureParser(Collections.emptyMap());
+			var expectedResultNode = new ArrayList<>(List.of(FormNodeTestFactory.create()));
+			injectResultNodes(expectedResultNode);
+
+			var result = structureParser.parse();
+
+			assertThat(result).isSameAs(expectedResultNode);
+		}
+
+		@Nested
+		class TestHandleInputNode {
+
 			@Test
 			void shouldCallHandleInputNode() {
 				var items = createItem(TEXT_FIELD);
@@ -47,29 +61,43 @@ class FormStructureParserTest {
 				structureParser.parse();
 
 				verify(structureParser).handleInputNode(items.get(ITEM_ID));
+			}
+
+			@Test
+			void shouldNotCallHandleContainerNode() {
+				var items = createItem(TEXT_FIELD);
+				structureParser = spy(createParser(items));
+
+				structureParser.parse();
+
 				verify(structureParser, never()).handleContainerNode(any());
 			}
 
+		}
+
+		@Nested
+		class TestHandleContainerNode {
+
 			@Test
-		void shouldCallHandleContainerNode() {
+			void shouldHandleContainerNode() {
 				var items = createItem(FIELD_SET);
 				structureParser = spy(createParser(items));
 
 				structureParser.parse();
 
 				verify(structureParser).handleContainerNode(items.get(ITEM_ID));
-			verify(structureParser, never()).handleInputNode(any());
 			}
 
 			@Test
-		void shouldReturnResultNodes() {
-			structureParser = new FormStructureParser(Collections.emptyMap());
-			var expectedResultNode = new ArrayList<>(List.of(FormNodeTestFactory.create()));
-			injectResultNodes(expectedResultNode);
+			void shouldNotCallHandleInputNode() {
+				var items = createItem(FIELD_SET);
+				structureParser = spy(createParser(items));
 
-			var result = structureParser.parse();
+				structureParser.parse();
+
+				verify(structureParser, never()).handleInputNode(any());
+			}
 
-			assertThat(result).isSameAs(expectedResultNode);
 		}
 
 		private FormStructureParser createParser(Map<String, XItem> items) {