commit 212aca9b595dd163eedf8d0149538e821e6a2b92
author David Pursehouse <dpursehouse@collab.net> Fri May 24 10:43:51 2019 +0900
committer David Pursehouse <dpursehouse@collab.net> Fri May 24 10:44:05 2019 +0900
tree 849ff8dbd35f41681aa2e77ef54edad06641d00e
parent f3654ee60985412c3da13e3d43a098741318a802

AutomergeConfigTest: Remove redundant calls to fail()

Change-Id: Ica3a0d4ce6dc1c4b284cda8bd3804491effcf2e4

src/test/java/com/criteo/gerrit/plugins/automerge/AutomergeConfigTest.java

diff --git a/src/test/java/com/criteo/gerrit/plugins/automerge/AutomergeConfigTest.java b/src/test/java/com/criteo/gerrit/plugins/automerge/AutomergeConfigTest.java
index 548ee49..a33f534 100644
--- a/src/test/java/com/criteo/gerrit/plugins/automerge/AutomergeConfigTest.java
+++ b/src/test/java/com/criteo/gerrit/plugins/automerge/AutomergeConfigTest.java
@@ -15,10 +15,8 @@
 package com.criteo.gerrit.plugins.automerge;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
 
 import com.google.gerrit.server.config.SitePaths;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.file.Paths;
 import org.eclipse.jgit.lib.Config;
@@ -29,37 +27,29 @@
   @Test
   public void testGetDefaultConfig() throws IOException {
     final Config conf = new Config();
-    try {
-      final SitePaths paths = new SitePaths(Paths.get("."));
+    final SitePaths paths = new SitePaths(Paths.get("."));
 
-      final AutomergeConfig amconf = new AutomergeConfig(conf, paths);
+    final AutomergeConfig amconf = new AutomergeConfig(conf, paths);
 
-      assertEquals(amconf.getBotEmail(), AutomergeConfig.getDefaultBotEmail());
-      assertEquals(amconf.getTopicPrefix(), AutomergeConfig.getDefaultTopicPrefix());
-    } catch (final FileNotFoundException e) {
-      fail();
-    }
+    assertEquals(amconf.getBotEmail(), AutomergeConfig.getDefaultBotEmail());
+    assertEquals(amconf.getTopicPrefix(), AutomergeConfig.getDefaultTopicPrefix());
   }
 
   @Test
   public void testGetValues() throws IOException {
     final Config conf = new Config();
-    try {
-      final SitePaths paths = new SitePaths(Paths.get("."));
+    final SitePaths paths = new SitePaths(Paths.get("."));
 
-      conf.setString(
-          AutomergeConfig.AUTOMERGE_SECTION, null, AutomergeConfig.BOT_EMAIL_KEY, "Foo@bar.com");
-      conf.setString(
-          AutomergeConfig.AUTOMERGE_SECTION,
-          null,
-          AutomergeConfig.TOPIC_PREFIX_KEY,
-          "fake_topic_prefix");
+    conf.setString(
+        AutomergeConfig.AUTOMERGE_SECTION, null, AutomergeConfig.BOT_EMAIL_KEY, "Foo@bar.com");
+    conf.setString(
+        AutomergeConfig.AUTOMERGE_SECTION,
+        null,
+        AutomergeConfig.TOPIC_PREFIX_KEY,
+        "fake_topic_prefix");
 
-      final AutomergeConfig amconf = new AutomergeConfig(conf, paths);
-      assertEquals(amconf.getBotEmail(), "Foo@bar.com");
-      assertEquals(amconf.getTopicPrefix(), "fake_topic_prefix");
-    } catch (final FileNotFoundException e) {
-      fail();
-    }
+    final AutomergeConfig amconf = new AutomergeConfig(conf, paths);
+    assertEquals(amconf.getBotEmail(), "Foo@bar.com");
+    assertEquals(amconf.getTopicPrefix(), "fake_topic_prefix");
   }
 }