/*
 * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
 * agreements. See the NOTICE file distributed with this work for additional information regarding
 * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance with the License. You may obtain a
 * copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software distributed under the License
 * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
 * or implied. See the License for the specific language governing permissions and limitations under
 * the License.
 */
package org.apache.geode.test.dunit.tests;

import static org.assertj.core.api.Assertions.assertThat;

import org.junit.ClassRule;
import org.junit.Test;
import org.junit.experimental.categories.Category;

import org.apache.geode.internal.process.ProcessUtils;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
import org.apache.geode.test.junit.categories.DistributedTest;

@Category(DistributedTest.class)
public class GetPidAndIdDistributedTest {

  @ClassRule
  public static DistributedTestRule distributedTestRule = new DistributedTestRule();

  @Test
  public void getId_returnsVMSequentialId() throws Exception {
    for (int i = 0; i < Host.getHost(0).getVMCount(); i++) {
      VM vm = Host.getHost(0).getVM(i);
      assertThat(vm.getId()).isEqualTo(i);
    }
  }

  @Test
  public void getPid_returnsVMProcessId() throws Exception {
    for (int i = 0; i < Host.getHost(0).getVMCount(); i++) {
      VM vm = Host.getHost(0).getVM(i);
      int remotePid = vm.invoke(() -> ProcessUtils.identifyPid());
      assertThat(vm.getPid()).isEqualTo(remotePid);
    }
  }
}

@@ -827,16 +827,125 @@
 tests;%0A%0A
+import static org.apache.geode.test.dunit.VM.getVM;%0Aimport static org.apache.geode.test.dunit.VM.getVMCount;%0A
 import s
@@ -994,16 +994,16 @@
 rtThat;%0A
-
 %0Aimport 
@@ -1157,49 +1157,8 @@
 ls;%0A
-import org.apache.geode.test.dunit.Host;%0A
 impo
@@ -1588,32 +1588,16 @@
  0; i %3C 
-Host.getHost(0).
 getVMCou
@@ -1623,32 +1623,16 @@
 VM vm = 
-Host.getHost(0).
 getVM(i)
@@ -1780,32 +1780,16 @@
  0; i %3C 
-Host.getHost(0).
 getVMCou
@@ -1819,24 +1819,8 @@
 m = 
-Host.getHost(0).
 getV

Remove use of Host from GetPidAndIdDistributedTest