Create ProtoTruth and LiteProtoTruth utility classes, and deprecate t…

…he original factories.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=135520761

extensions/java8/src/main/java/com/google/common/truth/Truth8.java

@@ -23,8 +23,8 @@
 /**
  * A set of static methods to begin a Truth assertion chain for types that require java8.
  *
- * <p><em>Note: Usage of different failure strategies such as <em>assume</em> and <em>about</em>
- * should rely on {@link
+ * <p>Note: Usage of different failure strategies such as <em>assume</em> and <em>expect</em> should
+ * rely on {@link
  * com.google.common.truth.AbstractVerb#about(com.google.common.truth.SubjectFactory)} to begin a
  * chain with those alternative behaviors.
  */

extensions/liteproto/src/main/java/com/google/common/truth/extensions/proto/LiteProtoSubject.java

@@ -55,11 +55,13 @@ public abstract static class Factory<S extends LiteProtoSubject<S, M>, M extends
    * about Lite Protobuf properties.
    */
   public static Factory<?, MessageLite> liteProtos() {
+    // TODO(user): Migrate users, make this package-private.
     return UntypedSubjectFactory.INSTANCE;
   }
 
   /** Returns a Subject using the assertion strategy on the provided {@link MessageLite}. */
   public static LiteProtoSubject<?, MessageLite> assertThat(@Nullable MessageLite messageLite) {
+    // TODO(user): Migrate users, delete this method.
     return assertAbout(LiteProtoSubject.liteProtos()).that(messageLite);
   }
 

extensions/liteproto/src/main/java/com/google/common/truth/extensions/proto/LiteProtoTruth.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 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.common.truth.extensions.proto;
+
+import static com.google.common.truth.Truth.assertAbout;
+
+import com.google.common.truth.AbstractVerb;
+import com.google.common.truth.SubjectFactory;
+import com.google.protobuf.MessageLite;
+import javax.annotation.Nullable;
+
+/**
+ * A set of static methods to begin a Truth assertion chain for the lite version of protocol
+ * buffers.
+ *
+ * <p>This class implements a subset of what {@link ProtoTruth} provides, so if you are already
+ * {@link ProtoTruth}, you should not import this class. {@code LiteProtoTruth} is only useful if
+ * you cannot depend on {@link ProtoTruth} for dependency management reasons.
+ *
+ * <p>Note: Usage of different failure strategies such as <em>assume</em> and <em>expect</em> should
+ * rely on {@link AbstractVerb#about(SubjectFactory)} to begin a chain with those alternative
+ * behaviors.
+ */
+public final class LiteProtoTruth {
+  public static LiteProtoSubject<?, MessageLite> assertThat(@Nullable MessageLite messageLite) {
+    return assertAbout(liteProtos()).that(messageLite);
+  }
+
+  public static LiteProtoSubject.Factory<?, MessageLite> liteProtos() {
+    return LiteProtoSubject.liteProtos();
+  }
+
+  private LiteProtoTruth() {}
+}

extensions/liteproto/src/test/java/com/google/common/truth/extensions/proto/LiteProtoSubjectTest.java

@@ -15,7 +15,7 @@
  */
 package com.google.common.truth.extensions.proto;
 
-import static com.google.common.truth.extensions.proto.LiteProtoSubject.assertThat;
+import static com.google.common.truth.extensions.proto.LiteProtoTruth.assertThat;
 import static org.junit.Assert.fail;
 
 import com.google.auto.value.AutoValue;
@@ -130,8 +130,8 @@ public LiteProtoSubjectTest(@SuppressWarnings("unused") String name, Config conf
     this.config = config;
   }
 
