fix reset order to match core

Author: Quinn-With-Two-Ns

temporal-sdk/src/main/java/io/temporal/internal/activity/HeartbeatContextImpl.java

@@ -226,10 +226,10 @@ private void sendHeartbeatRequest(Object details) {
               metricsScope);
       if (status.getCancelRequested()) {
         lastException = new ActivityCanceledException(info);
-      } else if (status.getActivityPaused()) {
-        lastException = new ActivityPausedException(info);
       } else if (status.getActivityReset()) {
         lastException = new ActivityResetException(info);
+      } else if (status.getActivityPaused()) {
+        lastException = new ActivityPausedException(info);
       } else {
         lastException = null;
       }

temporal-sdk/src/main/java/io/temporal/internal/client/external/ManualActivityCompletionClientImpl.java

@@ -188,10 +188,10 @@ public void recordHeartbeat(@Nullable Object details) throws CanceledFailure {
                 metricsScope);
         if (status.getCancelRequested()) {
           throw new ActivityCanceledException();
-        } else if (status.getActivityPaused()) {
-          throw new ActivityPausedException();
         } else if (status.getActivityReset()) {
           throw new ActivityResetException();
+        } else if (status.getActivityPaused()) {
+          throw new ActivityPausedException();
         }
       } else {
         RecordActivityTaskHeartbeatByIdResponse status =
@@ -205,10 +205,10 @@ public void recordHeartbeat(@Nullable Object details) throws CanceledFailure {
                 metricsScope);
         if (status.getCancelRequested()) {
           throw new ActivityCanceledException();
-        } else if (status.getActivityPaused()) {
-          throw new ActivityPausedException();
         } else if (status.getActivityReset()) {
           throw new ActivityResetException();
+        } else if (status.getActivityPaused()) {
+          throw new ActivityPausedException();
         }
       }
     } catch (Exception e) {

temporal-sdk/src/test/java/io/temporal/activity/ActivityResetTest.java

@@ -18,20 +18,21 @@
 import org.junit.Rule;
 import org.junit.Test;
 
+import static org.junit.Assume.assumeTrue;
+
 public class ActivityResetTest {
 
   @Rule
   public SDKTestWorkflowRule testWorkflowRule =
       SDKTestWorkflowRule.newBuilder()
           .setWorkflowTypes(TestWorkflowImpl.class)
           .setActivityImplementations(new HeartBeatingActivityImpl())
-          .setUseExternalService(true)
           .build();
 
   @Test
   public void activityReset() {
-    //    assumeTrue(
-    //        "Test Server doesn't support activity pause", SDKTestWorkflowRule.useExternalService);
+    assumeTrue(
+        "Test Server doesn't support activity pause", SDKTestWorkflowRule.useExternalService);
 
     TestWorkflows.TestWorkflowReturnString workflow =
         testWorkflowRule.newWorkflowStub(TestWorkflows.TestWorkflowReturnString.class);