SOLR-16300: migrate assert to non deprecated version #947

epugh · 2022-07-19T15:41:43Z

https://issues.apache.org/jira/browse/SOLR-16300

Description

intellij has flagged various deprecations in how we assert in our tests.

Solution

This PR has two approaches for migrating. One is to use the non deprecated class MatcherAssert, the other is to override the deprecated method from the org.junit.Assert class that our tests inherit from, and use the non deprecated class.

Tests

Ran gw test successfully.

Replace junit inherited assertThat with explicit MatcherAssert class

solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.java

epugh · 2022-07-20T20:31:22Z

Did a bit more work, and I think we should:

Eliminate all the MatcherAssert.assertThat and just have assertThat()
Eliminate all the @Rule public ExpectedException in favour of assertThrows()
Migrate containsString() method to CoreMatchers.containsString()
Use assertThrows instead of the try, fail(), catch check. Look for boolean expectedException

epugh · 2022-07-26T14:20:18Z

So, I am rethinking this PR... I think I was falling into the trap of having too many different changes in one PR... So, I'm going to remove the task "Double check all the files for other asserts that can be simplified.", as that is a LOT of changes. I will go through and clean up any MatcherAssert.assertThat that can be replaced with a assertThat if they extend the right Solr test base class....

epugh · 2022-07-26T14:57:09Z

@cpoerschke I'd love a review, I think this is ready!

madrob · 2022-07-26T17:13:28Z

See also apache/lucene#1049 and LUCENE-10662

cpoerschke

19 / 26 files viewed

I wonder if we could/should also put the assert versions in question on the 'forbidden list' e.g. https://github.com/apache/solr/tree/main/gradle/validation/forbidden-apis or in some other way to avoid re-introduction of what is cleaned up here?

epugh · 2022-08-24T14:50:16Z

19 / 26 files viewed

I wonder if we could/should also put the assert versions in question on the 'forbidden list' e.g. https://github.com/apache/solr/tree/main/gradle/validation/forbidden-apis or in some other way to avoid re-introduction of what is cleaned up here?

That is a great suggestion. I haven't touched that feature of our build system before.

uschindler · 2022-08-24T16:52:59Z

19 / 26 files viewed
I wonder if we could/should also put the assert versions in question on the 'forbidden list' e.g. https://github.com/apache/solr/tree/main/gradle/validation/forbidden-apis or in some other way to avoid re-introduction of what is cleaned up here?

That is a great suggestion. I haven't touched that feature of our build system before.

You have 3 options:

add the whole class into the forbiddenapis file (works for MatcherAssert if we do not want to use it)
add a whole series of a single method name with all overloads (Class#method(**))
list all methods to be forbidden (can be quite many) with all overloads

I'd add a separate txt file with correct name. The Gradle build automatically loads some forbiddenapis files when a specific dependency is in classpath. So it can be names forbiddenapis-hamcrest.txt (just example, the file name semantics are described in forbiddenapis.gradle). This prevents us from applying forbiddenapis in modules where the forbidden JAR file is not on classpath.

epugh · 2022-08-25T12:55:02Z

I gave it a stab of adding it to forbiddenapis, but didn't quite get it to work... There are some places that it's okay, like in the LTR module... May need a pairing session to grok this!

uschindler · 2022-08-25T16:14:02Z

We can delay this to a separate PR. I also need try and error for this, because @dweiss implemented that Gradle code which picks the signatures files from that folder.

epugh · 2022-10-14T21:38:37Z

I merged main to this. @epugh were you going to do the forbiddenapis stuff? This looks like it never got merged. The tests should be kicked off again shortly.

I tried the forbiddenapis, and I think I didn't quite grok how it all worked, and ran out of energy.... If you wanted to add them to forbiddenapis, that would be great.. Otherwise, I'm happy to see this get merged!!!

Thanks for reviewing and updating these older PR's!!!

risdenk · 2022-10-15T04:03:39Z

I added forbiddenapis and went down the rabbit hole w/ this.

So we can't override assertThat in SolrTestCase since its static and comes from Assert which is what LuceneTestCase derives from. ForbiddenApis correctly complains that we can't just override the static method and instead knows that Assert#assertThat is still being called. So the solution in this PR isn't going to work as is.

The MatcherAssert.assertThat static import also doesn't work in each file since the base class already has the static method assertThat - so the only solution is to explicitly do MatcherAssert.assertThat.

I have a change that does that that I'll push shortly including the forbiddenapis check.

epugh · 2022-10-15T12:07:15Z

it this PR maybe just going down the wrong approach? I'm not wedded to this one, it felt a bit werid to me as well.

risdenk · 2022-10-15T20:43:25Z

it this PR maybe just going down the wrong approach?

no I don't think so. As Uwe said, should really be Class#method for static and this now follows that approach. Ideally this would have been the same way as Assert.assertThat originally, but oh well. This at least makes everything consistent. It only looks ugly once.

risdenk

I think this is good to go. @epugh @cpoerschke @uschindler can you take another look

epugh

I can't approve a PR I started, but I ran gw check and it looks great. This is a huge improvement in getting rid of old deprecated code compared to where I left it, so excited to get this in! What will we do with all our time if we aren't updating deprecated code in Solr ;-).

