HUEditorRowId minor fixes

#668
metasfresh · Nov 12, 2017 · f96d9a2 · f96d9a2
1 parent 70fb3b0
commit f96d9a2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/main/java/de/metas/ui/web/handlingunits/HUEditorRowId.java b/src/main/java/de/metas/ui/web/handlingunits/HUEditorRowId.java
@@ -90,7 +90,7 @@ private static HUEditorRowId fromJson(@NonNull final String json, final Document
 			final List<String> parts = PARTS_SPLITTER.splitToList(json);
 			if (parts.isEmpty())
 			{
-				throw new IllegalArgumentException("Invalid HU rowId: " + documentId);
+				throw new IllegalArgumentException("Invalid HU rowId: " + json);
 			}
 			partsIterator = parts.iterator();
 		}
@@ -114,7 +114,7 @@ else if (idParts.size() == 2)
 			}
 			else
 			{
-				throw new IllegalArgumentException("Invalid HU rowId: " + documentId + ". Cannot parse ID part: " + idStrPart);
+				throw new IllegalArgumentException("Invalid HU rowId: " + json + ". Cannot parse ID part: " + idStrPart);
 			}
 		}
 
@@ -131,7 +131,7 @@ else if (idParts.size() == 2)
 			}
 			else
 			{
-				throw new IllegalArgumentException("Invalid HU rowId: " + documentId + ". Cannot parse part: " + part);
+				throw new IllegalArgumentException("Invalid HU rowId: " + json + ". Cannot parse part: " + part);
 			}
 		}
 

diff --git a/src/test/java/de/metas/ui/web/handlingunits/HUEditorRowIdTest.java b/src/test/java/de/metas/ui/web/handlingunits/HUEditorRowIdTest.java
@@ -1,5 +1,7 @@
 package de.metas.ui.web.handlingunits;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -67,14 +69,19 @@ private static void testToFromJson(final HUEditorRowId rowId)
 		{
 			final String json = rowId.toJson();
 			final HUEditorRowId rowId2 = HUEditorRowId.fromJson(json);
-			Assert.assertEquals(rowId, rowId2);
+			assertThat(rowId2).isEqualTo(rowId);
 		}
 
 		{
 			final String json = rowId.toJson();
 			final DocumentId documentId = DocumentId.of(json);
 			final HUEditorRowId rowId2 = HUEditorRowId.ofDocumentId(documentId);
-			Assert.assertEquals(rowId, rowId2);
+			assertThat(rowId2).isEqualTo(rowId);
+		}
+
+		{
+			final HUEditorRowId rowId2 = HUEditorRowId.ofDocumentId(rowId.toDocumentId());
+			assertThat(rowId2).isEqualTo(rowId);
 		}
 	}
 }