Projects >> dozer-model >>b9bf37c27199cb309f63a58a902be3730ba67f07

Chunk
Conflicting content 
	}

	/**
<<<<<<< HEAD
	 * Map mapping test
	 */
	@Test
	public void testMap()
	{
		MapObject map = new MapObject();
		map.setId(1L);

		map.getMap().put("1", "one");
		map.getMap().put("2", "two");

		getSession().saveOrUpdate(map);

		getSession().flush();
		getSession().clear();

		closeSession();
		openSession();

		DozerModel model = new DozerModel<>((MapObject) getSession().load(MapObject.class, 1L));

		model.detach();
		model = serialize(model);

		assertEquals(2, model.getObject().getMap().size());
		assertEquals("two", model.getObject().getMap().get("2"));
	}
	
	/**
=======
>>>>>>> 95a465b3f6607140536011100231e2af4be9fc04
	 * Intialize a collection multiple times, check nu x-times loading
	 */
	@Test
Solution content 
	}

	/**
	 * Map mapping test
	 */
	@Test
	public void testMap()
	{
		MapObject map = new MapObject();
		map.setId(1L);

		map.getMap().put("1", "one");
		map.getMap().put("2", "two");

		getSession().saveOrUpdate(map);

		getSession().flush();
		getSession().clear();

		closeSession();
		openSession();

		DozerModel model = new DozerModel<>((MapObject) getSession().load(MapObject.class, 1L));

		model.detach();
		model = serialize(model);

		assertEquals(2, model.getObject().getMap().size());
		assertEquals("two", model.getObject().getMap().get("2"));
	}
	
	/**
	 * Intialize a collection multiple times, check nu x-times loading
	 */
	@Test
File
DozerModelTest.java
Developer's decision
Version 1
Kind of conflict
Annotation
Comment
Method declaration