Convert ResourceSet ctor calls to factory method

Most current invocations of the ResourceSet constructor shouldn't
care about any new dimensions we add to restrict test execution. This
change allows us to make those changes, keep the ResourceSet ctor
symmetrical, and avoid contaminating those ctor call sites with noise.

--
MOS_MIGRATED_REVID=86826112

2 files changed, 5 insertions, 5 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/actions/ResourceManagerTest.java b/src/test/java/com/google/devtools/build/lib/actions/ResourceManagerTest.java
index 4955288aa7..eebf0a9980 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/ResourceManagerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/ResourceManagerTest.java
@@ -51,7 +51,7 @@ public class ResourceManagerTest {
   @Before
   public void setUp() throws Exception {
     rm.setRamUtilizationPercentage(100);
-    rm.setAvailableResources(new ResourceSet(1000, 1, 1));
+    rm.setAvailableResources(ResourceSet.createWithRamCpuIo(1000, 1, 1));
     rm.setEventBus(new EventBus());
     counter = new AtomicInteger(0);
     sync = new CyclicBarrier(2);
@@ -60,15 +60,15 @@ public class ResourceManagerTest {
   }
 
   private void acquire(double ram, double cpu, double io) throws InterruptedException {
-    rm.acquireResources(resourceOwner, new ResourceSet(ram, cpu, io));
+    rm.acquireResources(resourceOwner, ResourceSet.createWithRamCpuIo(ram, cpu, io));
   }
 
   private boolean acquireNonblocking(double ram, double cpu, double io) {
-    return rm.tryAcquire(resourceOwner, new ResourceSet(ram, cpu, io));
+    return rm.tryAcquire(resourceOwner, ResourceSet.createWithRamCpuIo(ram, cpu, io));
   }
 
   private void release(double ram, double cpu, double io) {
-    rm.releaseResources(resourceOwner, new ResourceSet(ram, cpu, io));
+    rm.releaseResources(resourceOwner, ResourceSet.createWithRamCpuIo(ram, cpu, io));
   }
 
   private void validate (int count) {
diff --git a/src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java b/src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java
index 086138440e..42780a60d9 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java
@@ -43,7 +43,7 @@ public class TestAction extends AbstractAction {
   public static final Runnable NO_EFFECT = new Runnable() { @Override public void run() {} };
 
   private static final ResourceSet RESOURCES =
-      new ResourceSet(/*memoryMb=*/1.0, /*cpu=*/0.1, /*io=*/0.0);
+      ResourceSet.createWithRamCpuIo(/*memoryMb=*/1.0, /*cpu=*/0.1, /*io=*/0.0);
 
   private final Callable<Void> effect;