risdenk · 2022-10-17T15:52:27Z

I'm getting a bunch of failures...

ERROR: The following test(s) have failed:
  - org.apache.solr.util.configuration.SSLConfigurationsTest.testGetKeyStorePasswordFromHadoopCredentialProvider (:solr:modules:hadoop-auth)
    Test output: /Users/risdenk/repos/apache/solr/solr/modules/hadoop-auth/build/test-results/test/outputs/OUTPUT-org.apache.solr.util.configuration.SSLConfigurationsTest.txt
    Reproduce with: gradlew :solr:modules:hadoop-auth:test --tests "org.apache.solr.util.configuration.SSLConfigurationsTest.testGetKeyStorePasswordFromHadoopCredentialProvider" -Ptests.jvms=5 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=403B35E05244A844 -Ptests.file.encoding=UTF-8

  - org.apache.solr.util.configuration.SSLConfigurationsTest.testGetTruststorePasswordFromHadoopCredentialProvider (:solr:modules:hadoop-auth)
    Test output: /Users/risdenk/repos/apache/solr/solr/modules/hadoop-auth/build/test-results/test/outputs/OUTPUT-org.apache.solr.util.configuration.SSLConfigurationsTest.txt
    Reproduce with: gradlew :solr:modules:hadoop-auth:test --tests "org.apache.solr.util.configuration.SSLConfigurationsTest.testGetTruststorePasswordFromHadoopCredentialProvider" -Ptests.jvms=5 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=403B35E05244A844 -Ptests.file.encoding=UTF-8

  - org.apache.solr.util.configuration.SSLConfigurationsTest.testGetClientTruststorePasswordFromHadoopCredentialProvider (:solr:modules:hadoop-auth)
    Test output: /Users/risdenk/repos/apache/solr/solr/modules/hadoop-auth/build/test-results/test/outputs/OUTPUT-org.apache.solr.util.configuration.SSLConfigurationsTest.txt
    Reproduce with: gradlew :solr:modules:hadoop-auth:test --tests "org.apache.solr.util.configuration.SSLConfigurationsTest.testGetClientTruststorePasswordFromHadoopCredentialProvider" -Ptests.jvms=5 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=403B35E05244A844 -Ptests.file.encoding=UTF-8

  - org.apache.solr.util.configuration.SSLConfigurationsTest.testHadoopCredentialProviderPrioritySysPropAndEnvVars (:solr:modules:hadoop-auth)
    Test output: /Users/risdenk/repos/apache/solr/solr/modules/hadoop-auth/build/test-results/test/outputs/OUTPUT-org.apache.solr.util.configuration.SSLConfigurationsTest.txt
    Reproduce with: gradlew :solr:modules:hadoop-auth:test --tests "org.apache.solr.util.configuration.SSLConfigurationsTest.testHadoopCredentialProviderPrioritySysPropAndEnvVars" -Ptests.jvms=5 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=403B35E05244A844 -Ptests.file.encoding=UTF-8

  - org.apache.solr.util.configuration.SSLConfigurationsTest.testSslConfigKeystorePwFromKeystoreHadoopCredentialProvider (:solr:modules:hadoop-auth)
    Test output: /Users/risdenk/repos/apache/solr/solr/modules/hadoop-auth/build/test-results/test/outputs/OUTPUT-org.apache.solr.util.configuration.SSLConfigurationsTest.txt
    Reproduce with: gradlew :solr:modules:hadoop-auth:test --tests "org.apache.solr.util.configuration.SSLConfigurationsTest.testSslConfigKeystorePwFromKeystoreHadoopCredentialProvider" -Ptests.jvms=5 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=403B35E05244A844 -Ptests.file.encoding=UTF-8

  - org.apache.solr.util.configuration.SSLConfigurationsTest.testSslConfigKeystorePwFromClientKeystoreHadoopCredentialProvider (:solr:modules:hadoop-auth)
    Test output: /Users/risdenk/repos/apache/solr/solr/modules/hadoop-auth/build/test-results/test/outputs/OUTPUT-org.apache.solr.util.configuration.SSLConfigurationsTest.txt
    Reproduce with: gradlew :solr:modules:hadoop-auth:test --tests "org.apache.solr.util.configuration.SSLConfigurationsTest.testSslConfigKeystorePwFromClientKeystoreHadoopCredentialProvider" -Ptests.jvms=5 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=403B35E05244A844 -Ptests.file.encoding=UTF-8

  - org.apache.solr.util.configuration.SSLConfigurationsTest.testGetClientKeyStorePasswordFromHadoopCredentialProvider (:solr:modules:hadoop-auth)
    Test output: /Users/risdenk/repos/apache/solr/solr/modules/hadoop-auth/build/test-results/test/outputs/OUTPUT-org.apache.solr.util.configuration.SSLConfigurationsTest.txt
    Reproduce with: gradlew :solr:modules:hadoop-auth:test --tests "org.apache.solr.util.configuration.SSLConfigurationsTest.testGetClientKeyStorePasswordFromHadoopCredentialProvider" -Ptests.jvms=5 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=403B35E05244A844 -Ptests.file.encoding=UTF-8

  - org.apache.solr.core.TestSolrXml.testIntAsLongBad (:solr:core)
    Test output: /Users/risdenk/repos/apache/solr/solr/core/build/test-results/test/outputs/OUTPUT-org.apache.solr.core.TestSolrXml.txt
    Reproduce with: gradlew :solr:core:test --tests "org.apache.solr.core.TestSolrXml.testIntAsLongBad" -Ptests.jvms=5 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=403B35E05244A844 -Ptests.file.encoding=UTF-8

  - org.apache.solr.util.ModuleUtilsTest.testIsValidName (:solr:core)
    Test output: /Users/risdenk/repos/apache/solr/solr/core/build/test-results/test/outputs/OUTPUT-org.apache.solr.util.ModuleUtilsTest.txt
    Reproduce with: gradlew :solr:core:test --tests "org.apache.solr.util.ModuleUtilsTest.testIsValidName" -Ptests.jvms=5 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=403B35E05244A844 -Ptests.file.encoding=UTF-8

  - org.apache.solr.util.ModuleUtilsTest.testListAvailableModules (:solr:core)
    Test output: /Users/risdenk/repos/apache/solr/solr/core/build/test-results/test/outputs/OUTPUT-org.apache.solr.util.ModuleUtilsTest.txt
    Reproduce with: gradlew :solr:core:test --tests "org.apache.solr.util.ModuleUtilsTest.testListAvailableModules" -Ptests.jvms=5 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=403B35E05244A844 -Ptests.file.encoding=UTF-8

  - org.apache.solr.util.ModuleUtilsTest.testResolveFromSyspropOrEnv (:solr:core)
    Test output: /Users/risdenk/repos/apache/solr/solr/core/build/test-results/test/outputs/OUTPUT-org.apache.solr.util.ModuleUtilsTest.txt
    Reproduce with: gradlew :solr:core:test --tests "org.apache.solr.util.ModuleUtilsTest.testResolveFromSyspropOrEnv" -Ptests.jvms=5 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=403B35E05244A844 -Ptests.file.encoding=UTF-8

  - org.apache.solr.util.ModuleUtilsTest.testGetModuleLibPath (:solr:core)
    Test output: /Users/risdenk/repos/apache/solr/solr/core/build/test-results/test/outputs/OUTPUT-org.apache.solr.util.ModuleUtilsTest.txt
    Reproduce with: gradlew :solr:core:test --tests "org.apache.solr.util.ModuleUtilsTest.testGetModuleLibPath" -Ptests.jvms=5 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=403B35E05244A844 -Ptests.file.encoding=UTF-8

  - org.apache.solr.util.ModuleUtilsTest.testModuleExists (:solr:core)
    Test output: /Users/risdenk/repos/apache/solr/solr/core/build/test-results/test/outputs/OUTPUT-org.apache.solr.util.ModuleUtilsTest.txt
    Reproduce with: gradlew :solr:core:test --tests "org.apache.solr.util.ModuleUtilsTest.testModuleExists" -Ptests.jvms=5 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=403B35E05244A844 -Ptests.file.encoding=UTF-8

  - org.apache.solr.util.ModuleUtilsTest.testResolveModules (:solr:core)
    Test output: /Users/risdenk/repos/apache/solr/solr/core/build/test-results/test/outputs/OUTPUT-org.apache.solr.util.ModuleUtilsTest.txt
    Reproduce with: gradlew :solr:core:test --tests "org.apache.solr.util.ModuleUtilsTest.testResolveModules" -Ptests.jvms=5 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=403B35E05244A844 -Ptests.file.encoding=UTF-8

  - org.apache.solr.util.configuration.SSLConfigurationsTest.testGetKeyStorePasswordFromEnv (:solr:core)
    Test output: /Users/risdenk/repos/apache/solr/solr/core/build/test-results/test/outputs/OUTPUT-org.apache.solr.util.configuration.SSLConfigurationsTest.txt
    Reproduce with: gradlew :solr:core:test --tests "org.apache.solr.util.configuration.SSLConfigurationsTest.testGetKeyStorePasswordFromEnv" -Ptests.jvms=5 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=403B35E05244A844 -Ptests.file.encoding=UTF-8

  - org.apache.solr.util.configuration.SSLConfigurationsTest.testGetTrustStorePasswordFromProperty (:solr:core)
    Test output: /Users/risdenk/repos/apache/solr/solr/core/build/test-results/test/outputs/OUTPUT-org.apache.solr.util.configuration.SSLConfigurationsTest.txt
    Reproduce with: gradlew :solr:core:test --tests "org.apache.solr.util.configuration.SSLConfigurationsTest.testGetTrustStorePasswordFromProperty" -Ptests.jvms=5 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=403B35E05244A844 -Ptests.file.encoding=UTF-8

  - org.apache.solr.util.configuration.SSLConfigurationsTest.testSslConfigKeystorePwNotOverwrittenIfExists (:solr:core)
    Test output: /Users/risdenk/repos/apache/solr/solr/core/build/test-results/test/outputs/OUTPUT-org.apache.solr.util.configuration.SSLConfigurationsTest.txt
    Reproduce with: gradlew :solr:core:test --tests "org.apache.solr.util.configuration.SSLConfigurationsTest.testSslConfigKeystorePwNotOverwrittenIfExists" -Ptests.jvms=5 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=403B35E05244A844 -Ptests.file.encoding=UTF-8

  - org.apache.solr.util.configuration.SSLConfigurationsTest.testGetTrustStorePasswordFromEnv (:solr:core)
    Test output: /Users/risdenk/repos/apache/solr/solr/core/build/test-results/test/outputs/OUTPUT-org.apache.solr.util.configuration.SSLConfigurationsTest.txt
    Reproduce with: gradlew :solr:core:test --tests "org.apache.solr.util.configuration.SSLConfigurationsTest.testGetTrustStorePasswordFromEnv" -Ptests.jvms=5 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=403B35E05244A844 -Ptests.file.encoding=UTF-8

  - org.apache.solr.util.configuration.SSLConfigurationsTest.testSslConfigKeystorePwFromBothEnvVars (:solr:core)
    Test output: /Users/risdenk/repos/apache/solr/solr/core/build/test-results/test/outputs/OUTPUT-org.apache.solr.util.configuration.SSLConfigurationsTest.txt
    Reproduce with: gradlew :solr:core:test --tests "org.apache.solr.util.configuration.SSLConfigurationsTest.testSslConfigKeystorePwFromBothEnvVars" -Ptests.jvms=5 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=403B35E05244A844 -Ptests.file.encoding=UTF-8

  - org.apache.solr.util.configuration.SSLConfigurationsTest.testGetClientKeyStorePasswordFromProperty (:solr:core)
    Test output: /Users/risdenk/repos/apache/solr/solr/core/build/test-results/test/outputs/OUTPUT-org.apache.solr.util.configuration.SSLConfigurationsTest.txt
    Reproduce with: gradlew :solr:core:test --tests "org.apache.solr.util.configuration.SSLConfigurationsTest.testGetClientKeyStorePasswordFromProperty" -Ptests.jvms=5 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=403B35E05244A844 -Ptests.file.encoding=UTF-8

  - org.apache.solr.util.configuration.SSLConfigurationsTest.testSslConfigTruststorePwNotOverwrittenIfExists (:solr:core)
    Test output: /Users/risdenk/repos/apache/solr/solr/core/build/test-results/test/outputs/OUTPUT-org.apache.solr.util.configuration.SSLConfigurationsTest.txt
    Reproduce with: gradlew :solr:core:test --tests "org.apache.solr.util.configuration.SSLConfigurationsTest.testSslConfigTruststorePwNotOverwrittenIfExists" -Ptests.jvms=5 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=403B35E05244A844 -Ptests.file.encoding=UTF-8

  - org.apache.solr.util.configuration.SSLConfigurationsTest.testSslConfigKeystorePwFromClientKeystoreEnvVar (:solr:core)
    Test output: /Users/risdenk/repos/apache/solr/solr/core/build/test-results/test/outputs/OUTPUT-org.apache.solr.util.configuration.SSLConfigurationsTest.txt
    Reproduce with: gradlew :solr:core:test --tests "org.apache.solr.util.configuration.SSLConfigurationsTest.testSslConfigKeystorePwFromClientKeystoreEnvVar" -Ptests.jvms=5 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=403B35E05244A844 -Ptests.file.encoding=UTF-8

  - org.apache.solr.util.configuration.SSLConfigurationsTest.testSslConfigTruststorePwFromBothEnvVars (:solr:core)
    Test output: /Users/risdenk/repos/apache/solr/solr/core/build/test-results/test/outputs/OUTPUT-org.apache.solr.util.configuration.SSLConfigurationsTest.txt
    Reproduce with: gradlew :solr:core:test --tests "org.apache.solr.util.configuration.SSLConfigurationsTest.testSslConfigTruststorePwFromBothEnvVars" -Ptests.jvms=5 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=403B35E05244A844 -Ptests.file.encoding=UTF-8

  - org.apache.solr.util.configuration.SSLConfigurationsTest.testGetClientTrustStorePasswordFromEnv (:solr:core)
    Test output: /Users/risdenk/repos/apache/solr/solr/core/build/test-results/test/outputs/OUTPUT-org.apache.solr.util.configuration.SSLConfigurationsTest.txt
    Reproduce with: gradlew :solr:core:test --tests "org.apache.solr.util.configuration.SSLConfigurationsTest.testGetClientTrustStorePasswordFromEnv" -Ptests.jvms=5 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=403B35E05244A844 -Ptests.file.encoding=UTF-8

  - org.apache.solr.util.configuration.SSLConfigurationsTest.testGetClientTrustStorePasswordFromProperty (:solr:core)
    Test output: /Users/risdenk/repos/apache/solr/solr/core/build/test-results/test/outputs/OUTPUT-org.apache.solr.util.configuration.SSLConfigurationsTest.txt
    Reproduce with: gradlew :solr:core:test --tests "org.apache.solr.util.configuration.SSLConfigurationsTest.testGetClientTrustStorePasswordFromProperty" -Ptests.jvms=5 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=403B35E05244A844 -Ptests.file.encoding=UTF-8

  - org.apache.solr.util.configuration.SSLConfigurationsTest.testGetClientKeyStorePasswordFromEnv (:solr:core)
    Test output: /Users/risdenk/repos/apache/solr/solr/core/build/test-results/test/outputs/OUTPUT-org.apache.solr.util.configuration.SSLConfigurationsTest.txt
    Reproduce with: gradlew :solr:core:test --tests "org.apache.solr.util.configuration.SSLConfigurationsTest.testGetClientKeyStorePasswordFromEnv" -Ptests.jvms=5 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=403B35E05244A844 -Ptests.file.encoding=UTF-8

  - org.apache.solr.util.configuration.SSLConfigurationsTest.testSslConfigKeystorePwFromKeystoreEnvVar (:solr:core)
    Test output: /Users/risdenk/repos/apache/solr/solr/core/build/test-results/test/outputs/OUTPUT-org.apache.solr.util.configuration.SSLConfigurationsTest.txt
    Reproduce with: gradlew :solr:core:test --tests "org.apache.solr.util.configuration.SSLConfigurationsTest.testSslConfigKeystorePwFromKeystoreEnvVar" -Ptests.jvms=5 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=403B35E05244A844 -Ptests.file.encoding=UTF-8

  - org.apache.solr.util.configuration.SSLConfigurationsTest.testSystemPropertyPriorityOverEnvVar (:solr:core)
    Test output: /Users/risdenk/repos/apache/solr/solr/core/build/test-results/test/outputs/OUTPUT-org.apache.solr.util.configuration.SSLConfigurationsTest.txt
    Reproduce with: gradlew :solr:core:test --tests "org.apache.solr.util.configuration.SSLConfigurationsTest.testSystemPropertyPriorityOverEnvVar" -Ptests.jvms=5 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=403B35E05244A844 -Ptests.file.encoding=UTF-8

  - org.apache.solr.util.configuration.SSLConfigurationsTest.testGetKeyStorePasswordFromProperty (:solr:core)
    Test output: /Users/risdenk/repos/apache/solr/solr/core/build/test-results/test/outputs/OUTPUT-org.apache.solr.util.configuration.SSLConfigurationsTest.txt
    Reproduce with: gradlew :solr:core:test --tests "org.apache.solr.util.configuration.SSLConfigurationsTest.testGetKeyStorePasswordFromProperty" -Ptests.jvms=5 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=403B35E05244A844 -Ptests.file.encoding=UTF-8

  - org.apache.solr.util.configuration.SSLConfigurationsTest.testSslConfigTruststorePwFromKeystoreEnvVar (:solr:core)
    Test output: /Users/risdenk/repos/apache/solr/solr/core/build/test-results/test/outputs/OUTPUT-org.apache.solr.util.configuration.SSLConfigurationsTest.txt
    Reproduce with: gradlew :solr:core:test --tests "org.apache.solr.util.configuration.SSLConfigurationsTest.testSslConfigTruststorePwFromKeystoreEnvVar" -Ptests.jvms=5 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=403B35E05244A844 -Ptests.file.encoding=UTF-8

  - org.apache.solr.util.configuration.SSLConfigurationsTest.testSslConfigTruststorePwFromClientKeystoreEnvVar (:solr:core)
    Test output: /Users/risdenk/repos/apache/solr/solr/core/build/test-results/test/outputs/OUTPUT-org.apache.solr.util.configuration.SSLConfigurationsTest.txt
    Reproduce with: gradlew :solr:core:test --tests "org.apache.solr.util.configuration.SSLConfigurationsTest.testSslConfigTruststorePwFromClientKeystoreEnvVar" -Ptests.jvms=5 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=403B35E05244A844 -Ptests.file.encoding=UTF-8


