Projects >> java-plist-serializer >>333c0d3cd9cca7b7361c77e6d7cd6f274d3f19a3

Chunk
Conflicting content
	}
	
	@Test
<<<<<<< HEAD
	public void testInheritedFieldsSerialization() {
		//given
		FooChild object = new FooChild("test1", "test2");
		
		//when
		String xml = plistSerializer.serialize(object);
		
		//then
		assertThat(xml).isEqualTo("bartest2footest1");
	}
=======
	public void testPlistDataSerializationHandler()
	{
		//given
		byte[] data = new String("test").getBytes();
		PlistData object = new PlistData(data);

		//when
		String xml = plistSerializer.serialize(object);

		//then
		assertThat(xml).isEqualTo("dGVzdA==");
	}	
>>>>>>> 29577ff717de7ddd32a8b667cdd9631d82bdf0f3

	@Test
	public void testSupportedDataTypes() throws IllegalAccessException, InstantiationException {
Solution content
	}
	
	@Test
	public void testInheritedFieldsSerialization() {
		//given
		FooChild object = new FooChild("test1", "test2");
		
		//when
		String xml = plistSerializer.serialize(object);
		
		//then
		assertThat(xml).isEqualTo("bartest2footest1");
	}

	@Test
	public void testPlistDataSerializationHandler() {
		//given
		byte[] data = "test".getBytes();
		PlistData object = new PlistData(data);

		//when
		String xml = plistSerializer.serialize(object);

		//then
		assertThat(xml).isEqualTo("dGVzdA==");
	}

	@Test
	public void testSupportedDataTypes() throws IllegalAccessException, InstantiationException {
File
PlistSerializerImplTest.java
Developer's decision
Manual
Kind of conflict
Method declaration