


import org.junit.Test;
import static org.junit.Assert.assertEquals;

public class Try{
	
	@Test
	public void stringTest(){
		assertEquals("Hello World!", Code.greet());
		
	}
	
	@Test
	public void addTest(){
<<<<<<< HEAD
		assertEquals(9, Code.add());
=======
		assertEquals(15, Code.add());
>>>>>>> branch 'master' of https://github.com/Propra16/programmierpraktikum-abschlussprojekt-pwnyhof
	}
}



import org.junit.Test;
import static org.junit.Assert.assertEquals;

public class Try{
	
	@Test
	public void stringTest(){
		assertEquals("Hello World!", Code.greet());
		
	}
	
	@Test
	public void addTest(){
		assertEquals(9, Code.add());
	}
}

Update Try.java