-
Notifications
You must be signed in to change notification settings - Fork 578
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into Issue1771
- Loading branch information
Showing
13 changed files
with
139 additions
and
78 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
spotbugs-tests/src/test/java/edu/umd/cs/findbugs/ba/Issue1338Test.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| package edu.umd.cs.findbugs.ba; | ||
|
|
||
| import static edu.umd.cs.findbugs.test.CountMatcher.containsExactly; | ||
| import static org.junit.Assert.assertThat; | ||
|
|
||
| import org.junit.Test; | ||
|
|
||
| import edu.umd.cs.findbugs.AbstractIntegrationTest; | ||
| import edu.umd.cs.findbugs.test.matcher.BugInstanceMatcher; | ||
| import edu.umd.cs.findbugs.test.matcher.BugInstanceMatcherBuilder; | ||
|
|
||
| /** | ||
| * @see <a href="https://github.com/spotbugs/spotbugs/issues/1338">GitHub issue</a> | ||
| */ | ||
| public class Issue1338Test extends AbstractIntegrationTest { | ||
|
|
||
| private static final String[] CLASS_LIST = { "../java11/module-info.class", "../java11/Issue1338.class", }; | ||
|
|
||
| /** | ||
| * Test that calling a method call when initializing a try-with-resource variable doesn't result in redundant nullcheck of nonnull value. | ||
| */ | ||
| @Test | ||
| public void testMethodCallInTryWithResource() { | ||
| performAnalysis(CLASS_LIST); | ||
| BugInstanceMatcher bugTypeMatcher = new BugInstanceMatcherBuilder().bugType("RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE") | ||
| .build(); | ||
| assertThat(getBugCollection(), containsExactly(0, bugTypeMatcher)); | ||
| } | ||
| } |
19 changes: 19 additions & 0 deletions
19
spotbugs-tests/src/test/java/edu/umd/cs/findbugs/ba/Issue2145Test.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| package edu.umd.cs.findbugs.ba; | ||
|
|
||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
| import static org.hamcrest.Matchers.hasSize; | ||
|
|
||
| import edu.umd.cs.findbugs.AbstractIntegrationTest; | ||
| import edu.umd.cs.findbugs.SortedBugCollection; | ||
| import org.junit.Test; | ||
|
|
||
| public class Issue2145Test extends AbstractIntegrationTest { | ||
|
|
||
| @Test | ||
| public void test() { | ||
| performAnalysis("ghIssues/Issue2145.class"); | ||
| SortedBugCollection bugCollection = (SortedBugCollection) getBugCollection(); | ||
| assertThat(bugCollection.getErrors(), hasSize(0)); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| package ghIssues | ||
|
|
||
| class Issue2145 { | ||
| final double field1 | ||
| Issue2145(double field1) { | ||
| this.field1 = field1 | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| import java.io.InputStream; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.security.KeyStore; | ||
|
|
||
| /** | ||
| * Class to check the issue 1338. | ||
| */ | ||
| public class Issue1338 { | ||
| public static KeyStore loadKeyStore(final Path path) throws Exception { | ||
| try (InputStream inputStream = Files.newInputStream(path)) { | ||
| // final KeyStore keyStore = KeyStore.getInstance("JKS"); | ||
| // keyStore.load(inputStream, password.toCharArray()); | ||
| // return keyStore; | ||
| return KeyStore.getInstance("JKS"); | ||
| } | ||
| } | ||
| } |