Author: tchemit Date: 2010-10-13 11:48:18 +0000 (Wed, 13 Oct 2010) New Revision: 670 Log: fix tmpdir which is not created + renmae field logger to log Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java 2010-10-13 11:47:49 UTC (rev 669) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java 2010-10-13 11:48:18 UTC (rev 670) @@ -50,6 +50,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.File; import java.io.InputStream; import java.util.Date; import java.util.List; @@ -63,7 +64,7 @@ */ public abstract class AbstractServiceTest { - private static final Logger logger = + private static final Logger log = LoggerFactory.getLogger(AbstractServiceTest.class); protected static TestManager manager; @@ -80,13 +81,26 @@ @BeforeClass public static void setUpClass() throws Exception { + // Create tmpdir if not exist + String tmpdir = System.getProperty("java.io.tmpdir"); + File file = new File(tmpdir); + if (!file.exists()) { + boolean b = file.mkdirs(); + if (!b) { + if (log.isWarnEnabled()) + log.warn("Could not create tmp directory : " + file); + } + if (log.isInfoEnabled()) { + log.info("tmp dir : " + file + " was created"); + } + } manager = new TestManager(); } @Before public void setUp() throws Exception { - if (logger.isDebugEnabled()) { - logger.debug("Start manager"); + if (log.isDebugEnabled()) { + log.debug("Start manager"); } manager.start(); serviceSampling = (ServiceSamplingImpl)manager.getServiceSampling(); @@ -128,8 +142,8 @@ WaoUser.FIRST_NAME, OBSERVER_DEFAULT_FIRST_NAME, WaoUser.LAST_NAME, OBSERVER_DEFAULT_LAST_NAME, WaoUser.ROLE, UserRole.OBSERVER.ordinal()); - if (logger.isDebugEnabled()) { - logger.debug("Create default observer : " + observer); + if (log.isDebugEnabled()) { + log.debug("Create default observer : " + observer); } transaction.commitTransaction(); @@ -168,8 +182,8 @@ WaoUser.LAST_NAME, null, WaoUser.ROLE, role.ordinal()); - if (logger.isDebugEnabled()) { - logger.debug("Create observer : " + observer); + if (log.isDebugEnabled()) { + log.debug("Create observer : " + observer); } transaction.commitTransaction(); @@ -256,8 +270,8 @@ row = dao.create(); row.setCode(code); row.setCompany(company); - if (logger.isDebugEnabled()) { - logger.debug("Create sampleRow : " + row); + if (log.isDebugEnabled()) { + log.debug("Create sampleRow : " + row); } transaction.commitTransaction(); @@ -308,8 +322,8 @@ boat.setImmatriculation(immatriculation); boat.setName(name); boat.setActive(true); - if (logger.isDebugEnabled()) { - logger.debug("Create boat : " + boat); + if (log.isDebugEnabled()) { + log.debug("Create boat : " + boat); } transaction.commitTransaction(); @@ -387,8 +401,8 @@ contact.setContactState(ContactState.CONTACT_START); contact.setObserver(findDefaultObserver()); contact.setSampleRow(findDefaultSampleRow()); - if (logger.isDebugEnabled()) { - logger.debug("Create contact : " + contact); + if (log.isDebugEnabled()) { + log.debug("Create contact : " + contact); } transaction.commitTransaction();