Update tests for reseting less of the style.

Refs #503

Author: mikekucera

EnrichmentMapPlugin/src/test/java/org/baderlab/csplugins/enrichmentmap/style/ApplyStyleTest.java

@@ -248,22 +248,22 @@ public void applyStyle_ONLY_CHARTS(
 
 
 		// setNodeShapes()
-		verify(nodeShapeMapping).putMapValue(Columns.NODE_GS_TYPE_ENRICHMENT, NodeShapeVisualProperty.ELLIPSE);
-		verify(nodeShapeMapping).putMapValue(Columns.NODE_GS_TYPE_SIGNATURE,  NodeShapeVisualProperty.DIAMOND);
+//		verify(nodeShapeMapping).putMapValue(Columns.NODE_GS_TYPE_ENRICHMENT, NodeShapeVisualProperty.ELLIPSE);
+//		verify(nodeShapeMapping).putMapValue(Columns.NODE_GS_TYPE_SIGNATURE,  NodeShapeVisualProperty.DIAMOND);
 
 		// setNodeSize()
-		verify(nodeSizeMapping).addPoint(2,   new BoundaryRangeValues<>(20.0, 20.0, 20.0));
-		verify(nodeSizeMapping).addPoint(500, new BoundaryRangeValues<>(60.0, 60.0, 60.0));
+//		verify(nodeSizeMapping).addPoint(2,   new BoundaryRangeValues<>(20.0, 20.0, 20.0));
+//		verify(nodeSizeMapping).addPoint(500, new BoundaryRangeValues<>(60.0, 60.0, 60.0));
 
 		// setNodeChart()
 		VisualProperty customPaint1 = visualLexicon.lookup(CyNode.class, "NODE_CUSTOMGRAPHICS_1");
 		verify(vs).setDefaultValue(customPaint1, chart);
 
 		// Verify that nothing else was updated
-		verify(vs, times(2)).addVisualMappingFunction(any());
+//		verify(vs, times(2)).addVisualMappingFunction(any());
 		verify(vs, times(3)).setDefaultValue(any(), any());
-		verify(vs).addVisualMappingFunction(nodeShapeMapping);
-		verify(vs).addVisualMappingFunction(nodeSizeMapping);
+//		verify(vs).addVisualMappingFunction(nodeShapeMapping);
+//		verify(vs).addVisualMappingFunction(nodeSizeMapping);
 	}
 
 
@@ -304,23 +304,23 @@ public void applyStyle_ONLY_DATASETS(
 		verify(edgeStrokeUnselectedPaintMapping).putMapValue("DataSet1", Color.BLUE);
 		verify(edgeStrokeUnselectedPaintMapping).putMapValue("DataSet2", Color.RED);
 
-		// setNodeShapes()
-		verify(nodeShapeMapping).putMapValue(Columns.NODE_GS_TYPE_ENRICHMENT, NodeShapeVisualProperty.ELLIPSE);
-		verify(nodeShapeMapping).putMapValue(Columns.NODE_GS_TYPE_SIGNATURE,  NodeShapeVisualProperty.DIAMOND);
+//		// setNodeShapes()
+//		verify(nodeShapeMapping).putMapValue(Columns.NODE_GS_TYPE_ENRICHMENT, NodeShapeVisualProperty.ELLIPSE);
+//		verify(nodeShapeMapping).putMapValue(Columns.NODE_GS_TYPE_SIGNATURE,  NodeShapeVisualProperty.DIAMOND);
 
 		// setNodeSize()
-		verify(nodeSizeMapping).addPoint(2,   new BoundaryRangeValues<>(20.0, 20.0, 20.0));
-		verify(nodeSizeMapping).addPoint(500, new BoundaryRangeValues<>(60.0, 60.0, 60.0));
+//		verify(nodeSizeMapping).addPoint(2,   new BoundaryRangeValues<>(20.0, 20.0, 20.0));
+//		verify(nodeSizeMapping).addPoint(500, new BoundaryRangeValues<>(60.0, 60.0, 60.0));
 
 		// setNodeColors()
-		verify(nodeColorMapping).putMapValue(Columns.NODE_GS_TYPE_ENRICHMENT, Colors.DEF_NODE_COLOR);
-		verify(nodeColorMapping).putMapValue(Columns.NODE_GS_TYPE_SIGNATURE,  Colors.SIG_NODE_COLOR);
+//		verify(nodeColorMapping).putMapValue(Columns.NODE_GS_TYPE_ENRICHMENT, Colors.DEF_NODE_COLOR);
+//		verify(nodeColorMapping).putMapValue(Columns.NODE_GS_TYPE_SIGNATURE,  Colors.SIG_NODE_COLOR);
 
 		// Verify that nothing else was updated
-		verify(vs, times(5)).addVisualMappingFunction(any());
+		verify(vs, times(2)).addVisualMappingFunction(any());
 		verify(vs).addVisualMappingFunction(edgeUnselectedPaintMapping);
 		verify(vs).addVisualMappingFunction(edgeStrokeUnselectedPaintMapping);
-		verify(vs).addVisualMappingFunction(nodeColorMapping);
+//		verify(vs).addVisualMappingFunction(nodeColorMapping);
 	}