Remove duplicated code by introducing Executor#tryExec

jcgay · Aug 15, 2017 · 6b1faaf · 6b1faaf
1 parent 92a4b92
commit 6b1faaf
Show file tree

Hide file tree

Showing 13 changed files with 103 additions and 56 deletions.
diff --git a/send-notification/src/main/java/fr/jcgay/notification/notifier/executor/Executor.java b/send-notification/src/main/java/fr/jcgay/notification/notifier/executor/Executor.java
@@ -2,4 +2,5 @@
 
 public interface Executor {
     Process exec(String[] command);
+    boolean tryExec(String[] command);
 }
diff --git a/send-notification/src/main/java/fr/jcgay/notification/notifier/executor/RuntimeExecutor.java b/send-notification/src/main/java/fr/jcgay/notification/notifier/executor/RuntimeExecutor.java
@@ -25,4 +25,16 @@ public Process exec(String[] command) {
             throw Throwables.propagate(e);
         }
     }
+
+    @Override
+    public boolean tryExec(String[] command) {
+        try {
+            return exec(command).waitFor() == 0;
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            return false;
+        } catch (RuntimeException e) {
+            return false;
+        }
+    }
 }
diff --git a/send-notification/src/main/java/fr/jcgay/notification/notifier/kdialog/KdialogNotifier.java b/send-notification/src/main/java/fr/jcgay/notification/notifier/kdialog/KdialogNotifier.java
@@ -72,14 +72,7 @@ public boolean tryInit() {
         commands.add(configuration.bin());
         commands.add("-v");
 
-        try {
-            return executor.exec(commands.toArray(new String[commands.size()])).waitFor() == 0;
-        } catch (RuntimeException e) {
-            return false;
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            return false;
-        }
+        return executor.tryExec(commands.toArray(new String[commands.size()]));
     }
 
     @Override

diff --git a/...ion/src/main/java/fr/jcgay/notification/notifier/notificationcenter/TerminalNotifier.java b/...ion/src/main/java/fr/jcgay/notification/notifier/notificationcenter/TerminalNotifier.java
@@ -91,14 +91,7 @@ public boolean tryInit() {
         commands.add(configuration.bin());
         commands.add("-help");
 
-        try {
-            return executor.exec(commands.toArray(new String[commands.size()])).waitFor() == 0;
-        } catch (RuntimeException e) {
-            return false;
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            return false;
-        }
+        return executor.tryExec(commands.toArray(new String[commands.size()]));
     }
 
     @Override

diff --git a/send-notification/src/main/java/fr/jcgay/notification/notifier/notifu/NotifuNotifier.java b/send-notification/src/main/java/fr/jcgay/notification/notifier/notifu/NotifuNotifier.java
@@ -91,14 +91,7 @@ public boolean tryInit() {
         commands.add(configuration.bin());
         commands.add("/v");
 
-        try {
-            return executor.exec(commands.toArray(new String[commands.size()])).waitFor() == 0;
-        } catch (RuntimeException e) {
-            return false;
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            return false;
-        }
+        return executor.tryExec(commands.toArray(new String[commands.size()]));
     }
 
     @Override

