Avoid warning in JUnit when using args that are not defined

src/test/groovy/JunitAndStoreStepTests.groovy

@@ -17,6 +17,7 @@
 
 import org.junit.Before
 import org.junit.Test
+import static org.junit.Assert.assertFalse
 import static org.junit.Assert.assertTrue
 
 class JunitAndStoreStepTests extends ApmBasePipelineTest {
@@ -68,6 +69,8 @@ class JunitAndStoreStepTests extends ApmBasePipelineTest {
     script.call(stashedTestReports: [:], testResults: '*.xml', id: 'acme')
     printCallStack()
     assertTrue(assertMethodCallContainsPattern('junit', 'testResults=*.xml'))
+    assertFalse(assertMethodCallContainsPattern('junit', 'id'))
+    assertFalse(assertMethodCallContainsPattern('junit', 'stashedTestReports'))
     assertTrue(assertMethodCallContainsPattern('stash', 'includes=*.xml, allowEmpty=true, name=acme-'))
     assertJobStatusSuccess()
   }

vars/junitAndStore.groovy

@@ -41,7 +41,8 @@ populated later on with the runbld post build step.
 def call(Map args = [:]) {
   def stashedTestReports = args.containsKey('stashedTestReports') ? args.stashedTestReports : error('junitAndStore: stashedTestReports param is required')
   def testResults = args.containsKey('testResults') ? args.testResults : error('junitAndStore: testResults param is required')
-  junit(args)
+  def junitArgs = args.findAll { k,v -> !(k.equals('id') || k.equals('stashedTestReports')) }
+  junit(junitArgs)
   // args.id could be null in some cases, so let's use the currentmilliseconds
   def suffix = new java.util.Date().getTime()
   def stageName = args.id ? "${args.id?.replaceAll('[\\W]|_', '-')}-${suffix}" : "uncategorized-${suffix}"