Cleanup

MetalBlueberry · May 19, 2024 · c7622db · c7622db
1 parent b569814
commit c7622db
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/types/arrayok.go b/types/arrayok.go
@@ -15,18 +15,23 @@ func (arrayOK *ArrayOKfloat64) MarshalJSON() ([]byte, error) {
 }
 
 func (arrayOK *ArrayOKfloat64) UnmarshalJSON(data []byte) error {
+	arrayOK.Array = nil
+	arrayOK.Value = 0
+
 	var array []float64
 	err := json.Unmarshal(data, &array)
-	if err != nil {
-		var value float64
-		err := json.Unmarshal(data, &value)
-		if err != nil {
-			return err
-		}
-		arrayOK.Value = value
+	if err == nil {
+		arrayOK.Array = array
 		return nil
 	}
-	arrayOK.Array = array
+
+	var value float64
+	err = json.Unmarshal(data, &value)
+	if err != nil {
+		return err
+	}
+	arrayOK.Value = value
+	return nil
 	return nil
 
 }
diff --git a/types/arrayok_test.go b/types/arrayok_test.go
@@ -14,9 +14,6 @@ type TestMarshallScenario struct {
 	Expected string
 }
 
-func TestTypes(t *testing.T) {
-}
-
 func TestFloat64Marshal(t *testing.T) {
 	RegisterTestingT(t)
 
@@ -45,7 +42,7 @@ func TestFloat64Marshal(t *testing.T) {
 	}
 	for _, tt := range table {
 		t.Run(tt.Name, func(t *testing.T) {
-			result, err := json.Marshal(tt.Input)
+			result, err := json.Marshal(&tt.Input)
 			Expect(err).To(BeNil())
 			Expect(string(result)).To(Equal(tt.Expected))