From 0fccf3051ccc1ee22d6a15ea444eaa28c973ad2e Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Wed, 26 Apr 2023 16:21:37 +0200
Subject: [PATCH] Refactor AbstractSOPTest

---
 .../testsuite/operation/AbstractSOPTest.java  | 40 +++++++++++--------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/sop-java/src/testFixtures/java/sop/testsuite/operation/AbstractSOPTest.java b/sop-java/src/testFixtures/java/sop/testsuite/operation/AbstractSOPTest.java
index fa9cbbf..8595898 100644
--- a/sop-java/src/testFixtures/java/sop/testsuite/operation/AbstractSOPTest.java
+++ b/sop-java/src/testFixtures/java/sop/testsuite/operation/AbstractSOPTest.java
@@ -9,6 +9,7 @@ import org.junit.jupiter.params.provider.Arguments;
 import sop.SOP;
 import sop.testsuite.SOPInstanceFactory;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -19,24 +20,29 @@ public abstract class AbstractSOPTest {
     private static final List<Arguments> backends = new ArrayList<>();
 
     static {
-        // populate instances list via configured test subject factory
-        String factoryName = System.getenv("test.implementation");
-        if (factoryName != null) {
-            try {
-                Class testSubjectFactoryClass = Class.forName(factoryName);
-                SOPInstanceFactory factory = (SOPInstanceFactory) testSubjectFactoryClass.newInstance();
-                Map<String, SOP> testSubjects = factory.provideSOPInstances();
+        initBackends();
+    }
 
-                for (String key : testSubjects.keySet()) {
-                    backends.add(Arguments.of(Named.of(key, testSubjects.get(key))));
-                }
-            } catch (ClassNotFoundException e) {
-                throw new RuntimeException(e);
-            } catch (InstantiationException e) {
-                throw new RuntimeException(e);
-            } catch (IllegalAccessException e) {
-                throw new RuntimeException(e);
-            }
+    // populate instances list via configured test subject factory
+    private static void initBackends() {
+        String factoryName = System.getenv("test.implementation");
+        if (factoryName == null) {
+            return;
+        }
+
+        SOPInstanceFactory factory;
+        try {
+            Class<?> testSubjectFactoryClass = Class.forName(factoryName);
+            factory = (SOPInstanceFactory) testSubjectFactoryClass
+                    .getDeclaredConstructor().newInstance();
+        } catch (ClassNotFoundException | InstantiationException | IllegalAccessException |
+                 InvocationTargetException | NoSuchMethodException e) {
+            throw new RuntimeException(e);
+        }
+
+        Map<String, SOP> testSubjects = factory.provideSOPInstances();
+        for (String key : testSubjects.keySet()) {
+            backends.add(Arguments.of(Named.of(key, testSubjects.get(key))));
         }
     }