Remove more deprecation warnings

------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=135410496
google · Oct 6, 2016 · 1b2bbc1 · 1b2bbc1
1 parent d744465
commit 1b2bbc1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/test/com/google/javascript/jscomp/CheckConformanceTest.java b/test/com/google/javascript/jscomp/CheckConformanceTest.java
@@ -18,7 +18,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
 import com.google.javascript.jscomp.CheckConformance.InvalidRequirementSpec;
 import com.google.javascript.jscomp.CompilerOptions.LanguageMode;
@@ -27,6 +26,7 @@
 import com.google.javascript.jscomp.testing.BlackHoleErrorManager;
 import com.google.javascript.rhino.Node;
 import com.google.protobuf.TextFormat;
+import com.google.protobuf.TextFormat.ParseException;
 import java.util.List;
 
 /**
@@ -101,8 +101,8 @@ public CompilerPass getProcessor(final Compiler compiler) {
     ConformanceConfig.Builder builder = ConformanceConfig.newBuilder();
     try {
       TextFormat.merge(configuration, builder);
-    } catch (Exception e) {
-      Throwables.propagate(e);
+    } catch (ParseException e) {
+      throw new RuntimeException(e);
     }
     return new CheckConformance(compiler, ImmutableList.of(builder.build()));
   }

diff --git a/test/com/google/javascript/jscomp/Es6InlineTypesNotYetParsedTest.java b/test/com/google/javascript/jscomp/Es6InlineTypesNotYetParsedTest.java
@@ -152,7 +152,7 @@ private String doCompile(String... lines) {
     }
 
     public void transpilesTo(String... lines) {
-      assertThat(doCompile(getSubject()).trim())
+      assertThat(doCompile(actual()).trim())
           .isEqualTo("'use strict';" + LINE_JOINER.join(lines));
     }
   }