Skip to content

Commit

Permalink
use new taskit test support for translationspecs (#64)
Browse files Browse the repository at this point in the history
  • Loading branch information
@bischoffz
bischoffz committed Jun 19, 2024
1 parent a3afe25 commit 7ab406f
Show file tree
Hide file tree
Showing 13 changed files with 65 additions and 437 deletions.
12 changes: 6 additions & 6 deletions .../plugins/personproperties/translationSpecs/PersonPropertiesPluginDataTranslationSpec.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down Expand Up @@ -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());
Expand Down
39 changes: 4 additions & 35 deletions protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/AT_NucleusTranslator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -22,38 +20,9 @@ public class AT_NucleusTranslator {
@Test
@UnitTestForCoverage
public void testGetTranslationSpecs() throws ClassNotFoundException {
List<TranslationSpec<?, ?>> translationSpecs = NucleusTranslator.getTranslationSpecs();
List<Class<?>> translationSpecClasses = new ArrayList<>();
Set<String> 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
Expand Down
41 changes: 5 additions & 36 deletions ...s/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/AT_GlobalPropertiesTranslator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -22,38 +19,10 @@ public class AT_GlobalPropertiesTranslator {
@Test
@UnitTestForCoverage
public void testGetTranslationSpecs() throws ClassNotFoundException {
List<TranslationSpec<?, ?>> translationSpecs = GlobalPropertiesTranslator.getTranslationSpecs();
List<Class<?>> translationSpecClasses = new ArrayList<>();
Set<String> 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
Expand Down
41 changes: 5 additions & 36 deletions ...src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/AT_GroupsTranslator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -23,38 +20,10 @@ public class AT_GroupsTranslator {
@Test
@UnitTestForCoverage
public void testGetTranslationSpecs() throws ClassNotFoundException {
List<TranslationSpec<?, ?>> translationSpecs = GroupsTranslator.getTranslationSpecs();
List<Class<?>> translationSpecClasses = new ArrayList<>();
Set<String> 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
Expand Down
41 changes: 5 additions & 36 deletions ...st/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/AT_MaterialsTranslator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,16 @@
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.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;

Expand All @@ -24,38 +21,10 @@ public class AT_MaterialsTranslator {
@Test
@UnitTestForCoverage
public void testGetTranslationSpecs() throws ClassNotFoundException {
List<TranslationSpec<?, ?>> translationSpecs = MaterialsTranslator.getTranslationSpecs();
List<Class<?>> translationSpecClasses = new ArrayList<>();
Set<String> 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
Expand Down
41 changes: 5 additions & 36 deletions .../java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/AT_PartitionsTranslator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -20,38 +17,10 @@ public class AT_PartitionsTranslator {
@Test
@UnitTestForCoverage
public void testGetTranslationSpecs() throws ClassNotFoundException {
List<TranslationSpec<?, ?>> translationSpecs = PartitionsTranslator.getTranslationSpecs();
List<Class<?>> translationSpecClasses = new ArrayList<>();
Set<String> 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
Expand Down
41 changes: 5 additions & 36 deletions ...src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/AT_PeopleTranslator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -20,38 +17,10 @@ public class AT_PeopleTranslator {
@Test
@UnitTestForCoverage
public void testGetTranslationSpecs() throws ClassNotFoundException {
List<TranslationSpec<?, ?>> translationSpecs = PeopleTranslator.getTranslationSpecs();
List<Class<?>> translationSpecClasses = new ArrayList<>();
Set<String> 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
Expand Down
Loading

0 comments on commit 7ab406f

Please sign in to comment.