From 6c55f79ca721a2d4d01172a1135d7adb2d5146db Mon Sep 17 00:00:00 2001
From: Deepak Sah <sah.sslpu@gmail.com>
Date: Mon, 7 Oct 2019 00:52:30 +0530
Subject: [PATCH] [MM-19119] Migrate tests from "model/access_test.go" to use
 testify (#12611)

* Changed tests to use require

* Removed redundant messages
---
 model/access_test.go | 44 +++++++++++---------------------------------
 1 file changed, 11 insertions(+), 33 deletions(-)

diff --git a/model/access_test.go b/model/access_test.go
index 0f124a1072..775de8cf72 100644
--- a/model/access_test.go
+++ b/model/access_test.go
@@ -20,9 +20,7 @@ func TestAccessJson(t *testing.T) {
 	json := a1.ToJson()
 	ra1 := AccessDataFromJson(strings.NewReader(json))
 
-	if a1.Token != ra1.Token {
-		t.Fatal("tokens didn't match")
-	}
+	require.Equal(t, a1.Token, ra1.Token)
 }
 
 func TestAccessIsValid(t *testing.T) {
@@ -31,61 +29,41 @@ func TestAccessIsValid(t *testing.T) {
 	require.NotNil(t, ad.IsValid())
 
 	ad.ClientId = NewRandomString(28)
-	if err := ad.IsValid(); err == nil {
-		t.Fatal("Should have failed Client Id")
-	}
+	require.Error(t, ad.IsValid())
 
 	ad.ClientId = ""
-	if err := ad.IsValid(); err == nil {
-		t.Fatal("Should have failed Client Id")
-	}
+	require.Error(t, ad.IsValid())
 
 	ad.ClientId = NewId()
 	require.NotNil(t, ad.IsValid())
 
 	ad.UserId = NewRandomString(28)
-	if err := ad.IsValid(); err == nil {
-		t.Fatal("Should have failed User Id")
-	}
+	require.Error(t, ad.IsValid())
 
 	ad.UserId = ""
-	if err := ad.IsValid(); err == nil {
-		t.Fatal("Should have failed User Id")
-	}
+	require.Error(t, ad.IsValid())
 
 	ad.UserId = NewId()
-	if err := ad.IsValid(); err == nil {
-		t.Fatal("should have failed")
-	}
+	require.Error(t, ad.IsValid())
 
 	ad.Token = NewRandomString(22)
-	if err := ad.IsValid(); err == nil {
-		t.Fatal("Should have failed Token")
-	}
+	require.Error(t, ad.IsValid())
 
 	ad.Token = NewId()
 	require.NotNil(t, ad.IsValid())
 
 	ad.RefreshToken = NewRandomString(28)
-	if err := ad.IsValid(); err == nil {
-		t.Fatal("Should have failed Refresh Token")
-	}
+	require.Error(t, ad.IsValid())
 
 	ad.RefreshToken = NewId()
 	require.NotNil(t, ad.IsValid())
 
 	ad.RedirectUri = ""
-	if err := ad.IsValid(); err == nil {
-		t.Fatal("Should have failed Redirect URI not set")
-	}
+	require.Error(t, ad.IsValid())
 
 	ad.RedirectUri = NewRandomString(28)
-	if err := ad.IsValid(); err == nil {
-		t.Fatal("Should have failed invalid URL")
-	}
+	require.Error(t, ad.IsValid())
 
 	ad.RedirectUri = "http://example.com"
-	if err := ad.IsValid(); err != nil {
-		t.Fatal(err)
-	}
+	require.Error(t, ad.IsValid(), ad.IsValid())
 }