FAILURE: Build completed with 2 failures.

so need to fix these:

   >     java.lang.AssertionError: One of the overrides of setUp does not propagate the call.
   >         at __randomizedtesting.SeedInfo.seed([403B35E05244A844:4673E8D5BA170D50]:0)
   >         at org.junit.Assert.fail(Assert.java:89)

epugh · 2022-10-17T18:22:29Z

I was on the wrong branch, and just was testing out java.lang.AssertionError: One of the overrides of setUp does not propagate the call. these as well...

ModuleUtilsTest ran fine in intelliJ directly ;-). Going to try with your new commits.

risdenk

./gradlew check looks good to me now :)

epugh · 2022-10-17T20:06:58Z

Okay, this time things ran! Thanks for the fixes @risdenk

Co-authored-by: Kevin Risden <krisden@apache.org>

epugh added 2 commits July 17, 2022 20:49

Remove deprecation

2a960ae

Replace junit inherited assertThat with explicit MatcherAssert class

redefine the method to use non deprecated approach

661e88a

cpoerschke reviewed Jul 19, 2022

View reviewed changes

solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.java Outdated Show resolved Hide resolved

epugh added 6 commits July 20, 2022 12:41

Migrate method to the top of the Solr test case class hierarchy...

1cbe68a

spotless

