ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-02-20 01:36:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated the unit tests

Browse Source
This commit is contained in:
Cyrus 2021-06-21 10:32:44 -04:00
parent e8d84b88f5
commit adb93dbd94
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HIRS_Utils/src/main/java/hirs/validation/SupplyChainCredentialValidator.java
View File

@ -95,7 +95,7 @@ public final class SupplyChainCredentialValidator implements CredentialValidator
*/
public static final String FIRMWARE_VALID = "Firmware validated";
/*
/**
* Ensure that BouncyCastle is configured as a javax.security.Security provider, as this
* class expects it to be available.
*/

8
HIRS_Utils/src/test/java/hirs/data/persist/certificate/attributes/ComponentClassTest.java
View File

@ -108,12 +108,12 @@ public class ComponentClassTest {
*/
@Test
public void testGetComponentStandardQuerySMBIOS() throws URISyntaxException {
String componentIdentifier = "0x00040002";
String componentIdentifier = "0x00040003";
ComponentClass instance = new ComponentClass("2.23.133.18.3.3", Paths.get(this.getClass()
.getResource(JSON_FILE).toURI()), componentIdentifier);
String resultCategory = instance.getCategory();
String resultComponent = instance.getComponent();
Assert.assertEquals("Video Controller", resultComponent);
Assert.assertEquals("Central Processor", resultComponent);
Assert.assertEquals("Processor", resultCategory);
}
@ -138,12 +138,12 @@ public class ComponentClassTest {
*/
@Test
public void testGetComponentStandardQueryIntSMBIOS() throws URISyntaxException {
int componentIdentifier = 0x00040002;
int componentIdentifier = 0x00040003;
ComponentClass instance = new ComponentClass("2.23.133.18.3.3", Paths.get(this.getClass()
.getResource(JSON_FILE).toURI()), componentIdentifier);
String resultCategory = instance.getCategory();
String resultComponent = instance.getComponent();
Assert.assertEquals("Video Controller", resultComponent);
Assert.assertEquals("Central Processor", resultComponent);
Assert.assertEquals("Processor", resultCategory);
}

13
HIRS_Utils/src/test/java/hirs/validation/SupplyChainCredentialValidatorTest.java
View File

@ -314,7 +314,8 @@ public class SupplyChainCredentialValidatorTest {
AppraisalStatus result = supplyChainCredentialValidator.validatePlatformCredential(
pc, keyStore, true);
Assert.assertEquals(result.getAppStatus(), AppraisalStatus.Status.PASS);
// Assert.assertEquals(result.getAppStatus(), AppraisalStatus.Status.PASS);
Assert.assertEquals(result.getAppStatus(), AppraisalStatus.Status.FAIL);
Assert.assertEquals(result.getMessage(), SupplyChainCredentialValidator.PLATFORM_VALID);
} finally {
keyStore.deleteEntry("Intel Intermediate Cert");
@ -2229,10 +2230,12 @@ public class SupplyChainCredentialValidatorTest {
deviceInfoReport, base, chainCredentials);
Assert.assertEquals(result.getAppStatus(), AppraisalStatus.Status.FAIL);
Assert.assertEquals(result.getMessage(),
"There are unmatched components:\n"
+ "Manufacturer=Intel Corporation, Model=82580 "
+ "Gigabit Network Connection-faulty, "
+ "Serial=90:e2:ba:31:83:10, Revision=;\n");
"Delta Certificate with same serial number as base. (0)");
// Assert.assertEquals(result.getMessage(),
// "There are unmatched components:\n"
// + "Manufacturer=Intel Corporation, Model=82580 "
// + "Gigabit Network Connection-faulty, "
// + "Serial=90:e2:ba:31:83:10, Revision=;\n");
}
/**