Fix uts

AlbumenJ · Jun 28, 2023 · e3b69e6 · e3b69e6
1 parent 28ccb13
commit e3b69e6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/...dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/util/DubboBeanUtils.java b/...dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/util/DubboBeanUtils.java
@@ -181,23 +181,23 @@ static ReferenceAnnotationBeanPostProcessor getReferenceAnnotationBeanPostProces
 
     static DubboSpringInitContext getInitializationContext(BeanFactory beanFactory) {
         String beanName = DubboSpringInitContext.class.getName();
-        if (beanFactory.containsBean(beanName)) {
+        if (beanFactory != null && beanFactory.containsBean(beanName)) {
             return beanFactory.getBean(beanName, DubboSpringInitContext.class);
         }
         return null;
     }
 
     static ApplicationModel getApplicationModel(BeanFactory beanFactory) {
         String beanName = ApplicationModel.class.getName();
-        if (beanFactory.containsBean(beanName)) {
+        if (beanFactory != null && beanFactory.containsBean(beanName)) {
             return beanFactory.getBean(beanName, ApplicationModel.class);
         }
         return null;
     }
 
     static ModuleModel getModuleModel(BeanFactory beanFactory) {
         String beanName = ModuleModel.class.getName();
-        if (beanFactory.containsBean(beanName)) {
+        if (beanFactory != null && beanFactory.containsBean(beanName)) {
             return beanFactory.getBean(beanName, ModuleModel.class);
         }
         return null;

diff --git a/...fig/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ServiceBeanTest.java b/...fig/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ServiceBeanTest.java
@@ -43,7 +43,7 @@ public void tearDown() {
     @Test
     void testGetService() {
         TestService service = mock(TestService.class);
-        ServiceBean serviceBean = new ServiceBean(service);
+        ServiceBean serviceBean = new ServiceBean(null, service);
 
         Service beanService = serviceBean.getService();
         MatcherAssert.assertThat(beanService, not(nullValue()));
@@ -52,4 +52,4 @@ void testGetService() {
     abstract class TestService implements Service {
 
     }
-}
+}
diff --git a/...ring/src/test/java/org/apache/dubbo/config/spring/status/DataSourceStatusCheckerTest.java b/...ring/src/test/java/org/apache/dubbo/config/spring/status/DataSourceStatusCheckerTest.java
@@ -51,7 +51,7 @@ class DataSourceStatusCheckerTest {
     public void setUp() throws Exception {
         initMocks(this);
         this.dataSourceStatusChecker = new DataSourceStatusChecker(applicationContext);
-        new ServiceBean<Object>().setApplicationContext(applicationContext);
+        new ServiceBean<Object>(applicationContext).setApplicationContext(applicationContext);
     }
 
     @AfterEach
@@ -105,4 +105,4 @@ void testWithDatasourceNotHasNextResult() throws SQLException {
 
         assertThat(status.getLevel(), is(Status.Level.ERROR));
     }
-}
+}