24fa05c

spotless

0aa697b

Address deprecation

ae20ab5

Simplify check and eliminate deprecation

ca14ef2

ExpectedException rule is deprecated in favour of assertThrows()

989fca0

epugh requested review from cpoerschke and uschindler July 20, 2022 20:29

epugh added 8 commits July 20, 2022 17:06

Migrate containsString to non deprecated version.

e4078b3

spotless

338060b

spotless

20295a4

eradicate another deprecate rule

8769e9e

migrate from ExpectedException rule to assertThrows()

dbf00e7

Merge branch 'main' into SOLR-16300-migrate-assert

ef65eaf

rewrite test to use assertThrows

339940d

simplify code path and make errorprone happy

9ab3d0b

Directly use assertThat() inherited from base class

2a1eed6

Fix test

5bf7277

cpoerschke reviewed Aug 24, 2022

View reviewed changes

MatcherAssert.assertThat with forbiddenapis

33d7629

risdenk added 2 commits October 15, 2022 00:07

org.junit.matchers.JUnitMatchers

20813e0

junit.framework

4de8dbd

risdenk requested review from cpoerschke and uschindler October 15, 2022 05:20

risdenk added 2 commits October 15, 2022 17:00

junit.framework part 2

8dbb1b0

Merge branch 'main' into SOLR-16300-migrate-assert

