Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/devgateway/dg-toolkit in…
Browse files Browse the repository at this point in the history
…to feature/dgtoolkit_update
  • Loading branch information
Ionut Dobre committed Sep 22, 2016
2 parents 4e05beb + d6d8687 commit 48ecf26
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*/
@RunWith(SpringRunner.class)
@ActiveProfiles("integration")
@SpringBootTest(classes = { PersistenceApplication.class })
@SpringBootTest(classes = {PersistenceApplication.class})
@TestPropertySource("classpath:test.properties")
public abstract class AbstractPersistenceTest {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.devgateway.toolkit.web;

import org.apache.log4j.Logger;
import org.devgateway.toolkit.web.spring.WebApplication;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
Expand All @@ -11,9 +10,9 @@

@RunWith(SpringRunner.class)
@ActiveProfiles("integration")
@SpringBootTest(classes = { WebApplication.class }, webEnvironment = WebEnvironment.RANDOM_PORT)
@SpringBootTest(classes = {WebApplication.class},
webEnvironment = WebEnvironment.RANDOM_PORT)
@TestPropertySource("classpath:test.properties")
public abstract class AbstractWebTest {
protected static Logger logger = Logger.getLogger(AbstractWebTest.class);

}

0 comments on commit 48ecf26

Please sign in to comment.