Revision ac2d4308
Added by Andreas Kohlbecker over 3 years ago
| src/main/java/eu/etaxonomy/dataportal/junit/CdmDataPortalTestBase.java | ||
|---|---|---|
| 35 | 35 |
|
| 36 | 36 |
private DataPortalContext context; |
| 37 | 37 |
|
| 38 |
private Map<String,String> drupalVarsBeforeTest = new HashMap<>();
|
|
| 38 |
private Map<String,Object> drupalVarsBeforeTest = new HashMap<>();
|
|
| 39 | 39 |
|
| 40 | 40 |
public DataPortalContext getContext() {
|
| 41 | 41 |
return context; |
| ... | ... | |
| 89 | 89 |
*/ |
| 90 | 90 |
protected void setDrupalVar(String varKey, String varValue) throws IOException, InterruptedException {
|
| 91 | 91 |
DrushExecuter dex = getContext().drushExecuter(); |
| 92 |
List<String> result = dex.execute(DrushExecuter.variableGet, varKey);
|
|
| 92 |
List<Object> result = dex.execute(DrushExecuter.variableGet, varKey);
|
|
| 93 | 93 |
assertEquals(1, result.size()); |
| 94 | 94 |
if(!drupalVarsBeforeTest.containsKey(varKey)) {
|
| 95 | 95 |
// stored original values must not be replaced |
| ... | ... | |
| 104 | 104 |
boolean fail = false; |
| 105 | 105 |
for(String varKey : drupalVarsBeforeTest.keySet()) {
|
| 106 | 106 |
try {
|
| 107 |
List<String> result = dex.execute(DrushExecuter.variableSet, varKey, drupalVarsBeforeTest.get(varKey));
|
|
| 107 |
List<Object> result = dex.execute(DrushExecuter.variableSet, varKey, drupalVarsBeforeTest.get(varKey).toString());
|
|
| 108 | 108 |
assertEquals("success", result.get(1));
|
| 109 | 109 |
} catch (Exception e) {
|
| 110 | 110 |
logger.error("FATAL ERROR: Restoring the original drupal variable " + varKey + " = " + drupalVarsBeforeTest.get(varKey) + " failed.", e);
|
| src/main/java/eu/etaxonomy/drush/DrushExecuter.java | ||
|---|---|---|
| 102 | 102 |
* <ol> |
| 103 | 103 |
*/ |
| 104 | 104 |
public static DrushCommand variableSet = new DrushCommand(Arrays.asList("--yes", "vset", "%s", "%s"), null,
|
| 105 |
"[^\\\"]*\\\"(.*)\\\".*\\[(\\w+)\\]"
|
|
| 105 |
".*set\\sto*(.*)\\..*\\[(\\w+)\\]"
|
|
| 106 | 106 |
); |
| 107 | 107 |
|
| 108 | 108 |
/** |
Also available in: Unified diff
ref #9181 adapting test base class to nodified DrushExecuter & fixing bug in varset command