Merge pull request #2038 from TAMULib/sprint-9-tests

Fix tests

Author: tamu-sad-iii

.github/workflows/build.yml

@@ -4,7 +4,7 @@ on: [ push, pull_request, workflow_dispatch ]
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v3

src/main/java/org/tdl/vireo/model/CustomActionValue.java

@@ -25,7 +25,7 @@ public class CustomActionValue extends ValidatingBaseEntity {
     private CustomActionDefinition definition;
 
     @JsonView(Views.SubmissionList.class)
-    @Column(nullable = false)
+    @Column(nullable = false, name = "\"value\"")
     private Boolean value;
 
     public CustomActionValue() {

src/main/java/org/tdl/vireo/model/FieldPredicate.java

@@ -23,7 +23,7 @@ public class FieldPredicate extends ValidatingBaseEntity {
     private static String period = Pattern.quote(".");
 
     @JsonView(ApiView.Partial.class)
-    @Column(nullable = false, unique = true)
+    @Column(nullable = false, unique = true, name = "\"value\"")
     private String value;
 
     @JsonView(ApiView.Partial.class)

src/main/java/org/tdl/vireo/model/FieldValue.java

@@ -21,7 +21,7 @@
 public class FieldValue extends ValidatingBaseEntity {
 
     @JsonView(Views.SubmissionList.class)
-    @Column(columnDefinition = "text", nullable = true)
+    @Column(columnDefinition = "text", nullable = true, name = "\"value\"")
     private String value;
 
     @JsonView(Views.SubmissionIndividual.class)

src/main/java/org/tdl/vireo/model/FilterCriterion.java

@@ -11,7 +11,7 @@
 @Table(uniqueConstraints = { @UniqueConstraint(columnNames = { "value", "gloss" }) })
 public class FilterCriterion extends BaseEntity {
 
-    @Column
+    @Column(name = "\"value\"")
     private String value;
 
     @Column

src/main/java/org/tdl/vireo/model/GraduationMonth.java

@@ -17,7 +17,7 @@
 @Entity
 public class GraduationMonth extends ValidatingOrderedBaseEntity implements EntityControlledVocabulary {
 
-    @Column(nullable = false, unique = true)
+    @Column(nullable = false, unique = true, name = "\"month\"")
     private int month;
 
     public GraduationMonth() {

src/main/java/org/tdl/vireo/model/ManagedConfiguration.java

@@ -23,7 +23,7 @@ public class ManagedConfiguration extends ValidatingBaseEntity implements Config
     @Column(nullable = false, length = 255)
     private String name;
 
-    @Column(nullable = false, columnDefinition = "text")
+    @Column(nullable = false, columnDefinition = "text", name = "\"value\"")
     private String value;
 
     @Column(nullable = false, length = 255)

src/main/java/org/tdl/vireo/model/User.java

@@ -85,7 +85,7 @@ public class User extends AbstractWeaverUserDetails {
     @JsonView(Views.SubmissionIndividual.class)
     @ElementCollection(fetch = EAGER)
     @MapKeyColumn(name = "setting")
-    @Column(name = "value")
+    @Column(name = "\"value\"")
     private Map<String, String> settings;
 
     @JsonView(Views.Partial.class)

src/main/webapp/tests/unit/models/submissionTest.js

@@ -466,9 +466,16 @@ describe('model: Submission', function () {
             model.removeAllUnsavedFieldValuesByPredicate(model.fieldValues[0].fieldPredicate);
         });*/
         it('removeFieldValue should call WsApi', function () {
-            spyOn(WsApi, "fetch");
+            var mfv = new mockFieldValue(q);
+
+            spyOn(WsApi, "fetch").and.returnValue(Promise.resolve({
+                body: JSON.stringify({
+                    meta: { status: 'SUCCESS' },
+                    payload: mfv
+                })
+            }));
 
-            model.removeFieldValue(new mockFieldValue(q));
+            model.removeFieldValue(mfv);
             scope.$apply();
 
             expect(WsApi.fetch).toHaveBeenCalled();

src/test/java/org/tdl/vireo/ApplicationInitializationTest.java

@@ -10,6 +10,8 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -27,6 +29,7 @@
 @ActiveProfiles(value = { "test" })
 @SpringBootTest(classes = { Application.class })
 @Transactional(propagation = Propagation.REQUIRES_NEW)
+@DirtiesContext(classMode = ClassMode.AFTER_CLASS)
 public class ApplicationInitializationTest {
 
     @Autowired