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 issue-1950-truncate-reports
- Loading branch information
Showing
43 changed files
with
1,344 additions
and
520 deletions.
There are no files selected for viewing
Binary file not shown.
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
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
106 changes: 0 additions & 106 deletions
106
...bugs-tests/src/test/java/edu/umd/cs/findbugs/ba/jsr305/ValidationSecurityManagerTest.java
This file was deleted.
Oops, something went wrong.
36 changes: 36 additions & 0 deletions
36
spotbugs-tests/src/test/java/edu/umd/cs/findbugs/classfile/impl/ClassPathBuilderTest.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,36 @@ | ||
| package edu.umd.cs.findbugs.classfile.impl; | ||
|
|
||
| import edu.umd.cs.findbugs.AppVersion; | ||
| import edu.umd.cs.findbugs.BugCollection; | ||
| import edu.umd.cs.findbugs.test.SpotBugsRule; | ||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
|
|
||
| import java.nio.file.Paths; | ||
|
|
||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
| import static org.hamcrest.Matchers.equalTo; | ||
|
|
||
| public class ClassPathBuilderTest { | ||
|
|
||
| @Rule | ||
| public SpotBugsRule analyzer = new SpotBugsRule(); | ||
|
|
||
| @Test | ||
| public void nestedTraversalDisabled() { | ||
| BugCollection results = analyzer.performAnalysis((engine) -> { | ||
| engine.setScanNestedArchives(false); | ||
| engine.setNoClassOk(true); | ||
| }, Paths.get("../spotbugsTestCases/archives/nestedArchive.jar")); | ||
| AppVersion appInformation = results.getCurrentAppVersion(); | ||
| assertThat(appInformation.getNumClasses(), equalTo(0)); | ||
| } | ||
|
|
||
| @Test | ||
| public void nestedTraversalEnabled() { | ||
| BugCollection results = analyzer.performAnalysis((engine) -> engine.setScanNestedArchives(true), | ||
| Paths.get("../spotbugsTestCases/archives/nestedArchive.jar")); | ||
| AppVersion appInformation = results.getCurrentAppVersion(); | ||
| assertThat(appInformation.getNumClasses(), equalTo(5)); | ||
| } | ||
| } |
49 changes: 49 additions & 0 deletions
49
spotbugs-tests/src/test/java/edu/umd/cs/findbugs/detect/CheckThrowingExceptions.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,49 @@ | ||
| package edu.umd.cs.findbugs.detect; | ||
|
|
||
| import static edu.umd.cs.findbugs.test.CountMatcher.containsExactly; | ||
| import static org.hamcrest.Matchers.hasItem; | ||
| import static org.hamcrest.MatcherAssert.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; | ||
|
|
||
| public class CheckThrowingExceptions extends AbstractIntegrationTest { | ||
| @Test | ||
| public void throwingExceptionsTests() { | ||
| performAnalysis("MethodsThrowingExceptions.class"); | ||
|
|
||
| assertNumOfTHROWSBugs("THROWS_METHOD_THROWS_RUNTIMEEXCEPTION", 1); | ||
| assertNumOfTHROWSBugs("THROWS_METHOD_THROWS_CLAUSE_BASIC_EXCEPTION", 1); | ||
| assertNumOfTHROWSBugs("THROWS_METHOD_THROWS_CLAUSE_THROWABLE", 1); | ||
|
|
||
| assertNumOfTHROWSBugs("THROWS_METHOD_THROWS_RUNTIMEEXCEPTION", 1, "MethodsThrowingExceptions", "isCapitalizedThrowingRuntimeException"); | ||
| assertNumOfTHROWSBugs("THROWS_METHOD_THROWS_RUNTIMEEXCEPTION", 0, "MethodsThrowingExceptions", "isCapitalizedThrowingSpecializedException"); | ||
|
|
||
| assertNumOfTHROWSBugs("THROWS_METHOD_THROWS_CLAUSE_BASIC_EXCEPTION", 1, "MethodsThrowingExceptions", "methodThrowingBasicException"); | ||
| assertNumOfTHROWSBugs("THROWS_METHOD_THROWS_CLAUSE_BASIC_EXCEPTION", 0, "MethodsThrowingExceptions", "methodThrowingIOException"); | ||
|
|
||
| assertNumOfTHROWSBugs("THROWS_METHOD_THROWS_CLAUSE_THROWABLE", 1, "MethodsThrowingExceptions", "methodThrowingThrowable"); | ||
| } | ||
|
|
||
| private void assertNumOfTHROWSBugs(String bugType, int num) { | ||
| final BugInstanceMatcher bugTypeMatcher = new BugInstanceMatcherBuilder() | ||
| .bugType(bugType) | ||
| .build(); | ||
| assertThat(getBugCollection(), containsExactly(num, bugTypeMatcher)); | ||
| } | ||
|
|
||
| private void assertNumOfTHROWSBugs(String bugType, int num, String className, String method) { | ||
| final BugInstanceMatcher bugTypeMatcher = new BugInstanceMatcherBuilder() | ||
| .bugType(bugType) | ||
| .inClass(className) | ||
| .inMethod(method) | ||
| .build(); | ||
| if (num > 0) { | ||
| assertThat(getBugCollection(), hasItem(bugTypeMatcher)); | ||
| } | ||
| assertThat(getBugCollection(), containsExactly(num, bugTypeMatcher)); | ||
| } | ||
| } |
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
42 changes: 42 additions & 0 deletions
42
...java/edu/umd/cs/findbugs/detect/FindPotentialSecurityCheckBasedOnUntrustedSourceTest.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,42 @@ | ||
| package edu.umd.cs.findbugs.detect; | ||
|
|
||
| import static edu.umd.cs.findbugs.test.CountMatcher.containsExactly; | ||
| import static org.hamcrest.Matchers.hasItem; | ||
| import static org.hamcrest.MatcherAssert.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; | ||
|
|
||
| public class FindPotentialSecurityCheckBasedOnUntrustedSourceTest extends AbstractIntegrationTest { | ||
|
|
||
| @Test | ||
| public void test() throws Exception { | ||
| performAnalysis("PotentialSecurityCheckBasedOnUntrustedSource.class", | ||
| "PotentialSecurityCheckBasedOnUntrustedSource$1.class", | ||
| "PotentialSecurityCheckBasedOnUntrustedSource$2.class"); | ||
|
|
||
| assertNumOfUSCBugs(2); | ||
| assertUSCBug("badOpenFile", 11); | ||
| assertUSCBug("badOpenFileLambda", 40); | ||
| } | ||
|
|
||
| private void assertNumOfUSCBugs(int num) throws Exception { | ||
| final BugInstanceMatcher bugTypeMatcher = new BugInstanceMatcherBuilder() | ||
| .bugType("USC_POTENTIAL_SECURITY_CHECK_BASED_ON_UNTRUSTED_SOURCE").build(); | ||
| assertThat(getBugCollection(), containsExactly(num, bugTypeMatcher)); | ||
| } | ||
|
|
||
| private void assertUSCBug(String methodName, int line) throws Exception { | ||
| final BugInstanceMatcher bugInstanceMatcher = new BugInstanceMatcherBuilder() | ||
| .bugType("USC_POTENTIAL_SECURITY_CHECK_BASED_ON_UNTRUSTED_SOURCE") | ||
| .inClass("PotentialSecurityCheckBasedOnUntrustedSource") | ||
| .inMethod(methodName) | ||
| .atLine(line) | ||
| .build(); | ||
|
|
||
| assertThat(getBugCollection(), hasItem(bugInstanceMatcher)); | ||
| } | ||
| } |
17 changes: 17 additions & 0 deletions
17
spotbugs-tests/src/test/java/edu/umd/cs/findbugs/detect/Issue2019Test.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,17 @@ | ||
| package edu.umd.cs.findbugs.detect; | ||
|
|
||
| import edu.umd.cs.findbugs.AbstractIntegrationTest; | ||
| import org.junit.Test; | ||
|
|
||
|
|
||
| public class Issue2019Test extends AbstractIntegrationTest { | ||
| @Test | ||
| public void test() { | ||
| performAnalysis("ghIssues/Issue2019$ATNSimulator.class", | ||
| "ghIssues/Issue2019$BaseParser.class", | ||
| "ghIssues/Issue2019$Parser.class", | ||
| "ghIssues/Issue2019$ParserATNSimulator.class", | ||
| "ghIssues/Issue2019$Recognizer.class", | ||
| "ghIssues/Issue2019.class"); | ||
| } | ||
| } |
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
Oops, something went wrong.