[Core] Remove dead mocks

BUILD.bazel

@@ -919,6 +919,7 @@ ray_cc_test(
     tags = ["team:core"],
     deps = [
         ":core_worker_lib",
+        ":ray_mock",
         "@com_google_googletest//:gtest_main",
     ],
 )
@@ -930,6 +931,7 @@ ray_cc_test(
     tags = ["team:core"],
     deps = [
         ":core_worker_lib",
+        ":ray_mock",
         "@com_google_googletest//:gtest_main",
     ],
 )

src/mock/ray/core_worker/actor_creator.h

@@ -41,27 +41,3 @@ class MockActorCreatorInterface : public ActorCreatorInterface {
 
 }  // namespace core
 }  // namespace ray
-
-namespace ray {
-namespace core {
-
-class MockDefaultActorCreator : public DefaultActorCreator {
- public:
-  MOCK_METHOD(Status,
-              RegisterActor,
-              (const TaskSpecification &task_spec),
-              (const, override));
-  MOCK_METHOD(Status,
-              AsyncRegisterActor,
-              (const TaskSpecification &task_spec, gcs::StatusCallback callback),
-              (override));
-  MOCK_METHOD(bool, IsActorInRegistering, (const ActorID &actor_id), (const, override));
-  MOCK_METHOD(Status,
-              AsyncCreateActor,
-              (const TaskSpecification &task_spec,
-               const rpc::ClientCallback<rpc::CreateActorReply> &callback),
-              (override));
-};
-
-}  // namespace core
-}  // namespace ray

src/mock/ray/core_worker/lease_policy.h