-  private LiteProtoSubject<?, ?> expectThat(@Nullable MessageLite m) {
-    return expect.about(LiteProtoSubject.<MessageLite>liteProtos()).that(m);
+  private LiteProtoSubject<?, MessageLite> expectThat(@Nullable MessageLite m) {
+    return expect.about(LiteProtoTruth.liteProtos()).that(m);
   }
 
   private Subject<?, ?> expectThat(@Nullable Object o) {

extensions/proto/src/main/java/com/google/common/truth/extensions/proto/ProtoSubject.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.google.common.truth.extensions.proto;
 
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -34,13 +35,13 @@
 import javax.annotation.Nullable;
 
 /**
- * Truth subjects for the full version of Protocol Buffers.
+ * Truth subject for the full version of Protocol Buffers.
  *
  * <p>{@code ProtoSubject.assertThat(actual).isEqualTo(expected)} performs the same assertion as
- * {@code Truth.assertThat(actual).isEqualTo(expected)}, but with a better failure message.
- * By default, the assertions are strict with respect to repeated field order, missing fields, etc.
- * This behavior can be changed with the configuration methods on this subject, e.g.
- * {@code ProtoSubject.assertThat(actual).ignoringRepeatedFieldOrder().isEqualTo(expected)}.
+ * {@code Truth.assertThat(actual).isEqualTo(expected)}, but with a better failure message. By
+ * default, the assertions are strict with respect to repeated field order, missing fields, etc.
+ * This behavior can be changed with the configuration methods on this subject, e.g. {@code
+ * ProtoSubject.assertThat(actual).ignoringRepeatedFieldOrder().isEqualTo(expected)}.
  *
  * <p>Equality tests, and other methods, may yield slightly different behavior for versions 2 and 3
  * of Protocol Buffers. If testing protos of multiple versions, make sure you understand the
@@ -73,11 +74,15 @@ public abstract static class Factory<S extends ProtoSubject<S, M>, M extends Mes
    * things about Protobuf properties.
    */
   public static Factory<?, Message> protos() {
+    // TODO(user): Migrate users, make this package-private.
     return UntypedSubjectFactory.INSTANCE;
   }
 
-  /** Returns a {@link Subject} using the assertion strategy on the provided {@link Message}. */
+  /**
+   * Returns a {@link Subject} using the assertion strategy on the provided {@link Message}.
+   */
   public static ProtoSubject<?, Message> assertThat(@Nullable Message message) {
+    // TODO(user): Migrate users, delete this method.
     return assertAbout(ProtoSubject.protos()).that(message);
   }
 

extensions/proto/src/main/java/com/google/common/truth/extensions/proto/ProtoTruth.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 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.common.truth.extensions.proto;
+
+import static com.google.common.truth.Truth.assertAbout;
+
+import com.google.common.truth.AbstractVerb;
+import com.google.common.truth.SubjectFactory;
+import com.google.protobuf.Message;
+import com.google.protobuf.MessageLite;
+import javax.annotation.Nullable;
+
+/**
+ * A set of static methods to begin a Truth assertion chain for protocol buffers.
+ *
+ * <p>Note: Usage of different failure strategies such as <em>assume</em> and <em>expect</em> should
+ * rely on {@link AbstractVerb#about(SubjectFactory)} to begin a chain with those alternative
+ * behaviors.
+ */
+public final class ProtoTruth {
+  //////////////////////////////////////////////////////////////////////////////////////////////////
+  // assertThat() overloads.
+  //////////////////////////////////////////////////////////////////////////////////////////////////
+
+  public static LiteProtoSubject<?, MessageLite> assertThat(@Nullable MessageLite messageLite) {
+    return assertAbout(liteProtos()).that(messageLite);
+  }
+
+  public static ProtoSubject<?, Message> assertThat(@Nullable Message message) {
+    return assertAbout(protos()).that(message);
+  }
+
+  //////////////////////////////////////////////////////////////////////////////////////////////////
+  // SubjectFactory factories.
+  //////////////////////////////////////////////////////////////////////////////////////////////////
+
+  public static ProtoSubject.Factory<?, Message> protos() {
+    return ProtoSubject.protos();
+  }
+
+  public static LiteProtoSubject.Factory<?, MessageLite> liteProtos() {
+    return LiteProtoSubject.liteProtos();
+  }
+
+  private ProtoTruth() {}
+}

extensions/proto/src/test/java/com/google/common/truth/extensions/proto/FieldScopesTest.java

@@ -15,7 +15,7 @@
  */
 package com.google.common.truth.extensions.proto;
 
-import static com.google.common.truth.extensions.proto.ProtoSubject.assertThat;
+import static com.google.common.truth.extensions.proto.ProtoTruth.assertThat;
 import static org.junit.Assert.fail;
 
 import com.google.protobuf.ByteString;

extensions/proto/src/test/java/com/google/common/truth/extensions/proto/ProtoSubjectTest.java

@@ -15,7 +15,7 @@
  */
 package com.google.common.truth.extensions.proto;
 
-import static com.google.common.truth.extensions.proto.ProtoSubject.assertThat;
+import static com.google.common.truth.extensions.proto.ProtoTruth.assertThat;
 import static org.junit.Assert.fail;
 
 import com.google.protobuf.Message;

extensions/proto/src/test/java/com/google/common/truth/extensions/proto/ProtoSubjectTestBase.java

@@ -116,7 +116,7 @@ protected final boolean isProto3() {
   }
 
   protected final ProtoSubject<?, Message> expectThat(@Nullable Message message) {
-    return expect.about(ProtoSubject.protos()).that(message);
+    return expect.about(ProtoTruth.protos()).that(message);
   }
 
   protected final void expectIsEqualToFailed(AssertionError e) {