issue_896: Placed test task in the root build.gradle. Made more fixes…

… to the test classes.
nsacyber · Feb 13, 2025 · a5a0fc7 · a5a0fc7
1 parent 3cbaa26
commit a5a0fc7
Show file tree

Hide file tree

Showing 10 changed files with 182 additions and 98 deletions.
diff --git a/HIRS_AttestationCA/build.gradle b/HIRS_AttestationCA/build.gradle
@@ -70,8 +70,4 @@ sourceSets {
             srcDir '../HIRS_Provisioner.NET/hirs/Resources'
         }
     }
-}
-
-test {
-    useJUnitPlatform()
-}
+}
diff --git a/...tionCA/src/main/java/hirs/attestationca/persist/entity/userdefined/info/FirmwareInfo.java b/...tionCA/src/main/java/hirs/attestationca/persist/entity/userdefined/info/FirmwareInfo.java
@@ -19,11 +19,11 @@
 public class FirmwareInfo implements Serializable {
 
     @XmlElement
-    @Column(length = DeviceInfoEnums.LONG_STRING_LENGTH, nullable = false)
+    @Column(nullable = false)
     private final String biosVendor;
 
     @XmlElement
-    @Column(length = DeviceInfoEnums.LONG_STRING_LENGTH, nullable = false)
+    @Column(nullable = false)
     private final String biosVersion;
 
     @XmlElement

diff --git a/...ttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/info/OSInfo.java b/...ttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/info/OSInfo.java
@@ -21,23 +21,23 @@
 public class OSInfo implements Serializable {
 
     @XmlElement
-    @Column(length = DeviceInfoEnums.LONG_STRING_LENGTH, nullable = false)
+    @Column(nullable = false)
     private final String osName;
 
     @XmlElement
-    @Column(length = DeviceInfoEnums.LONG_STRING_LENGTH, nullable = false)
+    @Column(nullable = false)
     private final String osVersion;
 
     @XmlElement
     @Column(length = DeviceInfoEnums.SHORT_STRING_LENGTH, nullable = false)
     private final String osArch;
 
     @XmlElement
-    @Column(length = DeviceInfoEnums.SHORT_STRING_LENGTH, nullable = true)
+    @Column(length = DeviceInfoEnums.SHORT_STRING_LENGTH)
     private final String distribution;
 
     @XmlElement
-    @Column(length = DeviceInfoEnums.SHORT_STRING_LENGTH, nullable = true)
+    @Column(length = DeviceInfoEnums.SHORT_STRING_LENGTH)
     private final String distributionRelease;
 
     /**

diff --git a/...testationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/info/TPMInfo.java b/...testationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/info/TPMInfo.java
@@ -30,23 +30,23 @@ public class TPMInfo implements Serializable {
     private static final int MAX_BLOB_SIZE = 65535;
 
     @XmlElement
-    @Column(length = DeviceInfoEnums.MED_STRING_LENGTH, nullable = true)
+    @Column(length = DeviceInfoEnums.MED_STRING_LENGTH)
     private String tpmMake;
 
     @XmlElement
-    @Column(nullable = true)
+    @Column
     private short tpmVersionMajor;
 
     @XmlElement
-    @Column(nullable = true)
+    @Column
     private short tpmVersionMinor;
 
     @XmlElement
-    @Column(nullable = true)
+    @Column
     private short tpmVersionRevMajor;
 
     @XmlElement
-    @Column(nullable = true)
+    @Column
     private short tpmVersionRevMinor;
 
     /**
@@ -60,13 +60,13 @@ public class TPMInfo implements Serializable {
     @JsonIgnore
     private X509Certificate identityCertificate;
 
-    @Column(nullable = true, columnDefinition = "blob")
+    @Column(columnDefinition = "blob")
     private byte[] pcrValues;
 
-    @Column(nullable = true, columnDefinition = "blob")
+    @Column(columnDefinition = "blob")
     private byte[] tpmQuoteHash;
 
-    @Column(nullable = true, columnDefinition = "blob")
+    @Column(columnDefinition = "blob")
     private byte[] tpmQuoteSignature;
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -70,8 +70,4 @@ sourceSets { @@
                 srcDir '../HIRS_Provisioner.NET/hirs/Resources'
             }
         }
-    }
-    test {
-        useJUnitPlatform()
-    }
+    }