/** Test for {@link GenericItem#mergeObjects(Object, Object)} */ public void testMergeObjects() throws ConflictingItemException { assertNull(GenericItem.mergeObjects(null, null)); assertEquals("test", GenericItem.mergeObjects("test", "test")); assertEquals("test", GenericItem.mergeObjects(null, "test")); assertEquals("test", GenericItem.mergeObjects("test", null)); try { assertEquals("test", GenericItem.mergeObjects("test", "")); fail("Expected ConflictingItemException to be thrown"); } catch (ConflictingItemException e) { // Expected because "test" conflicts with "". } }