From 166391c4d47e0233508e03add8b498d82921b408 Mon Sep 17 00:00:00 2001 From: iadgovuser58 <124906646+iadgovuser58@users.noreply.github.com> Date: Thu, 13 Jul 2023 17:48:34 -0400 Subject: [PATCH] minor comment changes to TCGEventLogTest --- .../java/hirs/utils/tpm/eventlog/TCGEventLogTest.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/HIRS_Utils/src/test/java/hirs/utils/tpm/eventlog/TCGEventLogTest.java b/HIRS_Utils/src/test/java/hirs/utils/tpm/eventlog/TCGEventLogTest.java index c5b036ad..78f5564e 100644 --- a/HIRS_Utils/src/test/java/hirs/utils/tpm/eventlog/TCGEventLogTest.java +++ b/HIRS_Utils/src/test/java/hirs/utils/tpm/eventlog/TCGEventLogTest.java @@ -18,11 +18,9 @@ import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertTrue; -//import static org.junit.jupiter.api.Assertions.*; public class TCGEventLogTest { -//class TCGEventLogTest { private static final String DEFAULT_EVENT_LOG = "/tcgeventlog/TpmLog.bin"; private static final String DEFAULT_EXPECTED_PCRS = "/tcgeventlog/TpmLogExpectedPcrs.txt"; @@ -76,21 +74,17 @@ public class TCGEventLogTest { LOGGER.error("\ntestTCGEventLogProcessorParser error with PCR " + i); } } - //Assert.assertTrue(testPass); assertTrue(testPass); // Test 2 get an individual PCR String pcr3 = evlog.getExpectedPCRValue(3); - //Assert.assertEquals(pcr3, pcrFromLog[3]); assertThat(pcr3, equalTo(pcrFromLog[3])); // Test 3 check the Algorithm Identifiers used in the log String algStr = evlog.getEventLogHashAlgorithm(); - //Assert.assertEquals(algStr, "TPM_ALG_SHA256"); assertThat(algStr, equalTo("TPM_ALG_SHA256")); int id = evlog.getEventLogHashAlgorithmID(); - //Assert.assertEquals(id, TcgTpmtHa.TPM_ALG_SHA256); assertThat(id, equalTo(TcgTpmtHa.TPM_ALG_SHA256)); LOGGER.debug("OK. Parsing of a Crypto Agile Format Success"); @@ -123,21 +117,17 @@ public class TCGEventLogTest { LOGGER.error("\ntestTCGEventLogProcessorParser error with PCR " + i); } } - //Assert.assertTrue(testPass); assertTrue(testPass); // Test 2 get an individual PCR String pcr0 = evlog.getExpectedPCRValue(0); - //Assert.assertEquals(pcr0, pcrFromLog[0]); assertThat(pcr0, equalTo(pcrFromLog[0])); // Test 3 check the Algorithm Identifiers used in the log String algStr = evlog.getEventLogHashAlgorithm(); - //Assert.assertEquals(algStr, "TPM_ALG_SHA1"); assertThat(algStr, equalTo("TPM_ALG_SHA1")); int id = evlog.getEventLogHashAlgorithmID(); - //Assert.assertEquals(id, TcgTpmtHa.TPM_ALG_SHA1); assertThat(id, equalTo(TcgTpmtHa.TPM_ALG_SHA1)); LOGGER.debug("OK. Parsing of a SHA1 formatted TCG Event Log Success");