diff --git a/...ification/src/main/java/fr/jcgay/notification/notifier/notifysend/NotifySendNotifier.java b/...ification/src/main/java/fr/jcgay/notification/notifier/notifysend/NotifySendNotifier.java
@@ -75,14 +75,7 @@ public boolean tryInit() {
         commands.add(configuration.bin());
         commands.add("-v");
 
-        try {
-            return executor.exec(commands.toArray(new String[commands.size()])).waitFor() == 0;
-        } catch (RuntimeException e) {
-            return false;
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            return false;
-        }
+        return executor.tryExec(commands.toArray(new String[commands.size()]));
     }
 
     private static String toUrgency(Notification.Level level) {

diff --git a/send-notification/src/main/java/fr/jcgay/notification/notifier/toaster/ToasterNotifier.java b/send-notification/src/main/java/fr/jcgay/notification/notifier/toaster/ToasterNotifier.java
@@ -64,14 +64,7 @@ public boolean tryInit() {
         List<String> commands = new ArrayList<String>();
         commands.add(configuration.bin());
 
-        try {
-            return executor.exec(commands.toArray(new String[commands.size()])).waitFor() == 0;
-        } catch (RuntimeException e) {
-            return false;
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            return false;
-        }
+        return executor.tryExec(commands.toArray(new String[commands.size()]));
     }
 
     @Override

diff --git a/...ication/src/test/groovy/fr/jcgay/notification/notifier/kdialog/KdialogNotifierSpec.groovy b/...ication/src/test/groovy/fr/jcgay/notification/notifier/kdialog/KdialogNotifierSpec.groovy
@@ -14,7 +14,18 @@ class KdialogNotifierSpec extends Specification {
     Application application = Application.builder('id', 'name', TestIcon.ok()).build()
 
     List<String> executedCommand
-    Executor executor = { String[] command -> executedCommand = command; Stub(Process) }
+    Executor executor = new Executor() {
+        @Override
+        Process exec(String[] command) {
+            executedCommand = command
+            null
+        }
+
+        @Override
+        boolean tryExec(String[] command) {
+            throw new IllegalStateException("This method should not be called!")
+        }
+    }
 
     def "should build command line to call kdialog"() {
         given:
@@ -61,7 +72,7 @@ class KdialogNotifierSpec extends Specification {
 
         then:
         result
-        1 * executor.exec([KdialogConfiguration.byDefault().bin(), '-v']) >> Stub(Process) { waitFor() >> 0 }
+        1 * executor.tryExec([KdialogConfiguration.byDefault().bin(), '-v']) >> true
     }
 
     def "should return false if binary is not available"() {
@@ -76,6 +87,6 @@ class KdialogNotifierSpec extends Specification {
 
         then:
         !result
-        1 * executor.exec([KdialogConfiguration.byDefault().bin(), '-v']) >> Stub(Process) { waitFor() >> 127 }
+        1 * executor.tryExec([KdialogConfiguration.byDefault().bin(), '-v']) >> false
     }
 }
diff --git a/...ovy/fr/jcgay/notification/notifier/notificationcenter/SimpleNotificationCenterSpec.groovy b/...ovy/fr/jcgay/notification/notifier/notificationcenter/SimpleNotificationCenterSpec.groovy
@@ -9,7 +9,18 @@ import spock.lang.Subject
 class SimpleNotificationCenterSpec extends Specification {
 
     List<String> executedCommand
-    Executor executor = { String[] command -> executedCommand = command; Stub(Process) }
+    Executor executor = new Executor() {
+        @Override
+        Process exec(String[] command) {
+            executedCommand = command
+            null
+        }
+
+        @Override
+        boolean tryExec(String[] command) {
+            throw new IllegalStateException("This method should not be called!")
+        }
+    }
 
     @Subject
     SimpleNotificationCenterNotifier notifier

diff --git a/...test/groovy/fr/jcgay/notification/notifier/notificationcenter/TerminalNotifierSpec.groovy b/...test/groovy/fr/jcgay/notification/notifier/notificationcenter/TerminalNotifierSpec.groovy
@@ -13,7 +13,18 @@ class TerminalNotifierSpec extends Specification {
     String temp = System.getProperty('java.io.tmpdir')
 
     List<String> executedCommand
-    Executor executor = { String[] command -> executedCommand = command; Stub(Process) }
+    Executor executor = new Executor() {
+        @Override
+        Process exec(String[] command) {
+            executedCommand = command
+            null
+        }
+
+        @Override
+        boolean tryExec(String[] command) {
+            throw new IllegalStateException("This method should not be called!")
+        }
+    }
 
     @Subject
     TerminalNotifier notifier
@@ -85,7 +96,7 @@ class TerminalNotifierSpec extends Specification {
 
         then:
         result
-        1 * executor.exec([TerminalNotifierConfiguration.byDefault().bin(), '-help']) >> Stub(Process) { waitFor() >> 0 }
+        1 * executor.tryExec([TerminalNotifierConfiguration.byDefault().bin(), '-help']) >> true
     }
 
     def "should return false when binary is not available"() {
@@ -100,6 +111,6 @@ class TerminalNotifierSpec extends Specification {
 
         then:
         !result
-        1 * executor.exec([TerminalNotifierConfiguration.byDefault().bin(), '-help']) >> Stub(Process) { waitFor() >> 127 }
+        1 * executor.tryExec([TerminalNotifierConfiguration.byDefault().bin(), '-help']) >> false
     }
 }
diff --git a/...ification/src/test/groovy/fr/jcgay/notification/notifier/notifu/NotifuNotifierSpec.groovy b/...ification/src/test/groovy/fr/jcgay/notification/notifier/notifu/NotifuNotifierSpec.groovy
@@ -1,7 +1,9 @@
 package fr.jcgay.notification.notifier.notifu
+
 import fr.jcgay.notification.Application
 import fr.jcgay.notification.Notification
 import fr.jcgay.notification.TestIcon
+import fr.jcgay.notification.notifier.executor.Executor
 import fr.jcgay.notification.notifier.executor.RuntimeExecutor
 import spock.lang.Specification
 import spock.lang.Subject
@@ -20,7 +22,18 @@ class NotifuNotifierSpec extends Specification {
     NotifuNotifier notifier
 
     def setup() {
-        notifier = new NotifuNotifier(application, NotifuConfiguration.byDefault(), { String[] command -> executedCommand = command; Stub(Process) })
+        notifier = new NotifuNotifier(application, NotifuConfiguration.byDefault(), new Executor() {
+            @Override
+            Process exec(String[] command) {
+                executedCommand = command
+                null
+            }
+
+            @Override
+            boolean tryExec(String[] command) {
+                throw new IllegalStateException("This method should not be called!")
+            }
+        })
     }
 
     def "should build command line to call notifu"() {
@@ -84,7 +97,7 @@ class NotifuNotifierSpec extends Specification {
 
         then:
         result
-        1 * executor.exec([NotifuConfiguration.byDefault().bin(), "/v"]) >> Stub(Process) { waitFor() >> 0 }
+        1 * executor.tryExec([NotifuConfiguration.byDefault().bin(), "/v"]) >> true
     }
 
     def "should return false when binary is available"() {
@@ -99,7 +112,7 @@ class NotifuNotifierSpec extends Specification {
 
         then:
         !result
-        1 * executor.exec([NotifuConfiguration.byDefault().bin(), "/v"]) >> Stub(Process) { waitFor() >> 127 }
+        1 * executor.tryExec([NotifuConfiguration.byDefault().bin(), "/v"]) >> false
     }
 
 }
diff --git a/...n/src/test/groovy/fr/jcgay/notification/notifier/notifysend/NotifySendNotifierSpec.groovy b/...n/src/test/groovy/fr/jcgay/notification/notifier/notifysend/NotifySendNotifierSpec.groovy
@@ -14,8 +14,19 @@ class NotifySendNotifierSpec extends Specification {
     Application application
     Notification notification
 
-    Executor executor = { String[] command -> executedCommand = command; Stub(Process) }
     List<String> executedCommand
+    Executor executor = new Executor() {
+        @Override
+        Process exec(String[] command) {
+            executedCommand = command
+            null
+        }
+
+        @Override
+        boolean tryExec(String[] command) {
+            throw new IllegalStateException("This method should not be called!")
+        }
+    }
 
     @Subject
     NotifySendNotifier notifier
@@ -82,7 +93,7 @@ class NotifySendNotifierSpec extends Specification {
 
         then:
         !result
-        1 * executor.exec([NotifySendConfiguration.byDefault().bin(), '-v']) >> Stub(Process) { waitFor() >> 127 }
+        1 * executor.tryExec([NotifySendConfiguration.byDefault().bin(), '-v']) >> false
     }
 
     def "should return true when binary is available"() {
@@ -97,7 +108,7 @@ class NotifySendNotifierSpec extends Specification {
 
         then:
         result
-        1 * executor.exec([NotifySendConfiguration.byDefault().bin(), '-v']) >> Stub(Process) { waitFor() >> 0 }
+        1 * executor.tryExec([NotifySendConfiguration.byDefault().bin(), '-v']) >> true
     }
 
 }
diff --git a/...ication/src/test/groovy/fr/jcgay/notification/notifier/toaster/ToasterNotifierSpec.groovy b/...ication/src/test/groovy/fr/jcgay/notification/notifier/toaster/ToasterNotifierSpec.groovy
@@ -2,14 +2,26 @@ package fr.jcgay.notification.notifier.toaster
 
 import fr.jcgay.notification.Notification
 import fr.jcgay.notification.TestIcon
+import fr.jcgay.notification.notifier.executor.Executor
 import fr.jcgay.notification.notifier.executor.RuntimeExecutor
 import spock.lang.Specification
 
 
 class ToasterNotifierSpec extends Specification {
 
     List<String> executedCommand
-    ToasterNotifier notifier = new ToasterNotifier(ToasterConfiguration.byDefault(), { String[] command -> executedCommand = command; Stub(Process) })
+    ToasterNotifier notifier = new ToasterNotifier(ToasterConfiguration.byDefault(), new Executor() {
+        @Override
+        Process exec(String[] command) {
+            executedCommand = command
+            null
+        }
+
+        @Override
+        boolean tryExec(String[] command) {
+            throw new IllegalStateException("This method should not be called!")
+        }
+    })
     Notification notification = Notification.builder('title', 'message', TestIcon.ok()).build()
 
     def "should build command line to call notify-send"() {
@@ -40,7 +52,7 @@ class ToasterNotifierSpec extends Specification {
 
         then:
         !result
-        1 * executor.exec([ToasterConfiguration.byDefault().bin()]) >> Stub(Process) { waitFor() >> 127 }
+        1 * executor.tryExec([ToasterConfiguration.byDefault().bin()]) >> false
     }
 
     def "should return true when binary is not available"() {
@@ -55,6 +67,6 @@ class ToasterNotifierSpec extends Specification {
 
         then:
         result
-        1 * executor.exec([ToasterConfiguration.byDefault().bin()]) >> Stub(Process) { waitFor() >> 0 }
+        1 * executor.tryExec([ToasterConfiguration.byDefault().bin()]) >> true
     }
 }