trying to get stuff to work

nsacyber · Feb 13, 2024 · 4972ac1 · 4972ac1
1 parent 88c8e5d
commit 4972ac1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/SpringPersistenceTest.java b/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/SpringPersistenceTest.java
@@ -2,6 +2,7 @@
 
 import org.hibernate.SessionFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.test.annotation.DirtiesContext;
@@ -13,8 +14,10 @@
  * any tests that need a database connection.
  */
 //@ContextConfiguration(classes = PersistenceConfiguration.class)
-@TestConfiguration
-@EnableJpaRepositories(basePackages = "hirs.attestationca.persist.entity.manager")
+//@ContextConfiguration(classes = PersistenceJPAConfig.class)
+//@TestConfiguration
+@SpringBootApplication
+//@EnableJpaRepositories(basePackages = "hirs.attestationca.persist.entity.manager")
 //@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
 //public class SpringPersistenceTest extends AbstractJUnit4SpringContextTests {
     public class SpringPersistenceTest {

diff --git a/.../java/hirs/attestationca/persist/entity/userdefined/SupplyChainValidationSummaryTest.java b/.../java/hirs/attestationca/persist/entity/userdefined/SupplyChainValidationSummaryTest.java
@@ -17,12 +17,14 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.junit4.SpringRunner;
 
@@ -33,17 +35,21 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
- * Tests the functionality in SupplyChainValidationSummary, as well as the persistence of
- * SupplyChainValidationSummary and SupplyChainValidation.
+ * Integration test that tests the functionality in SupplyChainValidationSummary,
+ * as well as the persistence of SupplyChainValidationSummary and SupplyChainValidation.
  */
 //@ActiveProfiles("test")
 //@SpringBootTest(Classes = PersistenceJPAConfig.class)
 //@ContextConfiguration
 //@ContextConfiguration(classes = SpringPersistenceTest.class)
-@EnableJpaRepositories(basePackages = "hirs.attestationca.persist.entity.manager")
+//@EnableJpaRepositories(basePackages = "hirs.attestationca.persist.entity.manager")
 //@ExtendWith(SpringExtension.class)
 //@ExtendWith(SpringExtension.class)
-//@DataJpaTest
+@DataJpaTest
+@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
+//@TestPropertySource(properties = {
+//        ""
+//})
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SupplyChainValidationSummaryTest {
 //public class SupplyChainValidationSummaryTest extends SpringPersistenceTest {