Merge pull request apolloconfig#535 from nobodyiam/fix-ut

lepdou · web-flow · commit 202363b536c7 · 2017-02-07T11:30:50.000+08:00
enlarge sleep interval for ut
diff --git a/apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/controller/NotificationControllerV2Test.java b/apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/controller/NotificationControllerV2Test.java
@@ -330,7 +330,7 @@ public void testPollNotificationWithHandleMessageInBatch() throws Exception {
 
     assertTrue(!anotherDeferredResult.hasResult());
 
-    TimeUnit.MILLISECONDS.sleep(someBatchInterval * 5);
+    TimeUnit.MILLISECONDS.sleep(someBatchInterval * 10);
 
     assertTrue(anotherDeferredResult.hasResult());
   }
diff --git a/apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/service/AppNamespaceServiceWithCacheTest.java b/apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/service/AppNamespaceServiceWithCacheTest.java
@@ -74,6 +74,8 @@ public void testAppNamespace() throws Exception {
     String anotherPrivateNamespace = "anotherPrivateNamespace";
     long anotherPrivateNamespaceId = 3;
 
+    int sleepInterval = scanInterval * 10;
+
     AppNamespace somePrivateAppNamespace = assembleAppNamespace(somePrivateNamespaceId,
         someAppId, somePrivateNamespace, false);
     AppNamespace somePublicAppNamespace = assembleAppNamespace(somePublicNamespaceId,
@@ -116,7 +118,7 @@ public void testAppNamespace() throws Exception {
         somePublicNamespaceId))).thenReturn(Lists.newArrayList(somePrivateAppNamespace,
         somePublicAppNamespace));
 
-    scanIntervalTimeUnit.sleep(scanInterval * 3);
+    scanIntervalTimeUnit.sleep(sleepInterval);
 
     check(Lists.newArrayList(somePrivateAppNamespace), appNamespaceServiceWithCache
         .findByAppIdAndNamespaces(someAppId, someAppIdNamespaces));
@@ -131,7 +133,7 @@ public void testAppNamespace() throws Exception {
             anotherPublicAppNamespace));
     when(appNamespaceRepository.findAll(appNamespaceIds)).thenReturn(allAppNamespaces);
 
-    scanIntervalTimeUnit.sleep(scanInterval * 3);
+    scanIntervalTimeUnit.sleep(sleepInterval);
 
     check(Lists.newArrayList(somePrivateAppNamespace, yetAnotherPrivateAppNamespace,
         anotherPublicAppNamespace), appNamespaceServiceWithCache.findByAppIdAndNamespaces
@@ -169,7 +171,7 @@ public void testAppNamespace() throws Exception {
     when(appNamespaceRepository.findAll(appNamespaceIds)).thenReturn(Lists.newArrayList
         (somePrivateAppNamespaceNew, yetAnotherPrivateAppNamespaceNew, somePublicAppNamespaceNew));
 
-    scanIntervalTimeUnit.sleep(scanInterval * 3);
+    scanIntervalTimeUnit.sleep(sleepInterval);
 
     check(Collections.emptyList(), appNamespaceServiceWithCache
         .findByAppIdAndNamespaces(someAppId, someAppIdNamespaces));
diff --git a/apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/service/ReleaseMessageServiceWithCacheTest.java b/apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/service/ReleaseMessageServiceWithCacheTest.java
@@ -177,7 +177,7 @@ public void testNewReleaseMessagesBeforeHandleMessage() throws Exception {
     when(releaseMessageRepository.findFirst500ByIdGreaterThanOrderByIdAsc(someMessageId)).thenReturn(Lists
         .newArrayList(newMessage));
 
-    scanIntervalTimeUnit.sleep(scanInterval * 3);
+    scanIntervalTimeUnit.sleep(scanInterval * 10);
 
     ReleaseMessage newLatestReleaseMsg =
         releaseMessageServiceWithCache

Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,7 @@ public void testPollNotificationWithHandleMessageInBatch() throws Exception {`
`330`	`330`
`331`	`331`	`assertTrue(!anotherDeferredResult.hasResult());`
`332`	`332`
`333`		`- TimeUnit.MILLISECONDS.sleep(someBatchInterval * 5);`
	`333`	`+ TimeUnit.MILLISECONDS.sleep(someBatchInterval * 10);`
`334`	`334`
`335`	`335`	`assertTrue(anotherDeferredResult.hasResult());`
`336`	`336`	`}`