Merge remote-tracking branch 'local12x/1.2.x'

This commit is contained in:
Phillip Webb
2015-10-19 12:56:55 -07:00
573 changed files with 791 additions and 360 deletions

View File

@@ -19,6 +19,7 @@ package sample.jpa;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

View File

@@ -19,13 +19,13 @@ import java.util.List;
import org.junit.Test;
import org.junit.runner.RunWith;
import sample.jpa.SampleJpaApplication;
import sample.jpa.domain.Note;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import sample.jpa.SampleJpaApplication;
import sample.jpa.domain.Note;
import static org.junit.Assert.assertEquals;
/**

View File

@@ -19,13 +19,13 @@ import java.util.List;
import org.junit.Test;
import org.junit.runner.RunWith;
import sample.jpa.SampleJpaApplication;
import sample.jpa.domain.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import sample.jpa.SampleJpaApplication;
import sample.jpa.domain.Tag;
import static org.junit.Assert.assertEquals;
/**