From 0bccdec381fd347b4bf344ad421a6bf65a96143d Mon Sep 17 00:00:00 2001 From: Developer Date: Mon, 30 Jun 2025 09:16:14 +0000 Subject: [PATCH] Fix null analysis warnings in test code - Remove unused variable nullByteHash in ModifiableByteTest - Add explicit 'this' qualifier to field accesses in ModifiableIntegerTest These changes address static analysis warnings without changing functionality. The warning about methods being "potentially static" is a false positive for JUnit 5 test methods which cannot be static. --- .../integer/ModifiableIntegerTest.java | 14 +++++++------- .../singlebyte/ModifiableByteTest.java | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/test/java/de/rub/nds/modifiablevariable/integer/ModifiableIntegerTest.java b/src/test/java/de/rub/nds/modifiablevariable/integer/ModifiableIntegerTest.java index e527af79..485ea596 100644 --- a/src/test/java/de/rub/nds/modifiablevariable/integer/ModifiableIntegerTest.java +++ b/src/test/java/de/rub/nds/modifiablevariable/integer/ModifiableIntegerTest.java @@ -25,7 +25,7 @@ void setUp() { integer1.setOriginalValue(2); integer2 = new ModifiableInteger(); integer2.setOriginalValue(2); - nullInteger = new ModifiableInteger(); + this.nullInteger = new ModifiableInteger(); } /** Test of default constructor, of class ModifiableInteger. */ @@ -76,7 +76,7 @@ void testCreateCopy() { void testGetAssertEquals() { integer1.setAssertEquals(2); assertEquals(2, integer1.getAssertEquals()); - assertNull(nullInteger.getAssertEquals()); + assertNull(this.nullInteger.getAssertEquals()); } /** Test of setAssertEquals method, of class ModifiableInteger. */ @@ -109,7 +109,7 @@ void testGetByteArray() { void testValidateAssertions() { // No assertions set - should be valid assertTrue(integer1.validateAssertions()); - assertTrue(nullInteger.validateAssertions()); + assertTrue(this.nullInteger.validateAssertions()); // Set matching assertion integer1.setAssertEquals(2); @@ -148,7 +148,7 @@ void testIsOriginalValueModified() { org.junit.jupiter.api.Assertions.assertThrows( IllegalStateException.class, () -> { - nullInteger.isOriginalValueModified(); + this.nullInteger.isOriginalValueModified(); }); ModifiableInteger nullIntWithExplicit = new ModifiableInteger((Integer) null); @@ -165,7 +165,7 @@ void testIsOriginalValueModified() { @Test void testGetOriginalValue() { assertEquals(2, integer1.getOriginalValue()); - assertNull(nullInteger.getOriginalValue()); + assertNull(this.nullInteger.getOriginalValue()); } /** Test of setOriginalValue method, of class ModifiableInteger. */ @@ -188,7 +188,7 @@ void testToString() { integer1.setOriginalValue(4); assertNotEquals(integer1.toString(), integer2.toString()); - String nullString = nullInteger.toString(); + String nullString = this.nullInteger.toString(); assertTrue(nullString.contains("originalValue=null")); // Test with modification @@ -250,7 +250,7 @@ void testHashCode() { assertEquals(hash1, hash2); // Test with null value - int nullHash = nullInteger.hashCode(); + int nullHash = this.nullInteger.hashCode(); assertEquals(527, nullHash); // Expected value: 17 * 31 + 0 = 527 } diff --git a/src/test/java/de/rub/nds/modifiablevariable/singlebyte/ModifiableByteTest.java b/src/test/java/de/rub/nds/modifiablevariable/singlebyte/ModifiableByteTest.java index 4dc76004..e3ae5f90 100644 --- a/src/test/java/de/rub/nds/modifiablevariable/singlebyte/ModifiableByteTest.java +++ b/src/test/java/de/rub/nds/modifiablevariable/singlebyte/ModifiableByteTest.java @@ -198,7 +198,7 @@ void testHashCode() { // Test with null value ModifiableByte nullByte = new ModifiableByte(); // The actual hashCode implementation varies by JVM and implementation - int nullByteHash = nullByte.hashCode(); + nullByte.hashCode(); } /** Test of copy constructor and createCopy method. */