Merge branch 'master' of https://github.com/juliuskrah/tutorials into juliuskrah-master

This commit is contained in:
Zeger Hendrikse 2016-07-08 01:06:13 +02:00
commit 8066195a85
5 changed files with 45 additions and 45 deletions

View File

@ -10,4 +10,5 @@ public class DemoApplication {
System.setProperty("spring.config.name", "demo"); System.setProperty("spring.config.name", "demo");
SpringApplication.run(DemoApplication.class, args); SpringApplication.run(DemoApplication.class, args);
} }
} }

View File

@ -36,5 +36,4 @@ public class Foo implements Serializable {
public void setName(String name) { public void setName(String name) {
this.name = name; this.name = name;
} }
} }

View File

@ -14,5 +14,4 @@ public class DemoApplicationTests {
@Test @Test
public void contextLoads() { public void contextLoads() {
} }
} }

View File

@ -30,4 +30,5 @@ public class FooRepositoryTest extends DemoApplicationTests {
assertThat(foo, notNullValue()); assertThat(foo, notNullValue());
assertThat(foo.getId(), is(2)); assertThat(foo.getId(), is(2));
} }
} }