Improve tests

Author: NoemieBenard

java-frontend/src/test/files/springcontext/AutowiredConstructorWithUnannotatedConstructor.java

@@ -18,8 +18,8 @@ class AutowiredConstructorWithUnannotatedConstructor {
   }
 
   // Spring ignores this constructor — its parameters must not appear as dependencies
-  AutowiredConstructorWithUnannotatedConstructor(ApplicationContext applicationContext) {
-    this.applicationContext = applicationContext;
+  AutowiredConstructorWithUnannotatedConstructor(ApplicationContext ignoredContext) {
+    this.applicationContext = ignoredContext;
     this.environment = null;
   }
 }

java-frontend/src/test/java/org/sonar/java/model/springcontext/BeanDefinitionGathererTest.java

@@ -151,6 +151,7 @@ void anonymous_class_is_skipped() {
     // Anonymous class (no simpleName) should be skipped — it would not be registered as a bean
     // SpringBootApplication itself is not a stereotype bean
     assertThat(model.getBeanDefinitionRegistry().getByName("")).isEmpty();
+    assertThat(model.getTypeToBeanNamesIndex().getNamesForType("")).isEmpty();
   }
 
   @Test
@@ -332,7 +333,8 @@ void leaveFile_writes_beans_to_cache() {
       .contains(encodedName)
       .contains("checks.spring.context.SimpleComponent")
       .contains("checks.spring.context")
-      .contains("false");
+      .contains("false")
+      .endsWith("|checks.spring.context.SimpleComponent");
   }
 
   @Test
@@ -360,6 +362,8 @@ void scanWithoutParsing_returns_true_and_restores_beans_on_cache_hit() {
     assertThat(beans).hasSize(1);
     assertThat(beans.get(0).getType()).isEqualTo("checks.spring.context.SimpleComponent");
     assertThat(beans.get(0).isPrimary()).isFalse();
+    assertThat(model.getTypeToBeanNamesIndex().getNamesForType("checks.spring.context.SimpleComponent"))
+      .containsOnly("simpleComponent");
   }
 
   @Test
@@ -515,14 +519,49 @@ void stereotype_bean_is_registered_under_its_own_type(String filePath) {
   }
 
   @Test
-  void bean_is_registered_under_implemented_interface() {
+  void bean_is_registered_under_full_type_hierarchy() {
     scan("src/test/files/springcontext/ComponentImplementingInterface.java");
 
     var index = model.getTypeToBeanNamesIndex();
     assertThat(index.getNamesForType("checks.spring.context.ComponentImplementingInterface"))
       .containsOnly("componentImplementingInterface");
     assertThat(index.getNamesForType("org.springframework.context.ApplicationContextAware"))
       .containsOnly("componentImplementingInterface");
+    assertThat(index.getNamesForType("org.springframework.beans.factory.Aware"))
+      .containsOnly("componentImplementingInterface");
+  }
+
+  @Test
+  void scanWithoutParsing_restores_full_type_hierarchy_from_cache() {
+    InputFile inputFile = TestUtils.inputFile(new File("src/test/files/springcontext/ComponentImplementingInterface.java"));
+    String cacheKey = "java:spring:bean-definitions:" + inputFile.key();
+    String encodedName = Base64.getEncoder().encodeToString("componentImplementingInterface".getBytes(StandardCharsets.UTF_8));
+    String serialized = encodedName + "|checks.spring.context.ComponentImplementingInterface|checks.spring.context|8:6:8:36|false|"
+      + "|checks.spring.context.ComponentImplementingInterface"
+      + ";org.springframework.context.ApplicationContextAware"
+      + ";org.springframework.beans.factory.Aware";
+
+    JavaReadCache readCache = mock(JavaReadCache.class);
+    when(readCache.readBytes(cacheKey)).thenReturn(serialized.getBytes(StandardCharsets.UTF_8));
+    CacheContext cacheContext = mockCacheContext(readCache, mock(JavaWriteCache.class));
+
+    InputFileScannerContext context = mock(InputFileScannerContext.class);
+    when(context.getInputFile()).thenReturn(inputFile);
+    when(context.getCacheContext()).thenReturn(cacheContext);
+
+    assertThat(gatherer.scanWithoutParsing(context)).isTrue();
+
+    ModuleScannerContext moduleScannerContext = mock(ModuleScannerContext.class);
+    when(moduleScannerContext.getModuleKey()).thenReturn("");
+    gatherer.gatherSpringContextData(moduleScannerContext, model);
+
+    var index = model.getTypeToBeanNamesIndex();
+    assertThat(index.getNamesForType("checks.spring.context.ComponentImplementingInterface"))
+      .containsOnly("componentImplementingInterface");
+    assertThat(index.getNamesForType("org.springframework.context.ApplicationContextAware"))
+      .containsOnly("componentImplementingInterface");
+    assertThat(index.getNamesForType("org.springframework.beans.factory.Aware"))
+      .containsOnly("componentImplementingInterface");
   }
 
   @Test
@@ -583,13 +622,6 @@ void index_gatherer_skipped_when_spring_not_in_classpath() {
       .isEmpty();
   }
 
-  @Test
-  void index_anonymous_class_is_skipped() {
-    scan("src/test/files/springcontext/SpringBootAppWithAnonymousClass.java");
-
-    assertThat(model.getTypeToBeanNamesIndex().getNamesForType("")).isEmpty();
-  }
-
   private static String beanClassNameFrom(String filePath) {
     return filePath.substring(filePath.lastIndexOf('/') + 1, filePath.lastIndexOf('.'));
   }