Addressed fuzz testing issues, see phetsims/circuit-construction-kit-…

…dc#50
phetsims · Jul 26, 2017 · 14eaba1 · 14eaba1
1 parent 6919f69
commit 14eaba1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/js/model/Circuit.js b/js/model/Circuit.js
@@ -339,11 +339,16 @@ define( function( require ) {
       var distance = vertex.positionProperty.value.distance( pivotVertex.positionProperty.value );
 
       // If the vertices are too close, they must be translated way
-      if ( distance < BUMP_AWAY_RADIUS && distance > 0 ) {
+      if ( distance < BUMP_AWAY_RADIUS ) {
 
-        var delta = pivotVertex.positionProperty.value.minus( vertex.positionProperty.value )
-          .normalized()
-          .times( -SNAP_RADIUS * 1.5 );
+        var difference = pivotVertex.positionProperty.value.minus( vertex.positionProperty.value );
+
+        // Support when vertex is on the pivot, mainly for fuzz testing.  In that case, just move directly to the right
+        if ( difference.magnitude() === 0 ) {
+          difference = new Vector2( 1, 0 );
+        }
+
+        var delta = difference.normalized().times( -SNAP_RADIUS * 1.5 );
         this.translateVertexGroup( vertex, delta );
       }
       else {

diff --git a/js/view/CircuitElementNode.js b/js/view/CircuitElementNode.js
@@ -189,8 +189,10 @@ define( function( require ) {
       else {
 
         // End drag for each of the vertices
-        vertices.forEach( function( vertexProperty ) {
-          circuitLayerNode.endDrag( event, vertexProperty, dragged );
+        vertices.forEach( function( vertex ) {
+          if ( circuitConstructionKitScreenView.circuitConstructionKitModel.circuit.vertices.contains( vertex ) ) {
+            circuitLayerNode.endDrag( event, vertex, dragged );
+          }
         } );
 
         // Only show the editor when tapped, not on every drag.  Also, event could be undefined if this end() was

diff --git a/js/view/CircuitLayerNode.js b/js/view/CircuitLayerNode.js
@@ -287,7 +287,11 @@ define( function( require ) {
       // before CircuitElements, but solder should be in front of Wires, see
       // https://github.com/phetsims/circuit-construction-kit-common/issues/386
       self.stepListeners.push( function() {
-        self.fixSolderLayeringForVertex( vertex );
+
+        // make sure the vertex didn't already get removed (like in fuzz testing)
+        if ( self.mainLayer.indexOfChild( vertex ) >= 0 ) {
+          self.fixSolderLayeringForVertex( vertex );
+        }
       } );
     };
     circuit.vertices.addItemAddedListener( addVertexNode );
@@ -363,7 +367,6 @@ define( function( require ) {
     fixSolderLayeringForVertex: function( vertex ) {
       var self = this;
 
-      // wires in the back, then solder, then fixed length components.
       var solderNode = this.getSolderNode( vertex );
       var adjacentCircuitElements = this.circuit.getNeighborCircuitElements( vertex );
       var adjacentWires = adjacentCircuitElements.filter( function( component ) {return component instanceof Wire;} );