revise test fixing

Author: zhewenfufufu

apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/NamespaceBranchServiceTest.java

@@ -22,6 +22,9 @@
 import com.ctrip.framework.apollo.biz.entity.ReleaseHistory;
 import com.ctrip.framework.apollo.common.constants.NamespaceBranchStatus;
 import com.ctrip.framework.apollo.common.constants.ReleaseOperation;
+import com.ctrip.framework.apollo.common.utils.GrayReleaseRuleItemTransformer;
+import com.ctrip.framework.apollo.common.dto.GrayReleaseRuleItemDTO;
+import java.util.Set;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -64,32 +67,25 @@ public void testUpdateBranchGrayRulesWithUpdateOnce() {
 
     namespaceBranchService.updateBranchGrayRules(testApp, testCluster, testNamespace, testBranchName, rule);
 
-    GrayReleaseRule activeRule = namespaceBranchService.findBranchGrayRules(testApp, testCluster, testNamespace,
-        testBranchName);
+    GrayReleaseRule
+        activeRule =
+        namespaceBranchService.findBranchGrayRules(testApp, testCluster, testNamespace, testBranchName);
 
     Assert.assertNotNull(activeRule);
     Assert.assertEquals(rule.getAppId(), activeRule.getAppId());
     Assert.assertEquals(rule.getRules(), activeRule.getRules());
     Assert.assertEquals(Long.valueOf(0), activeRule.getReleaseId());
 
-    Page<ReleaseHistory> releaseHistories = releaseHistoryService.findReleaseHistoriesByNamespace(testApp, testCluster,
-        testNamespace, pageable);
+    Page<ReleaseHistory> releaseHistories = releaseHistoryService.findReleaseHistoriesByNamespace
+        (testApp, testCluster, testNamespace, pageable);
 
     ReleaseHistory releaseHistory = releaseHistories.getContent().get(0);
 
     Assert.assertEquals(1, releaseHistories.getTotalElements());
     Assert.assertEquals(ReleaseOperation.APPLY_GRAY_RULES, releaseHistory.getOperation());
     Assert.assertEquals(0, releaseHistory.getReleaseId());
     Assert.assertEquals(0, releaseHistory.getPreviousReleaseId());
-    Assert.assertTrue(containRule(releaseHistory.getOperationContext(), rule.getRules()));
-  }
-
-  private boolean containRule(String context, String rule) {
-    String[] rules = rule.substring(2, rule.length() - 2).split(",");
-    for (int i = 0; i < rules.length; i++)
-      if (!context.contains(rules[i]))
-        return false;
-    return true;
+    Assert.assertTrue(containRule(releaseHistory.getOperationContext(),rule.getRules()));
   }
 
   @Test
@@ -101,31 +97,37 @@ public void testUpdateBranchGrayRulesWithUpdateTwice() {
     namespaceBranchService.updateBranchGrayRules(testApp, testCluster, testNamespace, testBranchName, firstRule);
 
     GrayReleaseRule secondRule = instanceGrayReleaseRule();
-    secondRule.setRules(
-        "[{\"clientAppId\":\"branch-test\",\"clientIpList\":[\"10.38.57.112\"],\"clientLabelList\":[\"branch-test\"]}]");
+    secondRule.setRules("[{\"clientAppId\":\"branch-test\",\"clientIpList\":[\"10.38.57.112\"],\"clientLabelList\":[\"branch-test\"]}]");
     namespaceBranchService.updateBranchGrayRules(testApp, testCluster, testNamespace, testBranchName, secondRule);
 
-    GrayReleaseRule activeRule = namespaceBranchService.findBranchGrayRules(testApp, testCluster, testNamespace,
-        testBranchName);
+    GrayReleaseRule
+        activeRule =
+        namespaceBranchService.findBranchGrayRules(testApp, testCluster, testNamespace, testBranchName);
 
     Assert.assertNotNull(secondRule);
     Assert.assertEquals(secondRule.getAppId(), activeRule.getAppId());
     Assert.assertEquals(secondRule.getRules(), activeRule.getRules());
     Assert.assertEquals(Long.valueOf(0), activeRule.getReleaseId());
 
-    Page<ReleaseHistory> releaseHistories = releaseHistoryService.findReleaseHistoriesByNamespace(testApp, testCluster,
-        testNamespace, pageable);
+    Page<ReleaseHistory> releaseHistories = releaseHistoryService.findReleaseHistoriesByNamespace
+        (testApp, testCluster, testNamespace, pageable);
 
     ReleaseHistory firstReleaseHistory = releaseHistories.getContent().get(1);
     ReleaseHistory secondReleaseHistory = releaseHistories.getContent().get(0);
 
     Assert.assertEquals(2, releaseHistories.getTotalElements());
     Assert.assertEquals(ReleaseOperation.APPLY_GRAY_RULES, firstReleaseHistory.getOperation());
     Assert.assertEquals(ReleaseOperation.APPLY_GRAY_RULES, secondReleaseHistory.getOperation());
-    Assert.assertTrue(firstReleaseHistory.getOperationContext().contains(firstRule.getRules()));
-    Assert.assertFalse(firstReleaseHistory.getOperationContext().contains(secondRule.getRules()));
-    Assert.assertTrue(secondReleaseHistory.getOperationContext().contains(firstRule.getRules()));
-    Assert.assertTrue(secondReleaseHistory.getOperationContext().contains(secondRule.getRules()));
+    Assert.assertTrue(containRule(firstReleaseHistory.getOperationContext(),firstRule.getRules()));
+    Assert.assertFalse(containRule(firstReleaseHistory.getOperationContext(),secondRule.getRules()));
+    Assert.assertTrue(containRule(secondReleaseHistory.getOperationContext(),firstRule.getRules()));
+    Assert.assertTrue(containRule(secondReleaseHistory.getOperationContext(),secondRule.getRules()));
+  }
+
+  private boolean containRule(String context, String rule){
+    Set<GrayReleaseRuleItemDTO> contextRules = GrayReleaseRuleItemTransformer.batchTransformFromJSON(context.substring(context.indexOf("["),context.lastIndexOf("]")+1));
+    Set<GrayReleaseRuleItemDTO> rules = GrayReleaseRuleItemTransformer.batchTransformFromJSON(rule);
+    return contextRules.iterator().next().toString().equals(rules.iterator().next().toString());
   }
 
   @Test
