#61 update mockito

CHANGELOG.md

@@ -7,4 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+#### Have test setup utilities honor jargon.properties ssl negotiation setting #366
+
+Enable unit tests to respect jargon properties defaults for ssl negotiation
+
+#### Update maven deps for Mockito and ByteBuddy (to allow running under JDK 11)
+
 ### Changed

jargon-core/src/main/java/org/irods/jargon/testutils/IRODSTestSetupUtilities.java

@@ -10,7 +10,10 @@
 import java.util.Properties;
 import java.util.Random;
 
+import org.irods.jargon.core.connection.ClientServerNegotiationPolicy.SslNegotiationPolicy;
 import org.irods.jargon.core.connection.IRODSAccount;
+import org.irods.jargon.core.connection.SettableJargonProperties;
+import org.irods.jargon.core.connection.SettableJargonPropertiesMBean;
 import org.irods.jargon.core.exception.JargonException;
 import org.irods.jargon.core.exception.JargonRuntimeException;
 import org.irods.jargon.core.exception.UnixFileRenameException;
@@ -46,6 +49,20 @@ public IRODSTestSetupUtilities() throws TestConfigurationException {
 
 		try {
 			irodsFileSystem = IRODSFileSystem.instance();
+			SettableJargonPropertiesMBean settableJargonProperties = new SettableJargonProperties(
+					irodsFileSystem.getJargonProperties());
+			String negPropsValue = testingPropertiesHelper.getTestProperties()
+					.getProperty(TestingPropertiesHelper.IRODS_SSL_NEGOTIATION_PROPERTY);
+
+			// If prop not set default to neg refuse
+			if (negPropsValue == null) {
+				settableJargonProperties.setNegotiationPolicy(SslNegotiationPolicy.CS_NEG_REFUSE);
+			} else {
+				settableJargonProperties.setNegotiationPolicy(SslNegotiationPolicy.valueOf(negPropsValue));
+
+			}
+			irodsFileSystem.getIrodsSession().setJargonProperties(settableJargonProperties);
+
 			dataObjectAO = irodsFileSystem.getIRODSAccessObjectFactory().getDataObjectAO(irodsAccount);
 			collectionAO = irodsFileSystem.getIRODSAccessObjectFactory().getCollectionAO(irodsAccount);
 
@@ -57,8 +74,7 @@ public IRODSTestSetupUtilities() throws TestConfigurationException {
 	/**
 	 * Remove the scratch directory from irods based on the testing.properties file
 	 *
-	 * @throws TestConfigurationException
-	 *             {@link TestConfigurationException}
+	 * @throws TestConfigurationException {@link TestConfigurationException}
 	 */
 	@Overheaded
 	// [#1628] intermittent -528036 errors on delete of collections
@@ -100,8 +116,7 @@ public void clearIrodsScratchDirectory() throws TestConfigurationException {
 	 * Clear and then create a fresh scratch directory in irods based on the
 	 * testing.properties file
 	 *
-	 * @throws TestConfigurationException
-	 *             {@link TestConfigurationException}
+	 * @throws TestConfigurationException {@link TestConfigurationException}
 	 */
 	public void initializeIrodsScratchDirectory() throws TestConfigurationException {
 		clearIrodsScratchDirectory();
@@ -128,11 +143,9 @@ public void initializeIrodsScratchDirectory() throws TestConfigurationException
 	 * Create a directory under scratch with the given name, which is typically a
 	 * name assigned per Junit test class
 	 *
-	 * @param testingDirectory
-	 *            {@code String} with a directory to go underneath scratch, do not
-	 *            supply leading '/'
-	 * @throws TestConfigurationException
-	 *             {@link TestConfigurationException}
+	 * @param testingDirectory {@code String} with a directory to go underneath
+	 *                         scratch, do not supply leading '/'
+	 * @throws TestConfigurationException {@link TestConfigurationException}
 	 */
 	public void initializeDirectoryForTest(final String testingDirectory) throws TestConfigurationException {
 		StringBuilder scratchDir = new StringBuilder();
@@ -164,19 +177,17 @@ public void initializeDirectoryForTest(final String testingDirectory) throws Tes
 	 * folders. Each list of candidates is tested with a random number and added at
 	 * that point based on a threshold value
 	 *
-	 * @param irodsAbsolutePath
-	 *            {@code String} with a parent path
-	 * @param candidateAvusForData
-	 *            {@link AvuData} in a {@code List} that will be added to data
-	 *            objects if a random number is above a threshold
-	 * @param candidateAvusForCollections
-	 *            {@link AvuData} in a {@code List} that will be added to
-	 *            collections if a random number is above a threshold
-	 * @param thresholdToAdd
-	 *            {@code int} to compare to a random number to indicate that the
-	 *            given avu should be added at the given node or leaf (0-99)
-	 * @throws Exception
-	 *             for any error
+	 * @param irodsAbsolutePath           {@code String} with a parent path
+	 * @param candidateAvusForData        {@link AvuData} in a {@code List} that
+	 *                                    will be added to data objects if a random
+	 *                                    number is above a threshold
+	 * @param candidateAvusForCollections {@link AvuData} in a {@code List} that
+	 *                                    will be added to collections if a random
+	 *                                    number is above a threshold
+	 * @param thresholdToAdd              {@code int} to compare to a random number
+	 *                                    to indicate that the given avu should be
+	 *                                    added at the given node or leaf (0-99)
+	 * @throws Exception for any error
 	 */
 	public void decorateDirWithMetadata(final String irodsAbsolutePath, final List<AvuData> candidateAvusForData,
 			final List<AvuData> candidateAvusForCollections, final int thresholdToAdd) throws Exception {

jargon-core/src/main/java/org/irods/jargon/testutils/TestingPropertiesHelper.java

@@ -67,6 +67,7 @@ public class TestingPropertiesHelper {
 	public static String IRODS_CONFIRM_TESTING_FALSE = "false";
 	public static String IRODS_TEST_OPTION_EIRODS = "test.option.eirods";
 	public static String IRODS_TEST_OPTION_PYTHON = "test.option.python";
+	public static String IRODS_SSL_NEGOTIATION_PROPERTY = "ssl.negotiation.policy";
 
 	/**
 	 * Return the given property (by key) as an int

jargon-mdquery/pom.xml

@@ -30,7 +30,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
+			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

pom.xml

@@ -74,7 +74,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
+			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>