Fix bug - authorization string should be prefixed with 'Basic '

Fix bug - audience tests - for composition audience even if target size is 0, the response is still OK.

Author: Javen

src/cn/jpush/api/common/ServiceHelper.java

@@ -9,6 +9,7 @@
 public class ServiceHelper {
 
     private final static Pattern PUSH_PATTERNS = Pattern.compile("[^a-zA-Z0-9]");
+    private final static String BASIC_PREFIX = "Basic";
 
     private static final Random RANDOM = new Random(System.currentTimeMillis());
     private static final int MIN = 100000;
@@ -20,7 +21,7 @@ public static int generateSendno() {
 
     public static String getAuthorizationBase64(String appKey, String masterSecret) {
         String encodeKey = appKey + ":" + masterSecret;
-        return String.valueOf(Base64.encode(encodeKey.getBytes())); 
+        return BASIC_PREFIX + " " + String.valueOf(Base64.encode(encodeKey.getBytes())); 
     }
 
     public static void checkBasic(String appKey, String masterSecret) {

test/cn/jpush/api/push/remote/AudienceTests.java

@@ -172,62 +172,60 @@ public void sendByTagRegistrationID() {
         assertEquals(SUCCEED_RESULT_CODE, result.getErrorCode());
     }
 
-    // composite fail ------------------------
-    
     @Test
-    public void sendByTagAlias_fail() {
+    public void sendByTagRegistrationID_0() {
         PushPayload payload = PushPayload.newBuilder()
                 .setPlatform(Platform.all())
                 .setAudience(Audience.newBuilder()
                         .addAudienceTarget(AudienceTarget.newBuilder()
-                            .setAudienceType(AudienceType.ALIAS)
-                            .addAudienceTargetValue(ALIAS1).build())
+                            .setAudienceType(AudienceType.REGISTRATION_ID)
+                            .addAudienceTargetValue(REGISTRATION_ID1).build())
                        .addAudienceTarget(AudienceTarget.newBuilder()
                                .setAudienceType(AudienceType.TAG)
-                               .addAudienceTargetValue(TAG2).build())
+                               .addAudienceTargetValue(TAG_NO).build())
                        .build())
                 .setNotification(Notification.alert(ALERT))
                 .build();
         PushResult result = _client.sendPush(payload);
-        assertEquals(NO_TARGET, result.getErrorCode());
+        assertEquals(SUCCEED_RESULT_CODE, result.getErrorCode());
     }
-
+        
     @Test
-    public void sendByTagAlias_fail2() {
+    public void sendByTagAlias_0() {
         PushPayload payload = PushPayload.newBuilder()
                 .setPlatform(Platform.all())
                 .setAudience(Audience.newBuilder()
                         .addAudienceTarget(AudienceTarget.newBuilder()
                             .setAudienceType(AudienceType.ALIAS)
-                            .addAudienceTargetValue(ALIAS_NO).build())
+                            .addAudienceTargetValue(ALIAS1).build())
                        .addAudienceTarget(AudienceTarget.newBuilder()
                                .setAudienceType(AudienceType.TAG)
-                               .addAudienceTargetValue(TAG_ALL).build())
+                               .addAudienceTargetValue(TAG2).build())
                        .build())
                 .setNotification(Notification.alert(ALERT))
                 .build();
         PushResult result = _client.sendPush(payload);
-        assertEquals(NO_TARGET, result.getErrorCode());
+        assertEquals(SUCCEED_RESULT_CODE, result.getErrorCode());
     }
-    
+
     @Test
-    public void sendByTagRegistrationID_fail() {
+    public void sendByTagAlias_0_2() {
         PushPayload payload = PushPayload.newBuilder()
                 .setPlatform(Platform.all())
                 .setAudience(Audience.newBuilder()
                         .addAudienceTarget(AudienceTarget.newBuilder()
-                            .setAudienceType(AudienceType.REGISTRATION_ID)
-                            .addAudienceTargetValue(REGISTRATION_ID1).build())
+                            .setAudienceType(AudienceType.ALIAS)
+                            .addAudienceTargetValue(ALIAS_NO).build())
                        .addAudienceTarget(AudienceTarget.newBuilder()
                                .setAudienceType(AudienceType.TAG)
-                               .addAudienceTargetValue(TAG_NO).build())
+                               .addAudienceTargetValue(TAG_ALL).build())
                        .build())
                 .setNotification(Notification.alert(ALERT))
                 .build();
         PushResult result = _client.sendPush(payload);
-        assertEquals(NO_TARGET, result.getErrorCode());
+        assertEquals(SUCCEED_RESULT_CODE, result.getErrorCode());
     }
-
+    
 
 }