@@ -15,30 +15,6 @@
 namespace ray {
 namespace core {
 
-class MockLocalityData : public LocalityData {
- public:
-};
-
-}  // namespace core
-}  // namespace ray
-
-namespace ray {
-namespace core {
-
-class MockLocalityDataProviderInterface : public LocalityDataProviderInterface {
- public:
-  MOCK_METHOD(absl::optional<LocalityData>,
-              GetLocalityData,
-              (const ObjectID &object_id),
-              (const, override));
-};
-
-}  // namespace core
-}  // namespace ray
-
-namespace ray {
-namespace core {
-
 class MockLeasePolicyInterface : public LeasePolicyInterface {
  public:
   MOCK_METHOD((std::pair<rpc::Address, bool>),
@@ -49,23 +25,3 @@ class MockLeasePolicyInterface : public LeasePolicyInterface {
 
 }  // namespace core
 }  // namespace ray
-
-namespace ray {
-namespace core {
-
-class MockLocalityAwareLeasePolicy : public LocalityAwareLeasePolicy {
- public:
-};
-
-}  // namespace core
-}  // namespace ray
-
-namespace ray {
-namespace core {
-
-class MockLocalLeasePolicy : public LocalLeasePolicy {
- public:
-};
-
-}  // namespace core
-}  // namespace ray

src/mock/ray/core_worker/task_manager.h

@@ -65,17 +65,3 @@ class MockTaskFinisherInterface : public TaskFinisherInterface {
 
 }  // namespace core
 }  // namespace ray
-
-namespace ray {
-namespace core {
-
-class MockTaskResubmissionInterface : public TaskResubmissionInterface {
- public:
-  MOCK_METHOD(bool,
-              ResubmitTask,
-              (const TaskID &task_id, std::vector<ObjectID> *task_deps),
-              (override));
-};
-
-}  // namespace core
-}  // namespace ray

src/mock/ray/pubsub/publisher.h

@@ -12,69 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace ray {
-namespace pubsub {
-namespace pub_internal {
-
-class MockSubscriptionIndex : public SubscriptionIndex {
- public:
-};
-
-}  // namespace pub_internal
-}  // namespace pubsub
-}  // namespace ray
-
-namespace ray {
-namespace pubsub {
-namespace pub_internal {
-
-class MockLongPollConnection : public LongPollConnection {
- public:
-};
-
-}  // namespace pub_internal
-}  // namespace pubsub
-}  // namespace ray
-
-namespace ray {
-namespace pubsub {
-namespace pub_internal {
-
-class MockSubscriberState : public SubscriberState {
- public:
-};
-
-}  // namespace pub_internal
-}  // namespace pubsub
-}  // namespace ray
-
-namespace ray {
-namespace pubsub {
-
-class MockPublisherInterface : public PublisherInterface {
- public:
-  MOCK_METHOD(bool,
-              RegisterSubscription,
-              (const rpc::ChannelType channel_type,
-               const SubscriberID &subscriber_id,
-               const std::optional<std::string> &key_id),
-              (override));
-  MOCK_METHOD(void, Publish, (rpc::PubMessage pub_message), (override));
-  MOCK_METHOD(void,
-              PublishFailure,
-              (const rpc::ChannelType channel_type, const std::string &key_id),
-              (override));
-  MOCK_METHOD(bool,
-              UnregisterSubscription,
-              (const rpc::ChannelType channel_type,
-               const SubscriberID &subscriber_id,
-               const std::optional<std::string> &key_id),
-              (override));
-};
-
-}  // namespace pubsub
-}  // namespace ray
-
 namespace ray {
 namespace pubsub {
 
@@ -97,8 +34,6 @@ class MockPublisher : public Publisher {
                const SubscriberID &subscriber_id,
                const std::optional<std::string> &key_id),
               (override));
-
- private:
 };
 
 }  // namespace pubsub

src/mock/ray/pubsub/subscriber.h

@@ -15,59 +15,64 @@
 namespace ray {
 namespace pubsub {
 
-class MockSubscriberInterface : public SubscriberInterface {
+class MockSubscriberClientInterface : public SubscriberClientInterface {
+ public:
+  MOCK_METHOD(void,
+              PubsubLongPolling,
+              (const rpc::PubsubLongPollingRequest &request,
+               const rpc::ClientCallback<rpc::PubsubLongPollingReply> &callback),
+              (override));
+  MOCK_METHOD(void,
+              PubsubCommandBatch,
+              (const rpc::PubsubCommandBatchRequest &request,
+               const rpc::ClientCallback<rpc::PubsubCommandBatchReply> &callback),
+              (override));
+};
+
+class MockSubscriber : public SubscriberInterface {
  public:
   MOCK_METHOD(bool,
               Subscribe,
               (std::unique_ptr<rpc::SubMessage> sub_message,
                const rpc::ChannelType channel_type,
-               const rpc::Address &publisher_address,
+               const rpc::Address &owner_address,
                const std::string &key_id,
-               SubscribeDoneCallback subscribe_done_callback,
-               SubscriptionItemCallback subscription_callback,
-               SubscriptionFailureCallback subscription_failure_callback),
+               pubsub::SubscribeDoneCallback subscribe_done_callback,
+               pubsub::SubscriptionItemCallback subscription_callback,
+               pubsub::SubscriptionFailureCallback subscription_failure_callback),
               (override));
+
   MOCK_METHOD(bool,
               SubscribeChannel,
               (std::unique_ptr<rpc::SubMessage> sub_message,
                const rpc::ChannelType channel_type,
-               const rpc::Address &publisher_address,
-               SubscribeDoneCallback subscribe_done_callback,
-               SubscriptionItemCallback subscription_callback,
-               SubscriptionFailureCallback subscription_failure_callback),
+               const rpc::Address &owner_address,
+               pubsub::SubscribeDoneCallback subscribe_done_callback,
+               pubsub::SubscriptionItemCallback subscription_callback,
+               pubsub::SubscriptionFailureCallback subscription_failure_callback),
               (override));
+
   MOCK_METHOD(bool,
               Unsubscribe,
               (const rpc::ChannelType channel_type,
                const rpc::Address &publisher_address,
                const std::string &key_id),
               (override));
+
   MOCK_METHOD(bool,
               UnsubscribeChannel,
               (const rpc::ChannelType channel_type,
                const rpc::Address &publisher_address),
               (override));
-  MOCK_METHOD(std::string, DebugString, (), (const, override));
-};
 
-}  // namespace pubsub
-}  // namespace ray
-
-namespace ray {
-namespace pubsub {
+  MOCK_METHOD(bool,
+              IsSubscribed,
+              (const rpc::ChannelType channel_type,
+               const rpc::Address &publisher_address,
+               const std::string &key_id),
+              (const override));
 
-class MockSubscriberClientInterface : public SubscriberClientInterface {
- public:
-  MOCK_METHOD(void,
-              PubsubLongPolling,
-              (const rpc::PubsubLongPollingRequest &request,
-               const rpc::ClientCallback<rpc::PubsubLongPollingReply> &callback),
-              (override));
-  MOCK_METHOD(void,
-              PubsubCommandBatch,
-              (const rpc::PubsubCommandBatchRequest &request,
-               const rpc::ClientCallback<rpc::PubsubCommandBatchReply> &callback),
-              (override));
+  MOCK_METHOD(std::string, DebugString, (), (const override));
 };
 
 }  // namespace pubsub