Adding JUnit. Fixes #3874

apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/utils/ConfigChangeContentBuilderTest.java

@@ -17,13 +17,15 @@
 package com.ctrip.framework.apollo.biz.utils;
 
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.ctrip.framework.apollo.biz.MockBeanFactory;
-import com.ctrip.framework.apollo.biz.entity.Item;
 import org.junit.Before;
 import org.junit.Test;
 
+import com.ctrip.framework.apollo.biz.MockBeanFactory;
+import com.ctrip.framework.apollo.biz.entity.Item;
+
 /**
  * @author jian.tan
  */
@@ -32,23 +34,43 @@ public class ConfigChangeContentBuilderTest {
 
   private final ConfigChangeContentBuilder configChangeContentBuilder = new ConfigChangeContentBuilder();
   private String configString;
-
+  private Item createdItem;
+  private Item updatedItem;
+  private Item updatedItemFalseCheck;
+  private Item createdItemFalseCheck;
   @Before
   public void initConfig() {
 
-    Item createdItem = MockBeanFactory.mockItem(1, 1, "timeout", "100", 1);
-    Item updatedItem = MockBeanFactory.mockItem(1, 1, "timeout", "1001", 1);
+     createdItem = MockBeanFactory.mockItem(1, 1, "timeout", "100", 1);
+     updatedItem = MockBeanFactory.mockItem(1, 1, "timeout", "1001", 1);
+     updatedItemFalseCheck = MockBeanFactory.mockItem(1, 1, "timeout", "100", 1);
+     createdItemFalseCheck = MockBeanFactory.mockItem(1, 1, "", "100", 1);
 
     configChangeContentBuilder.createItem(createdItem);
+    configChangeContentBuilder.createItem(createdItemFalseCheck);
     configChangeContentBuilder.updateItem(createdItem, updatedItem);
+    configChangeContentBuilder.updateItem(createdItem, updatedItemFalseCheck);
     configChangeContentBuilder.deleteItem(updatedItem);
+    configChangeContentBuilder.deleteItem(createdItemFalseCheck);
 
     configString = configChangeContentBuilder.build();
   }
-
+  
   @Test
   public void testHasContent() {
-    assertTrue(configChangeContentBuilder.hasContent());
+	  assertTrue(configChangeContentBuilder.hasContent());
+	  configChangeContentBuilder.getCreateItems().clear();
+	  assertTrue(configChangeContentBuilder.hasContent());
+	  configChangeContentBuilder.getUpdateItems().clear();
+	  assertTrue(configChangeContentBuilder.hasContent());
+  }
+
+  @Test
+  public void testHasContentFalseCheck() {
+	  configChangeContentBuilder.getCreateItems().clear();
+	  configChangeContentBuilder.getUpdateItems().clear();
+	  configChangeContentBuilder.getDeleteItems().clear();
+	  assertFalse(configChangeContentBuilder.hasContent());
   }
 
   @Test

apollo-client/src/test/java/com/ctrip/framework/apollo/spring/util/BeanRegistrationUtilTest.java

@@ -0,0 +1,63 @@
+package com.ctrip.framework.apollo.spring.util;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.beans.factory.support.SimpleBeanDefinitionRegistry;
+
+/**
+ * @author Ayush Jha 
+ */
+
+@RunWith(MockitoJUnitRunner.class)
+public class BeanRegistrationUtilTest {
+
+	@InjectMocks
+	private BeanRegistrationUtil beanRegistrationUtil;
+	private BeanDefinitionRegistry someRegistry;
+	String someBeanName = "someBean";
+
+	@Before
+	public void setUp() {
+		someRegistry = new SimpleBeanDefinitionRegistry();
+	}
+
+	@Test
+	public void registerBeanDefinitionIfNotExistsTest() {
+		someRegistry.registerBeanDefinition(someBeanName, Mockito.mock(BeanDefinition.class));
+		assertFalse(
+				BeanRegistrationUtil.registerBeanDefinitionIfNotExists(someRegistry, someBeanName, getClass(), null));
+		assertFalse(BeanRegistrationUtil.registerBeanDefinitionIfNotExists(someRegistry, someBeanName, getClass()));
+
+	}
+
+	@Test
+	public void registerBeanDefinitionIfNotExistsBeanNotPresentTest() {
+		someRegistry.registerBeanDefinition("someAnotherBean", Mockito.mock(BeanDefinition.class));
+		assertTrue(
+				BeanRegistrationUtil.registerBeanDefinitionIfNotExists(someRegistry, someBeanName, getClass(), null));
+
+	}
+
+	@Test
+	public void registerBeanDefinitionIfNotExistsWithExtPropTest() {
+		someRegistry.registerBeanDefinition("someAnotherBean", Mockito.mock(BeanDefinition.class));
+		Map<String, Object> extraPropertyValues = new ConcurrentHashMap<>();
+		extraPropertyValues.put(someBeanName, "someProperty");
+		assertTrue(BeanRegistrationUtil.registerBeanDefinitionIfNotExists(someRegistry, someBeanName, getClass(),
+				extraPropertyValues));
+
+	}
+
+}