From 7ab406f26cc4f36e1b6535a71d593c763ac69d81 Mon Sep 17 00:00:00 2001 From: Zachary Bischoff <116595361+bischoffz@users.noreply.github.com> Date: Wed, 19 Jun 2024 17:00:29 -0400 Subject: [PATCH] use new taskit test support for translationspecs (#64) --- ...onPropertiesPluginDataTranslationSpec.java | 12 +++--- .../nucleus/AT_NucleusTranslator.java | 39 ++---------------- .../AT_GlobalPropertiesTranslator.java | 41 +++---------------- .../plugins/groups/AT_GroupsTranslator.java | 41 +++---------------- .../materials/AT_MaterialsTranslator.java | 41 +++---------------- .../partitions/AT_PartitionsTranslator.java | 41 +++---------------- .../plugins/people/AT_PeopleTranslator.java | 41 +++---------------- .../AT_PersonPropertiesTranslator.java | 41 +++---------------- .../properties/AT_PropertiesTranslator.java | 41 +++---------------- .../plugins/regions/AT_RegionsTranslator.java | 41 +++---------------- .../plugins/reports/AT_ReportsTranslator.java | 41 +++---------------- .../resources/AT_ResourcesTranslator.java | 41 +++---------------- .../stochastics/AT_StochasticsTranslator.java | 41 +++---------------- 13 files changed, 65 insertions(+), 437 deletions(-) diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/PersonPropertiesPluginDataTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/PersonPropertiesPluginDataTranslationSpec.java index cfadeb4..f9cc1d2 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/PersonPropertiesPluginDataTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/PersonPropertiesPluginDataTranslationSpec.java @@ -138,9 +138,9 @@ protected PersonPropertiesPluginDataInput convertAppObject(PersonPropertiesPlugi for (PersonPropertyValueInput.Builder personPropertyValueInputBuilder : personPropertyInputBuildersMap .values()) { - if (personPropertyValueInputBuilder != null) { - valueMapInputBuilder.addPropertyValues(personPropertyValueInputBuilder.build()); - } + + valueMapInputBuilder.addPropertyValues(personPropertyValueInputBuilder.build()); + } builder.addPersonPropertyValues(valueMapInputBuilder.build()); @@ -176,9 +176,9 @@ protected PersonPropertiesPluginDataInput convertAppObject(PersonPropertiesPlugi for (PersonPropertyTimeInput.Builder personPropertyTimeInputBuilder : personPropertyInputBuildersMap .values()) { - if (personPropertyTimeInputBuilder != null) { - timeMapInputBuilder.addPropertyTimes(personPropertyTimeInputBuilder.build()); - } + + timeMapInputBuilder.addPropertyTimes(personPropertyTimeInputBuilder.build()); + } builder.addPersonPropertyTimes(timeMapInputBuilder.build()); diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/AT_NucleusTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/AT_NucleusTranslator.java index 17617f8..3fb34a1 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/AT_NucleusTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/AT_NucleusTranslator.java @@ -3,16 +3,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; +import java.util.Set; import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.input.SimulationStateInput; import gov.hhs.aspr.ms.taskit.core.TranslationSpec; import gov.hhs.aspr.ms.taskit.core.Translator; +import gov.hhs.aspr.ms.taskit.core.testsupport.TranslationSpecSupport; import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -22,38 +20,9 @@ public class AT_NucleusTranslator { @Test @UnitTestForCoverage public void testGetTranslationSpecs() throws ClassNotFoundException { - List> translationSpecs = NucleusTranslator.getTranslationSpecs(); - List> translationSpecClasses = new ArrayList<>(); + Set missing = TranslationSpecSupport.testGetTranslationSpecs(NucleusTranslator.class, NucleusTranslator.getTranslationSpecs()); - for (TranslationSpec translationSpec : translationSpecs) { - translationSpecClasses.add(translationSpec.getClass()); - } - - String packageName = this.getClass().getPackageName() + ".translationSpecs"; - ClassLoader classLoader = ClassLoader.getSystemClassLoader(); - URL packageURL; - - packageURL = classLoader.getResource(packageName.replaceAll("[.]", "/")); - - if (packageURL != null) { - String packagePath = packageURL.getPath(); - if (packagePath != null) { - packagePath = packagePath.replaceAll("test-classes", "classes"); - File packageDir = new File(packagePath); - if (packageDir.isDirectory()) { - File[] files = packageDir.listFiles(); - for (File file : files) { - String className = file.getName(); - if (className.endsWith(".class")) { - className = packageName + "." + className.substring(0, className.length() - 6); - Class classRef = classLoader.loadClass(className); - - assertTrue(translationSpecClasses.contains(classRef), classRef.getSimpleName()); - } - } - } - } - } + assertTrue(missing.isEmpty(), missing.toString()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/AT_GlobalPropertiesTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/AT_GlobalPropertiesTranslator.java index af14bb4..0249436 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/AT_GlobalPropertiesTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/AT_GlobalPropertiesTranslator.java @@ -3,17 +3,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; +import java.util.Set; import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslatorId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslatorId; -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; import gov.hhs.aspr.ms.taskit.core.Translator; +import gov.hhs.aspr.ms.taskit.core.testsupport.TranslationSpecSupport; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -22,38 +19,10 @@ public class AT_GlobalPropertiesTranslator { @Test @UnitTestForCoverage public void testGetTranslationSpecs() throws ClassNotFoundException { - List> translationSpecs = GlobalPropertiesTranslator.getTranslationSpecs(); - List> translationSpecClasses = new ArrayList<>(); + Set missing = TranslationSpecSupport.testGetTranslationSpecs(GlobalPropertiesTranslator.class, + GlobalPropertiesTranslator.getTranslationSpecs()); - for (TranslationSpec translationSpec : translationSpecs) { - translationSpecClasses.add(translationSpec.getClass()); - } - - String packageName = this.getClass().getPackageName() + ".translationSpecs"; - ClassLoader classLoader = ClassLoader.getSystemClassLoader(); - URL packageURL; - - packageURL = classLoader.getResource(packageName.replaceAll("[.]", "/")); - - if (packageURL != null) { - String packagePath = packageURL.getPath(); - if (packagePath != null) { - packagePath = packagePath.replaceAll("test-classes", "classes"); - File packageDir = new File(packagePath); - if (packageDir.isDirectory()) { - File[] files = packageDir.listFiles(); - for (File file : files) { - String className = file.getName(); - if (className.endsWith(".class")) { - className = packageName + "." + className.substring(0, className.length() - 6); - Class classRef = classLoader.loadClass(className); - - assertTrue(translationSpecClasses.contains(classRef), classRef.getSimpleName()); - } - } - } - } - } + assertTrue(missing.isEmpty(), missing.toString()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/AT_GroupsTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/AT_GroupsTranslator.java index cd49a81..8a8fa7c 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/AT_GroupsTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/AT_GroupsTranslator.java @@ -3,18 +3,15 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; +import java.util.Set; import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslatorId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslatorId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslatorId; -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; import gov.hhs.aspr.ms.taskit.core.Translator; +import gov.hhs.aspr.ms.taskit.core.testsupport.TranslationSpecSupport; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -23,38 +20,10 @@ public class AT_GroupsTranslator { @Test @UnitTestForCoverage public void testGetTranslationSpecs() throws ClassNotFoundException { - List> translationSpecs = GroupsTranslator.getTranslationSpecs(); - List> translationSpecClasses = new ArrayList<>(); + Set missing = TranslationSpecSupport.testGetTranslationSpecs(GroupsTranslator.class, + GroupsTranslator.getTranslationSpecs()); - for (TranslationSpec translationSpec : translationSpecs) { - translationSpecClasses.add(translationSpec.getClass()); - } - - String packageName = this.getClass().getPackageName() + ".translationSpecs"; - ClassLoader classLoader = ClassLoader.getSystemClassLoader(); - URL packageURL; - - packageURL = classLoader.getResource(packageName.replaceAll("[.]", "/")); - - if (packageURL != null) { - String packagePath = packageURL.getPath(); - if (packagePath != null) { - packagePath = packagePath.replaceAll("test-classes", "classes"); - File packageDir = new File(packagePath); - if (packageDir.isDirectory()) { - File[] files = packageDir.listFiles(); - for (File file : files) { - String className = file.getName(); - if (className.endsWith(".class")) { - className = packageName + "." + className.substring(0, className.length() - 6); - Class classRef = classLoader.loadClass(className); - - assertTrue(translationSpecClasses.contains(classRef), classRef.getSimpleName()); - } - } - } - } - } + assertTrue(missing.isEmpty(), missing.toString()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/AT_MaterialsTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/AT_MaterialsTranslator.java index 36d5534..952fbfc 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/AT_MaterialsTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/AT_MaterialsTranslator.java @@ -3,10 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; +import java.util.Set; import org.junit.jupiter.api.Test; @@ -14,8 +11,8 @@ import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslatorId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslatorId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.ResourcesTranslatorId; -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; import gov.hhs.aspr.ms.taskit.core.Translator; +import gov.hhs.aspr.ms.taskit.core.testsupport.TranslationSpecSupport; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -24,38 +21,10 @@ public class AT_MaterialsTranslator { @Test @UnitTestForCoverage public void testGetTranslationSpecs() throws ClassNotFoundException { - List> translationSpecs = MaterialsTranslator.getTranslationSpecs(); - List> translationSpecClasses = new ArrayList<>(); + Set missing = TranslationSpecSupport.testGetTranslationSpecs(MaterialsTranslator.class, + MaterialsTranslator.getTranslationSpecs()); - for (TranslationSpec translationSpec : translationSpecs) { - translationSpecClasses.add(translationSpec.getClass()); - } - - String packageName = this.getClass().getPackageName() + ".translationSpecs"; - ClassLoader classLoader = ClassLoader.getSystemClassLoader(); - URL packageURL; - - packageURL = classLoader.getResource(packageName.replaceAll("[.]", "/")); - - if (packageURL != null) { - String packagePath = packageURL.getPath(); - if (packagePath != null) { - packagePath = packagePath.replaceAll("test-classes", "classes"); - File packageDir = new File(packagePath); - if (packageDir.isDirectory()) { - File[] files = packageDir.listFiles(); - for (File file : files) { - String className = file.getName(); - if (className.endsWith(".class")) { - className = packageName + "." + className.substring(0, className.length() - 6); - Class classRef = classLoader.loadClass(className); - - assertTrue(translationSpecClasses.contains(classRef), classRef.getSimpleName()); - } - } - } - } - } + assertTrue(missing.isEmpty(), missing.toString()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/AT_PartitionsTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/AT_PartitionsTranslator.java index 660371e..e1df127 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/AT_PartitionsTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/AT_PartitionsTranslator.java @@ -3,15 +3,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; +import java.util.Set; import org.junit.jupiter.api.Test; -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; import gov.hhs.aspr.ms.taskit.core.Translator; +import gov.hhs.aspr.ms.taskit.core.testsupport.TranslationSpecSupport; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -20,38 +17,10 @@ public class AT_PartitionsTranslator { @Test @UnitTestForCoverage public void testGetTranslationSpecs() throws ClassNotFoundException { - List> translationSpecs = PartitionsTranslator.getTranslationSpecs(); - List> translationSpecClasses = new ArrayList<>(); + Set missing = TranslationSpecSupport.testGetTranslationSpecs(PartitionsTranslator.class, + PartitionsTranslator.getTranslationSpecs()); - for (TranslationSpec translationSpec : translationSpecs) { - translationSpecClasses.add(translationSpec.getClass()); - } - - String packageName = this.getClass().getPackageName() + ".translationSpecs"; - ClassLoader classLoader = ClassLoader.getSystemClassLoader(); - URL packageURL; - - packageURL = classLoader.getResource(packageName.replaceAll("[.]", "/")); - - if (packageURL != null) { - String packagePath = packageURL.getPath(); - if (packagePath != null) { - packagePath = packagePath.replaceAll("test-classes", "classes"); - File packageDir = new File(packagePath); - if (packageDir.isDirectory()) { - File[] files = packageDir.listFiles(); - for (File file : files) { - String className = file.getName(); - if (className.endsWith(".class")) { - className = packageName + "." + className.substring(0, className.length() - 6); - Class classRef = classLoader.loadClass(className); - - assertTrue(translationSpecClasses.contains(classRef), classRef.getSimpleName()); - } - } - } - } - } + assertTrue(missing.isEmpty(), missing.toString()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/AT_PeopleTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/AT_PeopleTranslator.java index ea49150..a32e384 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/AT_PeopleTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/AT_PeopleTranslator.java @@ -3,15 +3,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; +import java.util.Set; import org.junit.jupiter.api.Test; -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; import gov.hhs.aspr.ms.taskit.core.Translator; +import gov.hhs.aspr.ms.taskit.core.testsupport.TranslationSpecSupport; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -20,38 +17,10 @@ public class AT_PeopleTranslator { @Test @UnitTestForCoverage public void testGetTranslationSpecs() throws ClassNotFoundException { - List> translationSpecs = PeopleTranslator.getTranslationSpecs(); - List> translationSpecClasses = new ArrayList<>(); + Set missing = TranslationSpecSupport.testGetTranslationSpecs(PeopleTranslator.class, + PeopleTranslator.getTranslationSpecs()); - for (TranslationSpec translationSpec : translationSpecs) { - translationSpecClasses.add(translationSpec.getClass()); - } - - String packageName = this.getClass().getPackageName() + ".translationSpecs"; - ClassLoader classLoader = ClassLoader.getSystemClassLoader(); - URL packageURL; - - packageURL = classLoader.getResource(packageName.replaceAll("[.]", "/")); - - if (packageURL != null) { - String packagePath = packageURL.getPath(); - if (packagePath != null) { - packagePath = packagePath.replaceAll("test-classes", "classes"); - File packageDir = new File(packagePath); - if (packageDir.isDirectory()) { - File[] files = packageDir.listFiles(); - for (File file : files) { - String className = file.getName(); - if (className.endsWith(".class")) { - className = packageName + "." + className.substring(0, className.length() - 6); - Class classRef = classLoader.loadClass(className); - - assertTrue(translationSpecClasses.contains(classRef), classRef.getSimpleName()); - } - } - } - } - } + assertTrue(missing.isEmpty(), missing.toString()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/AT_PersonPropertiesTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/AT_PersonPropertiesTranslator.java index a64350e..9151d68 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/AT_PersonPropertiesTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/AT_PersonPropertiesTranslator.java @@ -3,18 +3,15 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; +import java.util.Set; import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslatorId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslatorId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslatorId; -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; import gov.hhs.aspr.ms.taskit.core.Translator; +import gov.hhs.aspr.ms.taskit.core.testsupport.TranslationSpecSupport; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -23,38 +20,10 @@ public class AT_PersonPropertiesTranslator { @Test @UnitTestForCoverage public void testGetTranslationSpecs() throws ClassNotFoundException { - List> translationSpecs = PersonPropertiesTranslator.getTranslationSpecs(); - List> translationSpecClasses = new ArrayList<>(); + Set missing = TranslationSpecSupport.testGetTranslationSpecs(PersonPropertiesTranslator.class, + PersonPropertiesTranslator.getTranslationSpecs()); - for (TranslationSpec translationSpec : translationSpecs) { - translationSpecClasses.add(translationSpec.getClass()); - } - - String packageName = this.getClass().getPackageName() + ".translationSpecs"; - ClassLoader classLoader = ClassLoader.getSystemClassLoader(); - URL packageURL; - - packageURL = classLoader.getResource(packageName.replaceAll("[.]", "/")); - - if (packageURL != null) { - String packagePath = packageURL.getPath(); - if (packagePath != null) { - packagePath = packagePath.replaceAll("test-classes", "classes"); - File packageDir = new File(packagePath); - if (packageDir.isDirectory()) { - File[] files = packageDir.listFiles(); - for (File file : files) { - String className = file.getName(); - if (className.endsWith(".class")) { - className = packageName + "." + className.substring(0, className.length() - 6); - Class classRef = classLoader.loadClass(className); - - assertTrue(translationSpecClasses.contains(classRef), classRef.getSimpleName()); - } - } - } - } - } + assertTrue(missing.isEmpty(), missing.toString()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/AT_PropertiesTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/AT_PropertiesTranslator.java index 4ebcfca..556e475 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/AT_PropertiesTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/AT_PropertiesTranslator.java @@ -3,15 +3,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; +import java.util.Set; import org.junit.jupiter.api.Test; -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; import gov.hhs.aspr.ms.taskit.core.Translator; +import gov.hhs.aspr.ms.taskit.core.testsupport.TranslationSpecSupport; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -20,38 +17,10 @@ public class AT_PropertiesTranslator { @Test @UnitTestForCoverage public void testGetTranslationSpecs() throws ClassNotFoundException { - List> translationSpecs = PropertiesTranslator.getTranslationSpecs(); - List> translationSpecClasses = new ArrayList<>(); + Set missing = TranslationSpecSupport.testGetTranslationSpecs(PropertiesTranslator.class, + PropertiesTranslator.getTranslationSpecs()); - for (TranslationSpec translationSpec : translationSpecs) { - translationSpecClasses.add(translationSpec.getClass()); - } - - String packageName = this.getClass().getPackageName() + ".translationSpecs"; - ClassLoader classLoader = ClassLoader.getSystemClassLoader(); - URL packageURL; - - packageURL = classLoader.getResource(packageName.replaceAll("[.]", "/")); - - if (packageURL != null) { - String packagePath = packageURL.getPath(); - if (packagePath != null) { - packagePath = packagePath.replaceAll("test-classes", "classes"); - File packageDir = new File(packagePath); - if (packageDir.isDirectory()) { - File[] files = packageDir.listFiles(); - for (File file : files) { - String className = file.getName(); - if (className.endsWith(".class")) { - className = packageName + "." + className.substring(0, className.length() - 6); - Class classRef = classLoader.loadClass(className); - - assertTrue(translationSpecClasses.contains(classRef), classRef.getSimpleName()); - } - } - } - } - } + assertTrue(missing.isEmpty(), missing.toString()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/AT_RegionsTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/AT_RegionsTranslator.java index 7a5ad0c..84d243f 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/AT_RegionsTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/AT_RegionsTranslator.java @@ -3,18 +3,15 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; +import java.util.Set; import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslatorId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslatorId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslatorId; -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; import gov.hhs.aspr.ms.taskit.core.Translator; +import gov.hhs.aspr.ms.taskit.core.testsupport.TranslationSpecSupport; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -23,38 +20,10 @@ public class AT_RegionsTranslator { @Test @UnitTestForCoverage public void testGetTranslationSpecs() throws ClassNotFoundException { - List> translationSpecs = RegionsTranslator.getTranslationSpecs(); - List> translationSpecClasses = new ArrayList<>(); + Set missing = TranslationSpecSupport.testGetTranslationSpecs(RegionsTranslator.class, + RegionsTranslator.getTranslationSpecs()); - for (TranslationSpec translationSpec : translationSpecs) { - translationSpecClasses.add(translationSpec.getClass()); - } - - String packageName = this.getClass().getPackageName() + ".translationSpecs"; - ClassLoader classLoader = ClassLoader.getSystemClassLoader(); - URL packageURL; - - packageURL = classLoader.getResource(packageName.replaceAll("[.]", "/")); - - if (packageURL != null) { - String packagePath = packageURL.getPath(); - if (packagePath != null) { - packagePath = packagePath.replaceAll("test-classes", "classes"); - File packageDir = new File(packagePath); - if (packageDir.isDirectory()) { - File[] files = packageDir.listFiles(); - for (File file : files) { - String className = file.getName(); - if (className.endsWith(".class")) { - className = packageName + "." + className.substring(0, className.length() - 6); - Class classRef = classLoader.loadClass(className); - - assertTrue(translationSpecClasses.contains(classRef), classRef.getSimpleName()); - } - } - } - } - } + assertTrue(missing.isEmpty(), missing.toString()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/AT_ReportsTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/AT_ReportsTranslator.java index deba795..1125619 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/AT_ReportsTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/AT_ReportsTranslator.java @@ -3,15 +3,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; +import java.util.Set; import org.junit.jupiter.api.Test; -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; import gov.hhs.aspr.ms.taskit.core.Translator; +import gov.hhs.aspr.ms.taskit.core.testsupport.TranslationSpecSupport; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -20,38 +17,10 @@ public class AT_ReportsTranslator { @Test @UnitTestForCoverage public void testGetTranslationSpecs() throws ClassNotFoundException { - List> translationSpecs = ReportsTranslator.getTranslationSpecs(); - List> translationSpecClasses = new ArrayList<>(); + Set missing = TranslationSpecSupport.testGetTranslationSpecs(ReportsTranslator.class, + ReportsTranslator.getTranslationSpecs()); - for (TranslationSpec translationSpec : translationSpecs) { - translationSpecClasses.add(translationSpec.getClass()); - } - - String packageName = this.getClass().getPackageName() + ".translationSpecs"; - ClassLoader classLoader = ClassLoader.getSystemClassLoader(); - URL packageURL; - - packageURL = classLoader.getResource(packageName.replaceAll("[.]", "/")); - - if (packageURL != null) { - String packagePath = packageURL.getPath(); - if (packagePath != null) { - packagePath = packagePath.replaceAll("test-classes", "classes"); - File packageDir = new File(packagePath); - if (packageDir.isDirectory()) { - File[] files = packageDir.listFiles(); - for (File file : files) { - String className = file.getName(); - if (className.endsWith(".class")) { - className = packageName + "." + className.substring(0, className.length() - 6); - Class classRef = classLoader.loadClass(className); - - assertTrue(translationSpecClasses.contains(classRef), classRef.getSimpleName()); - } - } - } - } - } + assertTrue(missing.isEmpty(), missing.toString()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/AT_ResourcesTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/AT_ResourcesTranslator.java index 76179bb..3ae3672 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/AT_ResourcesTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/AT_ResourcesTranslator.java @@ -3,10 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; +import java.util.Set; import org.junit.jupiter.api.Test; @@ -14,8 +11,8 @@ import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslatorId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslatorId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslatorId; -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; import gov.hhs.aspr.ms.taskit.core.Translator; +import gov.hhs.aspr.ms.taskit.core.testsupport.TranslationSpecSupport; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -24,38 +21,10 @@ public class AT_ResourcesTranslator { @Test @UnitTestForCoverage public void testGetTranslationSpecs() throws ClassNotFoundException { - List> translationSpecs = ResourcesTranslator.getTranslationSpecs(); - List> translationSpecClasses = new ArrayList<>(); + Set missing = TranslationSpecSupport.testGetTranslationSpecs(ResourcesTranslator.class, + ResourcesTranslator.getTranslationSpecs()); - for (TranslationSpec translationSpec : translationSpecs) { - translationSpecClasses.add(translationSpec.getClass()); - } - - String packageName = this.getClass().getPackageName() + ".translationSpecs"; - ClassLoader classLoader = ClassLoader.getSystemClassLoader(); - URL packageURL; - - packageURL = classLoader.getResource(packageName.replaceAll("[.]", "/")); - - if (packageURL != null) { - String packagePath = packageURL.getPath(); - if (packagePath != null) { - packagePath = packagePath.replaceAll("test-classes", "classes"); - File packageDir = new File(packagePath); - if (packageDir.isDirectory()) { - File[] files = packageDir.listFiles(); - for (File file : files) { - String className = file.getName(); - if (className.endsWith(".class")) { - className = packageName + "." + className.substring(0, className.length() - 6); - Class classRef = classLoader.loadClass(className); - - assertTrue(translationSpecClasses.contains(classRef), classRef.getSimpleName()); - } - } - } - } - } + assertTrue(missing.isEmpty(), missing.toString()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/AT_StochasticsTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/AT_StochasticsTranslator.java index 6623dde..f25838f 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/AT_StochasticsTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/AT_StochasticsTranslator.java @@ -3,15 +3,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; +import java.util.Set; import org.junit.jupiter.api.Test; -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; import gov.hhs.aspr.ms.taskit.core.Translator; +import gov.hhs.aspr.ms.taskit.core.testsupport.TranslationSpecSupport; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -20,38 +17,10 @@ public class AT_StochasticsTranslator { @Test @UnitTestForCoverage public void testGetTranslationSpecs() throws ClassNotFoundException { - List> translationSpecs = StochasticsTranslator.getTranslationSpecs(); - List> translationSpecClasses = new ArrayList<>(); + Set missing = TranslationSpecSupport.testGetTranslationSpecs(StochasticsTranslator.class, + StochasticsTranslator.getTranslationSpecs()); - for (TranslationSpec translationSpec : translationSpecs) { - translationSpecClasses.add(translationSpec.getClass()); - } - - String packageName = this.getClass().getPackageName() + ".translationSpecs"; - ClassLoader classLoader = ClassLoader.getSystemClassLoader(); - URL packageURL; - - packageURL = classLoader.getResource(packageName.replaceAll("[.]", "/")); - - if (packageURL != null) { - String packagePath = packageURL.getPath(); - if (packagePath != null) { - packagePath = packagePath.replaceAll("test-classes", "classes"); - File packageDir = new File(packagePath); - if (packageDir.isDirectory()) { - File[] files = packageDir.listFiles(); - for (File file : files) { - String className = file.getName(); - if (className.endsWith(".class")) { - className = packageName + "." + className.substring(0, className.length() - 6); - Class classRef = classLoader.loadClass(className); - - assertTrue(translationSpecClasses.contains(classRef), classRef.getSimpleName()); - } - } - } - } - } + assertTrue(missing.isEmpty(), missing.toString()); } @Test