Merge branch 'master' into improve-test-coverage

Author: MarkEWaite

src/main/java/org/jvnet/jenkins/plugins/nodelabelparameter/NextLabelCause.java

@@ -2,6 +2,7 @@
 
 import hudson.model.Cause.UpstreamCause;
 import hudson.model.Run;
+import java.util.Objects;
 
 /**
  * @author domi
@@ -34,13 +35,16 @@ public boolean equals(Object o) {
 
         NextLabelCause that = (NextLabelCause) o;
 
-        return label.equals(that.label);
+        return Objects.equals(label, that.label);
     }
 
     @Override
     public int hashCode() {
         int result = super.hashCode();
-        result = 31 * result + label.hashCode();
+        result = 31 * result;
+        if (label != null) {
+            result = result + label.hashCode();
+        }
         return result;
     }
 }

src/test/java/org/jvnet/jenkins/plugins/nodelabelparameter/NextLabelCauseTest.java

@@ -3,7 +3,6 @@
 import hudson.model.FreeStyleBuild;
 import hudson.model.FreeStyleProject;
 import nl.jqno.equalsverifier.EqualsVerifier;
-import nl.jqno.equalsverifier.Warning;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
@@ -25,10 +24,8 @@ public void testGetShortDescription() throws Exception {
 
     @Test
     public void testEqualsContract() {
-        EqualsVerifier.forClass(LabelParameterValue.class)
-                .usingGetClass()
-                .suppress(Warning.NONFINAL_FIELDS)
-                .withIgnoredFields("description", "nextLabels")
-                .verify();
+        // The UpstreamCause base class of NextLabelCause complicates the equals contract.
+        // Intentionally use the simple() verifier.
+        EqualsVerifier.simple().forClass(NextLabelCause.class).verify();
     }
 }