From 99f26b657f3717ba2432ff88ca622c7204b1034d Mon Sep 17 00:00:00 2001 From: iadgovuser58 <124906646+iadgovuser58@users.noreply.github.com> Date: Fri, 23 Feb 2024 18:04:39 -0500 Subject: [PATCH] removed depencies from other unit tests to new class AbstractUserdefinedEntityTest --- .../AbstractUserdefinedEntityTest.java | 250 ++++++++++++++++++ .../entity/userdefined/CertificateTest.java | 117 ++------ .../entity/userdefined/DeviceTest.java | 20 +- .../CertificateAuthorityCredentialTest.java | 8 +- .../EndorsementCredentialTest.java | 17 +- 5 files changed, 295 insertions(+), 117 deletions(-) create mode 100644 HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/entity/userdefined/AbstractUserdefinedEntityTest.java diff --git a/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/entity/userdefined/AbstractUserdefinedEntityTest.java b/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/entity/userdefined/AbstractUserdefinedEntityTest.java new file mode 100644 index 00000000..ae45c09c --- /dev/null +++ b/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/entity/userdefined/AbstractUserdefinedEntityTest.java @@ -0,0 +1,250 @@ +package hirs.attestationca.persist.entity.userdefined; + +import hirs.attestationca.persist.entity.ArchivableEntity; +import hirs.attestationca.persist.entity.userdefined.certificate.*; +import hirs.attestationca.persist.entity.userdefined.info.*; +import hirs.attestationca.persist.entity.userdefined.report.DeviceInfoReport; +import hirs.attestationca.persist.entity.userdefined.report.DeviceInfoReportTest; +import hirs.attestationca.persist.enums.AppraisalStatus; +import hirs.attestationca.persist.enums.HealthStatus; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.net.InetAddress; +import java.net.URISyntaxException; +import java.net.UnknownHostException; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.security.cert.CertificateFactory; +import java.security.cert.X509Certificate; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; + +/** + * Class with common functions for Userdefined Entity object tests. + * + */ +public class AbstractUserdefinedEntityTest { + + /** + * Location of a test (fake) SGI intermediate CA certificate. + */ + public static final String FAKE_SGI_INT_CA_FILE = "/certificates/fakeSGIIntermediateCA.cer"; + + /** + * Location of a test (fake) Intel intermediate CA certificate. + */ + public static final String FAKE_INTEL_INT_CA_FILE = + "/certificates/fakeIntelIntermediateCA.cer"; + + /** + * Location of a test (fake) root CA certificate. + */ + public static final String FAKE_ROOT_CA_FILE = "/certificates/fakeRootCA.cer"; + + /** + * Hex-encoded subject key identifier for the FAKE_ROOT_CA_FILE. + */ + //j + public static final String FAKE_ROOT_CA_SUBJECT_KEY_IDENTIFIER_HEX = + "58ec313a1699f94c1c8c4e2c6412402b258f0177"; + + private static final String TEST_IDENTITY_CERT = "/tpm/sample_identity_cert.cer"; + + private final NetworkInfo networkInfo = createTestNetworkInfo(); + private final OSInfo osInfo = createTestOSInfo(); + private final FirmwareInfo firmwareInfo = createTestFirmwareInfo(); + private final HardwareInfo hardwareInfo = createTestHardwareInfo(); + private final TPMInfo tpmInfo = createTPMInfo(); + private static final Logger LOGGER = LogManager.getLogger(DeviceInfoReportTest.class); + + + /** + * Construct a test certificate from the given parameters. + * + * @param the type of Certificate that will be created + * @param certificateClass the class of certificate to generate + * @param filename the location of the certificate to be used + * @return the newly-constructed Certificate + * @throws IOException if there is a problem constructing the test certificate + */ + public static Certificate getTestCertificate( + final Class certificateClass, final String filename) + throws IOException { + return getTestCertificate(certificateClass, filename, null, null); + } + + /** + * Construct a test certificate from the given parameters. + * + * @param the type of Certificate that will be created + * @param certificateClass the class of certificate to generate + * @param filename the location of the certificate to be used + * @param endorsementCredential the endorsement credentials (can be null) + * @param platformCredentials the platform credentials (can be null) + * @return the newly-constructed Certificate + * @throws IOException if there is a problem constructing the test certificate + */ + public static Certificate getTestCertificate( + final Class certificateClass, final String filename, + final EndorsementCredential endorsementCredential, + final List platformCredentials) + throws IOException { + + Path certPath; + try { + certPath = Paths.get(Objects.requireNonNull(AbstractUserdefinedEntityTest.class.getResource(filename)).toURI()); +// certPath = Paths.get(Objects.requireNonNull(CertificateTest.class.getResource(filename)).toURI()); + } catch (URISyntaxException e) { + throw new IOException("Could not resolve path URI", e); + } + + switch (certificateClass.getSimpleName()) { + case "CertificateAuthorityCredential": + return new CertificateAuthorityCredential(certPath); + case "ConformanceCredential": + return new ConformanceCredential(certPath); + case "EndorsementCredential": + return new EndorsementCredential(certPath); + case "PlatformCredential": + return new PlatformCredential(certPath); + case "IssuedAttestationCertificate": + return new IssuedAttestationCertificate(certPath, + endorsementCredential, platformCredentials); + default: + throw new IllegalArgumentException( + String.format("Unknown certificate class %s", certificateClass.getName()) + ); + } + } + + /** + * Return a list of all test certificates. + * + * @return a list of all test certificates + * @throws IOException if there is a problem deserializing certificates + */ + public static List getAllTestCertificates() throws IOException { + return Arrays.asList( + getTestCertificate(CertificateAuthorityCredential.class, FAKE_SGI_INT_CA_FILE), + getTestCertificate(CertificateAuthorityCredential.class, FAKE_INTEL_INT_CA_FILE), + getTestCertificate(CertificateAuthorityCredential.class, FAKE_ROOT_CA_FILE) + ); + } + + public static Device getTestDevice(final String name) { + final DeviceInfoReport deviceInfo = AbstractUserdefinedEntityTest.getTestDeviceInfoReport(); + return new Device(name, deviceInfo, HealthStatus.UNKNOWN, AppraisalStatus.Status.UNKNOWN, null, false, null, null); + + } + + /** + * Creates a DeviceInfoReport instance usable for testing. + * + * @return a test DeviceInfoReport + */ + public static DeviceInfoReport getTestDeviceInfoReport() { + return new DeviceInfoReport( + createTestNetworkInfo(), createTestOSInfo(), createTestFirmwareInfo(), + createTestHardwareInfo(), createTPMInfo() + ); + + } + + /** + * Creates a test instance of NetworkInfo. + * + * @return network information for a fake device + */ + public static NetworkInfo createTestNetworkInfo() { + try { + final String hostname = "test.hostname"; + final InetAddress ipAddress = + InetAddress.getByAddress(new byte[] {127, 0, 0, 1}); + final byte[] macAddress = new byte[] {11, 22, 33, 44, 55, 66}; + return new NetworkInfo(hostname, ipAddress, macAddress); + + } catch (UnknownHostException e) { + LOGGER.error("error occurred while creating InetAddress"); + return null; + } + } + + /** + * Creates a test instance of OSInfo. + * + * @return OS information for a fake device + */ + public static OSInfo createTestOSInfo() { + return new OSInfo("test os name", "test os version", "test os arch", + "test distribution", "test distribution release"); + } + + /** + * Creates a test instance of FirmwareInfo. + * + * @return Firmware information for a fake device + */ + public static FirmwareInfo createTestFirmwareInfo() { + return new FirmwareInfo("test bios vendor", "test bios version", "test bios release date"); + } + + /** + * Creates a test instance of HardwareInfo. + * + * @return Hardware information for a fake device + */ + public static HardwareInfo createTestHardwareInfo() { + return new HardwareInfo("test manufacturer", "test product name", "test version", + "test really long serial number with many characters", "test really long chassis " + + "serial number with many characters", + "test really long baseboard serial number with many characters"); + } + + /** + * Creates a test instance of TPMInfo. + * + * @return TPM information for a fake device + */ + public static final TPMInfo createTPMInfo() { + final short num1 = 1; + final short num2 = 2; + final short num3 = 3; + final short num4 = 4; + return new TPMInfo("test os make", num1, num2, num3, num4, + getTestIdentityCertificate()); + } + + private static X509Certificate getTestIdentityCertificate() { + X509Certificate certificateValue = null; + InputStream istream = null; + istream = DeviceInfoReportTest.class.getResourceAsStream( + TEST_IDENTITY_CERT + ); + try { + if (istream == null) { + throw new FileNotFoundException(TEST_IDENTITY_CERT); + } + CertificateFactory cf = CertificateFactory.getInstance("X.509"); + certificateValue = (X509Certificate) cf.generateCertificate( + istream); + + } catch (Exception e) { + return null; + } finally { + if (istream != null) { + try { + istream.close(); + } catch (IOException e) { + LOGGER.error("test certificate file could not be closed"); + } + } + } + return certificateValue; + } +} diff --git a/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/entity/userdefined/CertificateTest.java b/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/entity/userdefined/CertificateTest.java index b78ad8d6..97711a33 100644 --- a/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/entity/userdefined/CertificateTest.java +++ b/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/entity/userdefined/CertificateTest.java @@ -29,17 +29,18 @@ import static org.junit.jupiter.api.Assertions.assertThrows; /** * This class tests functionality of the {@link Certificate} class. */ -public class CertificateTest { - /** - * Location of a test (fake) root CA certificate. - */ - public static final String FAKE_ROOT_CA_FILE = "/certificates/fakeRootCA.cer"; +public class CertificateTest extends AbstractUserdefinedEntityTest { +// /** +// * Location of a test (fake) root CA certificate. +// */ +// //j +// public static final String FAKE_ROOT_CA_FILE = "/certificates/fakeRootCA.cer"; - /** - * Location of a test (fake) Intel intermediate CA certificate. - */ - public static final String FAKE_INTEL_INT_CA_FILE = - "/certificates/fakeIntelIntermediateCA.cer"; +// /** +// * Location of a test (fake) Intel intermediate CA certificate. +// */ +// public static final String FAKE_INTEL_INT_CA_FILE = +// "/certificates/fakeIntelIntermediateCA.cer"; /** * Location of a test (fake) Intel intermediate CA certificate. @@ -47,10 +48,10 @@ public class CertificateTest { public static final String INTEL_INT_CA_FILE = "/validation/platform_credentials/intel_chain/root/intermediate2.cer"; - /** - * Location of a test (fake) SGI intermediate CA certificate. - */ - public static final String FAKE_SGI_INT_CA_FILE = "/certificates/fakeSGIIntermediateCA.cer"; +// /** +// * Location of a test (fake) SGI intermediate CA certificate. +// */ +// public static final String FAKE_SGI_INT_CA_FILE = "/certificates/fakeSGIIntermediateCA.cer"; /** * Location of another test self-signed certificate. @@ -77,12 +78,13 @@ public class CertificateTest { * Location of the GlobalSign Root CA certificate. */ public static final String GS_ROOT_CA = "/certificates/stMicroCaCerts/gstpmroot.crt"; - - /** - * Hex-encoded subject key identifier for the FAKE_ROOT_CA_FILE. - */ - public static final String FAKE_ROOT_CA_SUBJECT_KEY_IDENTIFIER_HEX = - "58ec313a1699f94c1c8c4e2c6412402b258f0177"; +// +// /** +// * Hex-encoded subject key identifier for the FAKE_ROOT_CA_FILE. +// */ +// //j +// public static final String FAKE_ROOT_CA_SUBJECT_KEY_IDENTIFIER_HEX = +// "58ec313a1699f94c1c8c4e2c6412402b258f0177"; /** * Location of a test STM endorsement credential. @@ -450,7 +452,7 @@ public class CertificateTest { assertNotEquals( null, getTestCertificate(CertificateAuthorityCredential.class, FAKE_ROOT_CA_FILE) - ); + ); } /** @@ -520,79 +522,6 @@ public class CertificateTest { return getTestCertificate(CertificateAuthorityCredential.class, filename); } - - /** - * Construct a test certificate from the given parameters. - * - * @param the type of Certificate that will be created - * @param certificateClass the class of certificate to generate - * @param filename the location of the certificate to be used - * @return the newly-constructed Certificate - * @throws IOException if there is a problem constructing the test certificate - */ - public static Certificate getTestCertificate( - final Class certificateClass, final String filename) - throws IOException { - return getTestCertificate(certificateClass, filename, null, null); - } - - /** - * Construct a test certificate from the given parameters. - * - * @param the type of Certificate that will be created - * @param certificateClass the class of certificate to generate - * @param filename the location of the certificate to be used - * @param endorsementCredential the endorsement credentials (can be null) - * @param platformCredentials the platform credentials (can be null) - * @return the newly-constructed Certificate - * @throws IOException if there is a problem constructing the test certificate - */ - public static Certificate getTestCertificate( - final Class certificateClass, final String filename, - final EndorsementCredential endorsementCredential, - final List platformCredentials) - throws IOException { - - Path certPath; - try { - certPath = Paths.get(Objects.requireNonNull(CertificateTest.class.getResource(filename)).toURI()); - } catch (URISyntaxException e) { - throw new IOException("Could not resolve path URI", e); - } - - switch (certificateClass.getSimpleName()) { - case "CertificateAuthorityCredential": - return new CertificateAuthorityCredential(certPath); - case "ConformanceCredential": - return new ConformanceCredential(certPath); - case "EndorsementCredential": - return new EndorsementCredential(certPath); - case "PlatformCredential": - return new PlatformCredential(certPath); - case "IssuedAttestationCertificate": - return new IssuedAttestationCertificate(certPath, - endorsementCredential, platformCredentials); - default: - throw new IllegalArgumentException( - String.format("Unknown certificate class %s", certificateClass.getName()) - ); - } - } - - /** - * Return a list of all test certificates. - * - * @return a list of all test certificates - * @throws IOException if there is a problem deserializing certificates - */ - public static List getAllTestCertificates() throws IOException { - return Arrays.asList( - getTestCertificate(CertificateAuthorityCredential.class, FAKE_SGI_INT_CA_FILE), - getTestCertificate(CertificateAuthorityCredential.class, FAKE_INTEL_INT_CA_FILE), - getTestCertificate(CertificateAuthorityCredential.class, FAKE_ROOT_CA_FILE) - ); - } - private static X509Certificate readX509Certificate(final String resourceName) throws IOException { diff --git a/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/entity/userdefined/DeviceTest.java b/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/entity/userdefined/DeviceTest.java index d2c54934..4bdb03bc 100644 --- a/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/entity/userdefined/DeviceTest.java +++ b/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/entity/userdefined/DeviceTest.java @@ -14,7 +14,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; * This is the test class for the Device class. * */ -public final class DeviceTest { +public final class DeviceTest extends AbstractUserdefinedEntityTest { /** * Utility method for getting a Device that can be used for * testing. @@ -24,7 +24,7 @@ public final class DeviceTest { * @return device */ public static Device getTestDevice(final String name) { - final DeviceInfoReport deviceInfo = DeviceInfoReportTest.getTestReport(); + final DeviceInfoReport deviceInfo = getTestDeviceInfoReport(); return new Device(name, deviceInfo, HealthStatus.UNKNOWN, AppraisalStatus.Status.UNKNOWN, null, false, null, null); } @@ -45,7 +45,7 @@ public final class DeviceTest { @Test public void testDeviceNameAndInfo() { final String name = "my-laptop"; - final DeviceInfoReport deviceInfo = DeviceInfoReportTest.getTestReport(); + final DeviceInfoReport deviceInfo = getTestDeviceInfoReport(); new Device(name, deviceInfo, HealthStatus.UNKNOWN, AppraisalStatus.Status.UNKNOWN, null, false, null, null); } @@ -65,7 +65,7 @@ public final class DeviceTest { @Test public void testGetDeviceInfo() { final String name = "my-laptop"; - final DeviceInfoReport deviceInfo = DeviceInfoReportTest.getTestReport(); + final DeviceInfoReport deviceInfo = getTestDeviceInfoReport(); final Device device = new Device(name, deviceInfo, HealthStatus.UNKNOWN, AppraisalStatus.Status.UNKNOWN, null, false, null, null); assertEquals(deviceInfo, device.getDeviceInfo()); } @@ -78,7 +78,7 @@ public final class DeviceTest { final String name = "my-laptop"; final Device device = new Device(name, null, HealthStatus.UNKNOWN, AppraisalStatus.Status.UNKNOWN, null, false, null, null); assertNull(device.getDeviceInfo()); - final DeviceInfoReport deviceInfo = DeviceInfoReportTest.getTestReport(); + final DeviceInfoReport deviceInfo = getTestDeviceInfoReport(); device.setDeviceInfo(deviceInfo); assertEquals(deviceInfo, device.getDeviceInfo()); } @@ -89,7 +89,7 @@ public final class DeviceTest { @Test public void testSetNullDeviceInfo() { final String name = "my-laptop"; - final DeviceInfoReport deviceInfo = DeviceInfoReportTest.getTestReport(); + final DeviceInfoReport deviceInfo = getTestDeviceInfoReport(); final Device device = new Device(name, deviceInfo, HealthStatus.UNKNOWN, AppraisalStatus.Status.UNKNOWN, null, false, null, null); assertEquals(deviceInfo, device.getDeviceInfo()); device.setDeviceInfo(null); @@ -102,7 +102,7 @@ public final class DeviceTest { @Test public void testNotNullLastReportTimeStamp() { final String name = "my-laptop"; - final DeviceInfoReport deviceInfo = DeviceInfoReportTest.getTestReport(); + final DeviceInfoReport deviceInfo = getTestDeviceInfoReport(); final Device device = new Device(name, deviceInfo, HealthStatus.UNKNOWN, AppraisalStatus.Status.UNKNOWN, null, false, null, null); assertNotNull(device.getLastReportTimestamp()); } @@ -124,7 +124,7 @@ public final class DeviceTest { public void testDeviceEquals() { final String name = "my-laptop"; final String otherName = "my-laptop"; - final DeviceInfoReport deviceInfo = DeviceInfoReportTest.getTestReport(); + final DeviceInfoReport deviceInfo = getTestDeviceInfoReport(); final Device device = new Device(name, deviceInfo, HealthStatus.UNKNOWN, AppraisalStatus.Status.UNKNOWN, null, false, null, null); final Device other = new Device(otherName, deviceInfo, HealthStatus.UNKNOWN, AppraisalStatus.Status.UNKNOWN, null, false, null, null); assertEquals(device, other); @@ -136,7 +136,7 @@ public final class DeviceTest { @Test public void testGetDefaultSupplyChainStatus() { String name = "my-laptop"; - DeviceInfoReport deviceInfo = DeviceInfoReportTest.getTestReport(); + final DeviceInfoReport deviceInfo = getTestDeviceInfoReport(); final Device device = new Device(name, deviceInfo, HealthStatus.UNKNOWN, AppraisalStatus.Status.UNKNOWN, null, false, null, null); assertEquals(AppraisalStatus.Status.UNKNOWN, device.getSupplyChainValidationStatus()); } @@ -147,7 +147,7 @@ public final class DeviceTest { @Test public void testSetAndGetSupplyChainStatus() { String name = "my-laptop"; - DeviceInfoReport deviceInfo = DeviceInfoReportTest.getTestReport(); + final DeviceInfoReport deviceInfo = getTestDeviceInfoReport(); final Device device = new Device(name, deviceInfo, HealthStatus.UNKNOWN, AppraisalStatus.Status.UNKNOWN, null, false, null, null); device.setSupplyChainValidationStatus(AppraisalStatus.Status.PASS); assertEquals(AppraisalStatus.Status.PASS, device.getSupplyChainValidationStatus()); diff --git a/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/entity/userdefined/certificate/CertificateAuthorityCredentialTest.java b/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/entity/userdefined/certificate/CertificateAuthorityCredentialTest.java index 7d59722c..d807b504 100644 --- a/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/entity/userdefined/certificate/CertificateAuthorityCredentialTest.java +++ b/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/entity/userdefined/certificate/CertificateAuthorityCredentialTest.java @@ -1,6 +1,6 @@ package hirs.attestationca.persist.entity.userdefined.certificate; -import hirs.attestationca.persist.entity.userdefined.CertificateTest; +import hirs.attestationca.persist.entity.userdefined.AbstractUserdefinedEntityTest; import org.apache.commons.codec.binary.Hex; import static org.mockito.Mockito.mock; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -17,7 +17,7 @@ import hirs.attestationca.persist.entity.manager.CertificateRepository; /** * Tests that CertificateAuthorityCredential properly parses its fields. */ -public class CertificateAuthorityCredentialTest { +public class CertificateAuthorityCredentialTest extends AbstractUserdefinedEntityTest { private static final CertificateRepository CERT_MAN = mock(CertificateRepository.class); /** @@ -33,7 +33,7 @@ public class CertificateAuthorityCredentialTest { public void testGetSubjectKeyIdentifier() throws CertificateException, IOException, URISyntaxException { Path testCertPath = Paths.get( - this.getClass().getResource(CertificateTest.FAKE_ROOT_CA_FILE).toURI() + this.getClass().getResource(FAKE_ROOT_CA_FILE).toURI() ); CertificateAuthorityCredential caCred = new CertificateAuthorityCredential(testCertPath); @@ -42,7 +42,7 @@ public class CertificateAuthorityCredentialTest { assertNotNull(subjectKeyIdentifier); assertEquals( Hex.encodeHexString(subjectKeyIdentifier), - CertificateTest.FAKE_ROOT_CA_SUBJECT_KEY_IDENTIFIER_HEX + FAKE_ROOT_CA_SUBJECT_KEY_IDENTIFIER_HEX ); } } diff --git a/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/entity/userdefined/certificate/EndorsementCredentialTest.java b/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/entity/userdefined/certificate/EndorsementCredentialTest.java index 877f0adb..70378ca1 100644 --- a/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/entity/userdefined/certificate/EndorsementCredentialTest.java +++ b/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/entity/userdefined/certificate/EndorsementCredentialTest.java @@ -5,7 +5,6 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertNotNull; -import hirs.attestationca.persist.entity.userdefined.CertificateTest; import org.junit.jupiter.api.Test; import java.io.IOException; @@ -35,7 +34,7 @@ public class EndorsementCredentialTest { */ @Test public void testParse() throws IOException { - String path = CertificateTest.class.getResource(TEST_ENDORSEMENT_CREDENTIAL). + String path = this.getClass().getResource(TEST_ENDORSEMENT_CREDENTIAL). getPath(); Path fPath = Paths.get(path); EndorsementCredential ec = new EndorsementCredential(fPath); @@ -68,7 +67,7 @@ public class EndorsementCredentialTest { */ @Test public void testParseNuc1() throws IOException { - String path = CertificateTest.class.getResource( + String path = this.getClass().getResource( TEST_ENDORSEMENT_CREDENTIAL_NUC1).getPath(); Path fPath = Paths.get(path); EndorsementCredential ec = new EndorsementCredential(fPath); @@ -102,7 +101,7 @@ public class EndorsementCredentialTest { */ @Test public void testParseNuc1BuilderMethod() throws IOException { - String path = CertificateTest.class.getResource( + String path = this.getClass().getResource( TEST_ENDORSEMENT_CREDENTIAL_NUC1).getPath(); Path fPath = Paths.get(path); byte[] ecBytes = Files.readAllBytes(fPath); @@ -137,7 +136,7 @@ public class EndorsementCredentialTest { */ @Test public void testParseNuc2() throws IOException { - String path = CertificateTest.class.getResource( + String path = this.getClass().getResource( TEST_ENDORSEMENT_CREDENTIAL_NUC2).getPath(); Path fPath = Paths.get(path); EndorsementCredential ec = new EndorsementCredential(fPath); @@ -170,17 +169,17 @@ public class EndorsementCredentialTest { */ @Test public void testCertsNotEqual() throws IOException { - String path = CertificateTest.class.getResource(TEST_ENDORSEMENT_CREDENTIAL).getPath(); + String path = this.getClass().getResource(TEST_ENDORSEMENT_CREDENTIAL).getPath(); Path fPath = Paths.get(path); EndorsementCredential ec1 = new EndorsementCredential(fPath); assertNotNull(ec1); - path = CertificateTest.class.getResource(TEST_ENDORSEMENT_CREDENTIAL_NUC1).getPath(); + path = this.getClass().getResource(TEST_ENDORSEMENT_CREDENTIAL_NUC1).getPath(); fPath = Paths.get(path); EndorsementCredential ec2 = new EndorsementCredential(fPath); assertNotNull(ec2); - path = CertificateTest.class.getResource(TEST_ENDORSEMENT_CREDENTIAL_NUC2).getPath(); + path = this.getClass().getResource(TEST_ENDORSEMENT_CREDENTIAL_NUC2).getPath(); fPath = Paths.get(path); EndorsementCredential ec3 = new EndorsementCredential(fPath); assertNotNull(ec3); @@ -197,7 +196,7 @@ public class EndorsementCredentialTest { */ @Test public void testTpmSecurityAssertionsParsing() throws IOException { - Path fPath = Paths.get(CertificateTest.class + Path fPath = Paths.get(this.getClass() .getResource(EK_CERT_WITH_SECURITY_ASSERTIONS).getPath()); EndorsementCredential ec = new EndorsementCredential(fPath);