@@ -30,7 +30,9 @@ public abstract class MockCombinedView implements ViewModel {
 
   public abstract List<MockServiceImplView> serviceImpls();
 
-  // TODO(pongad): Add the tests
+  public abstract List<GapicSurfaceTestClassView> tests();
+
+  public abstract List<MockServiceUsageView> mockServices();
 
   @Override
   public String resourceRoot() {
/* Copyright 2016 Google Inc
 *
 * Licensed 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 com.google.api.codegen.viewmodel.testing;

import com.google.api.codegen.SnippetSetRunner;
import com.google.api.codegen.viewmodel.FileHeaderView;
import com.google.api.codegen.viewmodel.ViewModel;
import com.google.auto.value.AutoValue;
import java.util.List;

/**
 * MockCombinedView gathers unit-test-related classes. Used in languages that idiomatically put
 * mocks and tests in the same file.
 */
@AutoValue
public abstract class MockCombinedView implements ViewModel {
  public abstract FileHeaderView fileHeader();

  public abstract List<MockServiceImplView> serviceImpls();

  // TODO(pongad): Add the tests

  @Override
  public String resourceRoot() {
    return SnippetSetRunner.SNIPPET_RESOURCE_ROOT;
  }

  @Override
  public abstract String templateFileName();

  @Override
  public abstract String outputPath();

  public static Builder newBuilder() {
    return new AutoValue_MockCombinedView.Builder();
  }

  @AutoValue.Builder
  public abstract static class Builder {
    public abstract Builder fileHeader(FileHeaderView val);

    public abstract Builder serviceImpls(List<MockServiceImplView> val);

    public abstract Builder outputPath(String val);

    public abstract Builder templateFileName(String val);

    public abstract MockCombinedView build();
  }
}

I think `testClasses` (or `testFiles`) would be better, because `tests` is ambiguous with `testCases`