Skip to content

Commit a9d47cb

Browse files
committed
Fix integration tests.
1 parent ddb4879 commit a9d47cb

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

EnrichmentMapIntegrationTest/src/test/java/org/baderlab/csplugins/enrichmentmap/integration/task/CreateEnrichmentMapTaskTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public void testEnrichmentMapBuildMapTask() throws Exception {
6565

6666
PropertyManager pm = new PropertyManager();
6767
EMCreationParameters params =
68-
new EMCreationParameters("EM1_", pm.getValue(PropertyManager.P_VALUE), pm.getValue(PropertyManager.Q_VALUE),
68+
new EMCreationParameters("EM1_", "EM1_", pm.getValue(PropertyManager.P_VALUE), pm.getValue(PropertyManager.Q_VALUE),
6969
NESFilter.ALL, Optional.empty(), true, SimilarityMetric.JACCARD,
7070
LegacySupport.jaccardCutOff_default, LegacySupport.combinedConstant_default, EdgeStrategy.COMPOUND);
7171

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/commands/tunables/FilterTunables.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@ public class FilterTunables {
5757
@Tunable
5858
public String networkName = null;
5959

60+
// Not a tunable, for use by integration tests
61+
public String attributePrefix = null;
62+
6063

6164
@Inject private LegacySupport legacySupport;
6265

@@ -73,10 +76,10 @@ public FilterTunables() {
7376

7477

7578
public EMCreationParameters getCreationParameters() throws IllegalArgumentException {
76-
String attributePrefix = EMStyleBuilder.Columns.NAMESPACE_PREFIX;
79+
String attPrefix = this.attributePrefix == null ? EMStyleBuilder.Columns.NAMESPACE_PREFIX : attributePrefix;
7780
String stylePrefix = legacySupport.getNextAttributePrefix();
7881

79-
return new EMCreationParameters(attributePrefix, stylePrefix, pvalue, qvalue, getNesFilter(),
82+
return new EMCreationParameters(attPrefix, stylePrefix, pvalue, qvalue, getNesFilter(),
8083
Optional.ofNullable(minExperiments), filterByExpressions,
8184
getSimilarityMetric(), similaritycutoff, combinedConstant,
8285
getEdgeStrategy());

0 commit comments

Comments
 (0)