Skip to content

Commit

Permalink
internal refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
rmpestano committed Apr 10, 2016
1 parent 269e6cf commit b0b6047
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18.1</version>
<version>2.19.1</version>
<configuration>
<parallel>classes</parallel>
<useUnlimitedThreads>true</useUnlimitedThreads>
Expand Down
4 changes: 1 addition & 3 deletions core/src/main/java/com/github/dbunit/rules/DBUnitRule.java
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ public final static DBUnitRule instance(String executorName, ConnectionHolder co
@Override
public Statement apply(final Statement statement, final FrameworkMethod frameworkMethod, Object o){
currentMethod = frameworkMethod.getName();
Logger.getLogger(getClass().getSimpleName()).info("Apply - "+currentMethod+" - Executor:"+executor);
DataSet dataSet = frameworkMethod.getAnnotation(DataSet.class);
if(dataSet == null){
dataSet = frameworkMethod.getDeclaringClass().getAnnotation(DataSet.class);
Expand All @@ -64,7 +63,7 @@ public Statement apply(final Statement statement, final FrameworkMethod framewor
@Override
public void evaluate() throws Throwable {
//intentional cause we can have multiple @Rule so multiple executors on top of same dataset
LoggerFactory.getLogger(getClass().getName()).warn("Dataset executor: '" + datasetExecutorId + "' for method " + currentMethod + "() - does not match current executor id -> '" + executor.getId() + "'.\nIgnore this warn if you are using multiple executors");
LoggerFactory.getLogger(getClass().getName()).warn("Dataset executor: '" + datasetExecutorId + "' for method " + currentMethod + "() - does not match current executor id -> '" + executor.getId());
}
};
} else if (executorNameIsProvided) {
Expand Down Expand Up @@ -92,7 +91,6 @@ public void evaluate() throws Throwable {
if (model != null && model.getExecuteScriptsAfter() != null && model.getExecuteScriptsAfter().length > 0) {
try {
for (int i = 0; i < model.getExecuteScriptsAfter().length; i++) {
Logger.getLogger(getClass().getSimpleName()).info("Scripts after - "+currentMethod+" - Executor:"+executor);
executor.executeScript(model.getExecuteScriptsAfter()[i]);
}
} catch (Exception e) {
Expand Down
15 changes: 10 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
<connection>scm:git:https://github.com/rmpestano/dbunit-rules.git</connection>
<developerConnection>scm:git:[email protected]:rmpestano/dbunit-rules.git</developerConnection>
<url>https://github.com/rmpestano/dbunit-rules.git</url>
<tag>v0.4</tag>
</scm>

<ciManagement>
Expand All @@ -58,8 +57,8 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jacoco.version>0.7.4.201502262128</jacoco.version>
<ds.version>1.5.3</ds.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
<ds.version>1.6.0</ds.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -150,7 +149,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18.1</version>
<version>2.19.1</version>
<configuration>
<includes>
<include>**/*It.java</include>
Expand Down Expand Up @@ -222,6 +221,12 @@
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco.version}</version>
<configuration>
<excludes>
<exclude>**/*org.example.*</exclude>
</excludes>
</configuration>

<executions>
<execution>
<goals>
Expand All @@ -240,7 +245,7 @@
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>3.1.0</version>
<version>4.1.0</version>
<configuration>
<repoToken>FyLUCzLpMxNyRwV6c3iyYGLnKb68PLAYW</repoToken>
</configuration>
Expand Down

0 comments on commit b0b6047

Please sign in to comment.