diff --git a/build.gradle b/build.gradle index 339d585..119ed73 100644 --- a/build.gradle +++ b/build.gradle @@ -39,18 +39,22 @@ repositories { dependencies { - - compile project (":common") + //eliminate the :common project now since all method are in the excel2db class now + //compile project (":common") compile 'ch.qos.logback:logback-classic:1.2.2' compile 'javax.persistence:persistence-api:1.0.2' compile ('org.springframework:spring-context:4.3.7.RELEASE'){ - //exclude module: 'commons-logging' // force Spring to use jcl-over-slf4j bridge + exclude module: 'commons-logging' // force Spring to use jcl-over-slf4j bridge } + compile 'org.springframework.boot:spring-boot-starter-test:1.5.3.RELEASE' compile 'org.apache.poi:poi:3.15' compile 'org.apache.poi:poi-ooxml:3.15' compile 'org.postgresql:postgresql:42.0.0.jre7' compile 'org.apache.directory.studio:org.apache.commons.io:2.4' - + compile('junit:junit:4.12'){ + exclude group: 'org.hamcrest' + } + compile 'org.hamcrest:hamcrest-library:1.3' } @@ -69,6 +73,18 @@ jar { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } + +//filtering out test classes, only test suites should be run + test { + testLogging.showStandardStreams = true + testLogging.exceptionFormat = 'full' + + //exclude certain classes to avoid double running + // - suites + test classes + exclude '**/InitInputFilesImplTest.class' + exclude '**/PopulateTablePostgresImplTest.class' + } + } diff --git a/log.txt b/log.txt new file mode 100644 index 0000000..e69de29 diff --git a/settings.gradle b/settings.gradle index 96a4507..0eb62c0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,2 @@ rootProject.name = 'Excel2DB' -include 'common' diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index c1238f8..8e5bec8 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -1,15 +1,15 @@ - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file diff --git a/src/main/resources/spring.xml b/src/main/resources/spring.xml index 0b600ba..3c5f9d1 100644 --- a/src/main/resources/spring.xml +++ b/src/main/resources/spring.xml @@ -31,11 +31,11 @@ - - - + + + @@ -58,5 +58,4 @@ - \ No newline at end of file diff --git a/test.xls b/test.xls deleted file mode 100644 index 3b58ff3..0000000 Binary files a/test.xls and /dev/null differ