| ... |
... |
@@ -36,7 +36,7 @@ import java.util.regex.Pattern; |
|
36
|
36
|
*/
|
|
37
|
37
|
public class MSAccessTestConfiguration {
|
|
38
|
38
|
|
|
39
|
|
- private static final String DB_PATH = "src:test:access";
|
|
|
39
|
+ private static final String DB_PATH = "..:.mvn:cache:avdth";
|
|
40
|
40
|
private static final Log log = LogFactory.getLog(MSAccessTestConfiguration.class);
|
|
41
|
41
|
private static File basedir;
|
|
42
|
42
|
private final Pattern testNamePattern;
|
| ... |
... |
@@ -76,10 +76,10 @@ public class MSAccessTestConfiguration { |
|
76
|
76
|
dbBasedir = new File(dbBasedir, s1);
|
|
77
|
77
|
}
|
|
78
|
78
|
if (!dbBasedir.exists()) {
|
|
79
|
|
- log.warn("Db directory [" + dbBasedir + "] does not exist, will skip test.");
|
|
|
79
|
+ log.warn(String.format("Db directory [%s] does not exist, will skip test.", dbBasedir));
|
|
80
|
80
|
return false;
|
|
81
|
81
|
}
|
|
82
|
|
- log.info("Db directory [" + basedir + "] detected, will do tests.");
|
|
|
82
|
+ log.info(String.format("Db directory [%s] detected, will do tests.", dbBasedir));
|
|
83
|
83
|
String s = System.getenv("executeAll");
|
|
84
|
84
|
if (!StringUtils.isEmpty(s)) {
|
|
85
|
85
|
executeAll = Boolean.valueOf(s);
|
| ... |
... |
@@ -121,24 +121,24 @@ public class MSAccessTestConfiguration { |
|
121
|
121
|
return false;
|
|
122
|
122
|
}
|
|
123
|
123
|
if (lastYear == null && exactYear == null && executeOnce && !executeAll) {
|
|
124
|
|
- log.debug("Skip test " + testName + " executeAll flag is off");
|
|
|
124
|
+ log.debug(String.format("Skip test %s executeAll flag is off", testName));
|
|
125
|
125
|
return false;
|
|
126
|
126
|
}
|
|
127
|
127
|
dbName = String.format(dbPattern, ocean, group);
|
|
128
|
128
|
accessFile = new File(new File(dbBasedir, ocean), dbName);
|
|
129
|
129
|
boolean exists = accessFile.exists();
|
|
130
|
130
|
if (!exists) {
|
|
131
|
|
- log.warn("Could not find access file " + accessFile);
|
|
|
131
|
+ log.warn(String.format("Could not find access file %s", accessFile));
|
|
132
|
132
|
return false;
|
|
133
|
133
|
}
|
|
134
|
|
- log.debug("DbName = " + dbName);
|
|
|
134
|
+ log.debug(String.format("DbName = %s", dbName));
|
|
135
|
135
|
execute = true;
|
|
136
|
136
|
return true;
|
|
137
|
137
|
}
|
|
138
|
138
|
|
|
139
|
139
|
public boolean doTest(String testName) {
|
|
140
|
140
|
if (!execute) {
|
|
141
|
|
- log.info("will not execute test [" + testName + "]");
|
|
|
141
|
+ log.info(String.format("Will not execute test [%s]", testName));
|
|
142
|
142
|
return false;
|
|
143
|
143
|
}
|
|
144
|
144
|
executeOnce = true;
|