@@ -137,8 +139,9 @@ public void testUpdateRulesReleaseIdWithOldRuleNotExist() {
     namespaceBranchService
         .updateRulesReleaseId(testApp, testCluster, testNamespace, testBranchName, latestReleaseId, operator);
 
-    GrayReleaseRule activeRule = namespaceBranchService.findBranchGrayRules(testApp, testCluster, testNamespace,
-        testBranchName);
+    GrayReleaseRule
+        activeRule =
+        namespaceBranchService.findBranchGrayRules(testApp, testCluster, testNamespace, testBranchName);
 
     Assert.assertNull(activeRule);
   }
@@ -156,15 +159,17 @@ public void testUpdateRulesReleaseIdWithOldRuleExist() {
     namespaceBranchService
         .updateRulesReleaseId(testApp, testCluster, testNamespace, testBranchName, latestReleaseId, operator);
 
-    GrayReleaseRule activeRule = namespaceBranchService.findBranchGrayRules(testApp, testCluster, testNamespace,
-        testBranchName);
+    GrayReleaseRule
+        activeRule =
+        namespaceBranchService.findBranchGrayRules(testApp, testCluster, testNamespace, testBranchName);
 
     Assert.assertNotNull(activeRule);
     Assert.assertEquals(Long.valueOf(latestReleaseId), activeRule.getReleaseId());
     Assert.assertEquals(rule.getRules(), activeRule.getRules());
     Assert.assertEquals(NamespaceBranchStatus.ACTIVE, activeRule.getBranchStatus());
   }
 
+
   @Test
   @Sql(scripts = "/sql/namespace-branch-test.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
   @Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
@@ -173,21 +178,19 @@ public void testDeleteBranch() {
     GrayReleaseRule rule = instanceGrayReleaseRule();
     namespaceBranchService.updateBranchGrayRules(testApp, testCluster, testNamespace, testBranchName, rule);
 
-    namespaceBranchService.deleteBranch(testApp, testCluster, testNamespace, testBranchName,
-        NamespaceBranchStatus.DELETED, operator);
+    namespaceBranchService.deleteBranch(testApp, testCluster, testNamespace, testBranchName, NamespaceBranchStatus.DELETED, operator);
 
     Namespace branch = namespaceBranchService.findBranch(testApp, testCluster, testNamespace);
     Assert.assertNull(branch);
 
-    GrayReleaseRule latestRule = namespaceBranchService.findBranchGrayRules(testApp, testCluster, testNamespace,
-        testBranchName);
+    GrayReleaseRule latestRule = namespaceBranchService.findBranchGrayRules(testApp, testCluster, testNamespace, testBranchName);
 
     Assert.assertNotNull(latestRule);
     Assert.assertEquals(NamespaceBranchStatus.DELETED, latestRule.getBranchStatus());
     Assert.assertEquals("[]", latestRule.getRules());
 
-    Page<ReleaseHistory> releaseHistories = releaseHistoryService.findReleaseHistoriesByNamespace(testApp, testCluster,
-        testNamespace, pageable);
+    Page<ReleaseHistory> releaseHistories = releaseHistoryService.findReleaseHistoriesByNamespace
+        (testApp, testCluster, testNamespace, pageable);
 
     ReleaseHistory firstReleaseHistory = releaseHistories.getContent().get(1);
     ReleaseHistory secondReleaseHistory = releaseHistories.getContent().get(0);
@@ -198,6 +201,7 @@ public void testDeleteBranch() {
 
   }
 
+
   private GrayReleaseRule instanceGrayReleaseRule() {
     GrayReleaseRule rule = new GrayReleaseRule();
     rule.setAppId(testApp);
@@ -209,4 +213,5 @@ private GrayReleaseRule instanceGrayReleaseRule() {
     return rule;
   }
 
+
 }