package com.google.sps.utilities;
 
import com.google.sps.data.VolunteeringOpportunity;
import com.google.sps.data.OpportunitySignup;
import java.util.UUID;

/* Class containing utilities for testing. */
public class TestUtils {
  private static final String EVENT_ID = "0883de79-17d7-49a3-a866-dbd5135062a8";
  private static final String NAME = "Performer";
  private static final int NUMBER_OF_SPOTS = 240;
  private static final String VOLUNTEER_EMAIL = "volunteer@gmail.com";
 
  public static VolunteeringOpportunity newVolunteeringOpportunity() {
    return new VolunteeringOpportunity.Builder(EVENT_ID, NAME, NUMBER_OF_SPOTS).build();
  }
 
  public static OpportunitySignup newOpportunitySignup(String opportunityId) {
    return new OpportunitySignup.Builder(opportunityId, VOLUNTEER_EMAIL).build();
  }
 
  public static String newRandomId() {
    return UUID.randomUUID().toString();
  }
}

@@ -27,17 +27,113 @@
 lities;%0A
- 
+%0Aimport com.google.cloud.Date;%0Aimport com.google.sps.data.Event;%0Aimport com.google.sps.data.User;
 %0Aimport 
@@ -244,85 +244,855 @@
 til.
-UUID;%0A%0A/* Class containing utilities for testing. */%0Apublic class TestUtils %7B
+Arrays;%0Aimport java.util.Collections;%0Aimport java.util.HashSet;%0Aimport java.util.Set;%0Aimport java.util.UUID;%0A%0A/* Class containing utilities for testing. */%0Apublic class TestUtils %7B%0A  private static final String NAME = %22Bob Smith%22;%0A  private static final String EMAIL = %22bobsmith@example.com%22;%0A  private static final String EVENT_NAME = %22Team Meeting%22;%0A  private static final String DESCRIPTION = %22Daily Team Sync%22;%0A  private static final Set%3CString%3E LABELS =%0A      Collections.unmodifiableSet(new HashSet%3C%3E(Arrays.asList(%22Tech%22, %22Work%22)));%0A  private static final String LOCATION = %22Remote%22;%0A  private static final Date DATE = Date.fromYearMonthDay(2016, 9, 15);%0A  private static final String DATE_STRING = %2209/15/2016%22;%0A  private static final String TIME = %223:00PM-5:00PM%22;%0A  private static final User HOST = new User.Builder(NAME, EMAIL).build();
 %0A  p
@@ -1191,32 +1191,44 @@
 ic final String 
+OPPORTUNITY_
 NAME = %22Performe
@@ -1352,17 +1352,244 @@
 l.com%22;%0A
- 
+%0A  public static User newUser() %7B%0A    return new User.Builder(NAME, EMAIL).build(); %0A  %7D%0A%0A  public static Event newEvent() %7B%0A    return new Event.Builder(EVENT_NAME, DESCRIPTION, LABELS, LOCATION, DATE, TIME, HOST).build();%0A  %7D%0A
 %0A  publi
@@ -1709,16 +1709,28 @@
 ENT_ID, 
+OPPORTUNITY_
 NAME, NU
@@ -1749,33 +1749,436 @@
 S).build();%0A  %7D%0A
- 
+%0A  /*%0A   * Return a new volunteering opportunity object with the given eventId.%0A   * @param eventId%0A   */%0A  public static VolunteeringOpportunity newVolunteeringOpportunityWithEventId(String eventId) %7B%0A    return new VolunteeringOpportunity.Builder(eventId, NAME, NUMBER_OF_SPOTS).build();%0A  %7D%0A%0A  /*%0A   * Return a new opportunitySignup object with the given opportunityId.%0A   * @param opportunityId%0A   */
 %0A  public static
@@ -2216,16 +2216,33 @@
 tySignup
+WithOpportunityId
 (String 

Add testing utilities.