cef88fe

risdenk self-requested a review October 15, 2022 21:08

risdenk approved these changes Oct 15, 2022

View reviewed changes

Merge branch 'main' into SOLR-16300-migrate-assert

8727c6e

epugh commented Oct 17, 2022

View reviewed changes

risdenk added 5 commits October 17, 2022 13:00

Fix super.setUp()

42f1585

Merge branch 'main' into SOLR-16300-migrate-assert

4ca27e5

Fix TestSolrXml assertion

2651e90

Fix hadoop-auth super.setUp()

44717dd

Rename TeamDraftInterleavingTest to TestTeamDraftInterleaving

9f152bc

Merge branch 'main' into SOLR-16300-migrate-assert

b9b5c0d

risdenk approved these changes Oct 17, 2022

View reviewed changes

epugh mentioned this pull request Oct 17, 2022

SOLR-16311: Simplify assert statement #953

Merged

7 tasks

epugh merged commit 8789520 into apache:main Oct 17, 2022

epugh added a commit that referenced this pull request Oct 18, 2022

SOLR-16300: migrate assert to non deprecated version (#947)

c4044f7

Co-authored-by: Kevin Risden <krisden@apache.org>

hossman mentioned this pull request Oct 27, 2023

static method hiding produces false positives when original method is forbidden policeman-tools/forbidden-apis#237

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

SOLR-16300: migrate assert to non deprecated version #947

SOLR-16300: migrate assert to non deprecated version #947

epugh commented Jul 19, 2022

epugh commented Jul 20, 2022 •

edited

Loading

epugh commented Jul 26, 2022

epugh commented Jul 26, 2022

madrob commented Jul 26, 2022

cpoerschke left a comment

epugh commented Aug 24, 2022

uschindler commented Aug 24, 2022

epugh commented Aug 25, 2022

uschindler commented Aug 25, 2022

epugh commented Oct 14, 2022

risdenk commented Oct 15, 2022

epugh commented Oct 15, 2022

risdenk commented Oct 15, 2022

risdenk left a comment

epugh left a comment

risdenk commented Oct 17, 2022

epugh commented Oct 17, 2022 •

edited

Loading

risdenk left a comment

epugh commented Oct 17, 2022

SOLR-16300: migrate assert to non deprecated version #947

SOLR-16300: migrate assert to non deprecated version #947

Conversation

epugh commented Jul 19, 2022

Description

Solution

Tests

epugh commented Jul 20, 2022 • edited Loading

epugh commented Jul 26, 2022

epugh commented Jul 26, 2022

madrob commented Jul 26, 2022

cpoerschke left a comment

Choose a reason for hiding this comment

epugh commented Aug 24, 2022

uschindler commented Aug 24, 2022

epugh commented Aug 25, 2022

uschindler commented Aug 25, 2022

epugh commented Oct 14, 2022

risdenk commented Oct 15, 2022

epugh commented Oct 15, 2022

risdenk commented Oct 15, 2022

risdenk left a comment

Choose a reason for hiding this comment

epugh left a comment

Choose a reason for hiding this comment

risdenk commented Oct 17, 2022

epugh commented Oct 17, 2022 • edited Loading

risdenk left a comment

Choose a reason for hiding this comment

epugh commented Oct 17, 2022

epugh commented Jul 20, 2022 •

edited

Loading

epugh commented Oct 17, 2022 •

edited

Loading