Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix FPs with multiple initialization of Singletons #2951

Merged
merged 5 commits into from
Apr 27, 2024
Merged

Fix FPs with multiple initialization of Singletons #2951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4a45d0c
Fix Singleton identification eagerness
JuditKnoll Apr 16, 2024
f3badf3
small refactor of detector
JuditKnoll Apr 17, 2024
067d063
make singleton identification more accurate
JuditKnoll Apr 19, 2024
4ec15db
add lazy init check to instance field init
JuditKnoll Apr 22, 2024
e821ff9
modify testcase
JuditKnoll Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ Currently the versioning policy of this project follows [Semantic Versioning v2.

## Unreleased - 2024-??-??
### Fixed
- Fix FP `SING_SINGLETON_GETTER_NOT_SYNCHRONIZED` with eager instances ([#2932]https://github.com/spotbugs/spotbugs/issues/2932)
- Fix FP `SING_SINGLETON_GETTER_NOT_SYNCHRONIZED` with eager instances ([#2932](https://github.com/spotbugs/spotbugs/issues/2932))
- Fix FPs when looking for multiple initialization of Singletons ([#2934](https://github.com/spotbugs/spotbugs/issues/2934))
- Do not report DLS_DEAD_LOCAL_STORE for Java 21's type switches when switch instruction is TABLESWITCH([#2736](https://github.com/spotbugs/spotbugs/issues/2736))
- Fix FP `SE_BAD_FIELD` for record fields ([#2935]https://github.com/spotbugs/spotbugs/issues/2935)

Expand Down
91 changes: 91 additions & 0 deletions ...ests/src/test/java/edu/umd/cs/findbugs/detect/MultipleInstantiationsOfSingletonsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,65 @@
import edu.umd.cs.findbugs.test.matcher.BugInstanceMatcherBuilder;

class MultipleInstantiationsOfSingletonsTest extends AbstractIntegrationTest {
@Test
void abstractClassTest() {
performAnalysis("singletons/AbstractClass.class",
"singletons/AbstractClass$Nested.class");
assertNoBugs();
}

@Test
void innerChildInstanceTest() {
performAnalysis("singletons/InnerChildInstance.class",
"singletons/InnerChildInstance$Unknown.class",
"singletons/InnerChildInstance$1.class");
assertNoBugs();
}

@Test
void innerChildAndMoreInstanceTest() {
performAnalysis("singletons/InnerChildAndMoreInstance.class",
"singletons/InnerChildAndMoreInstance$1.class",
"singletons/InnerChildAndMoreInstance$Unknown.class");
assertNumOfSINGBugs("SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR", 1);
assertSINGBug("SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR", "InnerChildAndMoreInstance");

assertNumOfSINGBugs("SING_SINGLETON_IMPLEMENTS_CLONEABLE", 0);
assertNumOfSINGBugs("SING_SINGLETON_INDIRECTLY_IMPLEMENTS_CLONEABLE", 0);
assertNumOfSINGBugs("SING_SINGLETON_IMPLEMENTS_CLONE_METHOD", 0);
assertNumOfSINGBugs("SING_SINGLETON_IMPLEMENTS_SERIALIZABLE", 0);
assertNumOfSINGBugs("SING_SINGLETON_GETTER_NOT_SYNCHRONIZED", 0);
}

@Test
void InnerChildAndMoreInstanceReorderedTest() {
performAnalysis("singletons/InnerChildAndMoreInstanceReordered.class",
"singletons/InnerChildAndMoreInstanceReordered$1.class",
"singletons/InnerChildAndMoreInstanceReordered$Unknown.class");
assertNumOfSINGBugs("SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR", 1);
assertSINGBug("SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR", "InnerChildAndMoreInstanceReordered");

assertNumOfSINGBugs("SING_SINGLETON_IMPLEMENTS_CLONEABLE", 0);
assertNumOfSINGBugs("SING_SINGLETON_INDIRECTLY_IMPLEMENTS_CLONEABLE", 0);
assertNumOfSINGBugs("SING_SINGLETON_IMPLEMENTS_CLONE_METHOD", 0);
assertNumOfSINGBugs("SING_SINGLETON_IMPLEMENTS_SERIALIZABLE", 0);
assertNumOfSINGBugs("SING_SINGLETON_GETTER_NOT_SYNCHRONIZED", 0);
}

@Test
void InnerChildAndMoreInstanceNoGetterTest() {
performAnalysis("singletons/InnerChildAndMoreInstanceNoGetter.class",
"singletons/InnerChildAndMoreInstanceNoGetter$1.class",
"singletons/InnerChildAndMoreInstanceNoGetter$Unknown.class");
assertNoBugs();
}

@Test
void notSingletonWithFactoryMethodTest() {
performAnalysis("singletons/NotSingletonWithFactoryMethod.class");
assertNoBugs();
}

@Test
void notLazyInitSingletonTest() {
performAnalysis("singletons/NotLazyInitSingleton.class");
Expand Down Expand Up @@ -69,6 +128,32 @@ void protectedConstructorTest() {
assertNumOfSINGBugs("SING_SINGLETON_GETTER_NOT_SYNCHRONIZED", 0);
}

@Test
void protectedConstructorStaticInitTest() {
performAnalysis("singletons/ProtectedConstructorStaticInit.class");
assertNumOfSINGBugs("SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR", 1);
assertSINGBug("SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR", "ProtectedConstructorStaticInit");

assertNumOfSINGBugs("SING_SINGLETON_IMPLEMENTS_CLONEABLE", 0);
assertNumOfSINGBugs("SING_SINGLETON_INDIRECTLY_IMPLEMENTS_CLONEABLE", 0);
assertNumOfSINGBugs("SING_SINGLETON_IMPLEMENTS_CLONE_METHOD", 0);
assertNumOfSINGBugs("SING_SINGLETON_IMPLEMENTS_SERIALIZABLE", 0);
assertNumOfSINGBugs("SING_SINGLETON_GETTER_NOT_SYNCHRONIZED", 0);
}

@Test
void protectedConstructorStaticInitReorderedTest() {
performAnalysis("singletons/ProtectedConstructorStaticInitReordered.class");
assertNumOfSINGBugs("SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR", 1);
assertSINGBug("SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR", "ProtectedConstructorStaticInitReordered");

assertNumOfSINGBugs("SING_SINGLETON_IMPLEMENTS_CLONEABLE", 0);
assertNumOfSINGBugs("SING_SINGLETON_INDIRECTLY_IMPLEMENTS_CLONEABLE", 0);
assertNumOfSINGBugs("SING_SINGLETON_IMPLEMENTS_CLONE_METHOD", 0);
assertNumOfSINGBugs("SING_SINGLETON_IMPLEMENTS_SERIALIZABLE", 0);
assertNumOfSINGBugs("SING_SINGLETON_GETTER_NOT_SYNCHRONIZED", 0);
}

@Test
void notCloneableButHasCloneMethodTest() {
performAnalysis("singletons/NotCloneableButHasCloneMethod.class");
Expand Down Expand Up @@ -142,6 +227,12 @@ void enumSingletonTest() {
assertNoBugs();
}

@Test
void oneEnumSingletonTest() {
performAnalysis("singletons/OneEnumSingleton.class");
assertNoBugs();
}

@Test
void unconditionalThrowerCloneableTest() {
performAnalysis("singletons/UnconditionalThrowerCloneable.class");
Expand Down
Loading
Loading