fix test files

This commit is contained in:
2026-01-27 10:45:15 +08:00
parent 8b589e5a55
commit bd0fdf89f3
10 changed files with 83 additions and 72 deletions
+28 -42
View File
@@ -41,13 +41,11 @@ func TestAuthorize_PermissionNotFound(t *testing.T) {
// Mock user query
userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_initial", "last_name", "suffix", "email_address",
"account_type", "emp_id", "reg", "prov", "aProv", "mun", "bgy", "is_logged_in",
"first_logged_in", "address", "contact_number", "device_id", "role_id",
"is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}).
"emp_id", "is_logged_in", "first_logged_in", "home_address", "contact_number", "device_id",
"role_id", "is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}).
AddRow("user123", "John", "", "Doe", "", "john@example.com",
"regular", "EMP123", "01", "001", "001", "01", "001", "Y",
"Y", "123 Street", "09123456789", "device1", 1,
"N", "secret", "Y", time.Now(), time.Now())
"EMP123", "Y", "Y", "123 Street", "09123456789", "device1",
1, "N", "secret", "Y", time.Now(), time.Now())
mock.ExpectQuery("SELECT user_id, first_name, middle_initial, last_name, suffix, email_address").
WithArgs("user123").
@@ -85,13 +83,11 @@ func TestAuthorize_Success(t *testing.T) {
// Mock user query
userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_initial", "last_name", "suffix", "email_address",
"account_type", "emp_id", "reg", "prov", "aProv", "mun", "bgy", "is_logged_in",
"first_logged_in", "address", "contact_number", "device_id", "role_id",
"is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}).
"emp_id", "is_logged_in", "first_logged_in", "home_address", "contact_number", "device_id",
"role_id", "is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}).
AddRow("user123", "John", "", "Doe", "", "john@example.com",
"regular", "EMP123", "01", "001", "001", "01", "001", "Y",
"Y", "123 Street", "09123456789", "device1", 1,
"N", "secret", "Y", time.Now(), time.Now())
"EMP123", "Y", "Y", "123 Street", "09123456789", "device1",
1, "N", "secret", "Y", time.Now(), time.Now())
mock.ExpectQuery("SELECT user_id, first_name, middle_initial, last_name, suffix, email_address").
WithArgs("user123").
@@ -147,13 +143,11 @@ func TestAuthorize_UserAttributesError(t *testing.T) {
// Mock user query
userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_initial", "last_name", "suffix", "email_address",
"account_type", "emp_id", "reg", "prov", "aProv", "mun", "bgy", "is_logged_in",
"first_logged_in", "address", "contact_number", "device_id", "role_id",
"is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}).
"emp_id", "is_logged_in", "first_logged_in", "home_address", "contact_number", "device_id",
"role_id", "is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}).
AddRow("user123", "John", "", "Doe", "", "john@example.com",
"regular", "EMP123", "01", "001", "001", "01", "001", "Y",
"Y", "123 Street", "09123456789", "device1", 1,
"N", "secret", "Y", time.Now(), time.Now())
"EMP123", "Y", "Y", "123 Street", "09123456789", "device1",
1, "N", "secret", "Y", time.Now(), time.Now())
mock.ExpectQuery("SELECT user_id, first_name, middle_initial, last_name, suffix, email_address").
WithArgs("user123").
@@ -196,13 +190,11 @@ func TestAuthorize_PolicyAttributesError(t *testing.T) {
// Mock user query
userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_initial", "last_name", "suffix", "email_address",
"account_type", "emp_id", "reg", "prov", "aProv", "mun", "bgy", "is_logged_in",
"first_logged_in", "address", "contact_number", "device_id", "role_id",
"is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}).
"emp_id", "is_logged_in", "first_logged_in", "home_address", "contact_number", "device_id",
"role_id", "is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}).
AddRow("user123", "John", "", "Doe", "", "john@example.com",
"regular", "EMP123", "01", "001", "001", "01", "001", "Y",
"Y", "123 Street", "09123456789", "device1", 1,
"N", "secret", "Y", time.Now(), time.Now())
"EMP123", "Y", "Y", "123 Street", "09123456789", "device1",
1, "N", "secret", "Y", time.Now(), time.Now())
mock.ExpectQuery("SELECT user_id, first_name, middle_initial, last_name, suffix, email_address").
WithArgs("user123").
@@ -245,13 +237,11 @@ func TestCheckPermission_Success(t *testing.T) {
// Mock user query
userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_initial", "last_name", "suffix", "email_address",
"account_type", "emp_id", "reg", "prov", "aProv", "mun", "bgy", "is_logged_in",
"first_logged_in", "address", "contact_number", "device_id", "role_id",
"is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}).
"emp_id", "is_logged_in", "first_logged_in", "home_address", "contact_number", "device_id",
"role_id", "is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}).
AddRow("user123", "John", "", "Doe", "", "john@example.com",
"regular", "EMP123", "01", "001", "001", "01", "001", "Y",
"Y", "123 Street", "09123456789", "device1", 1,
"N", "secret", "Y", time.Now(), time.Now())
"EMP123", "Y", "Y", "123 Street", "09123456789", "device1",
1, "N", "secret", "Y", time.Now(), time.Now())
mock.ExpectQuery("SELECT user_id, first_name, middle_initial, last_name, suffix, email_address").
WithArgs("user123").
@@ -300,13 +290,11 @@ func TestCheckPermission_Denied(t *testing.T) {
// Mock user query
userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_initial", "last_name", "suffix", "email_address",
"account_type", "emp_id", "reg", "prov", "aProv", "mun", "bgy", "is_logged_in",
"first_logged_in", "address", "contact_number", "device_id", "role_id",
"is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}).
"emp_id", "is_logged_in", "first_logged_in", "home_address", "contact_number", "device_id",
"role_id", "is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}).
AddRow("user123", "John", "", "Doe", "", "john@example.com",
"regular", "EMP123", "01", "001", "001", "01", "001", "Y",
"Y", "123 Street", "09123456789", "device1", 1,
"N", "secret", "Y", time.Now(), time.Now())
"EMP123", "Y", "Y", "123 Street", "09123456789", "device1",
1, "N", "secret", "Y", time.Now(), time.Now())
mock.ExpectQuery("SELECT user_id, first_name, middle_initial, last_name, suffix, email_address").
WithArgs("user123").
@@ -337,13 +325,11 @@ func TestCheckPermission_NilResourceData(t *testing.T) {
// Mock user query
userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_initial", "last_name", "suffix", "email_address",
"account_type", "emp_id", "reg", "prov", "aProv", "mun", "bgy", "is_logged_in",
"first_logged_in", "address", "contact_number", "device_id", "role_id",
"is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}).
"emp_id", "is_logged_in", "first_logged_in", "home_address", "contact_number", "device_id",
"role_id", "is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}).
AddRow("user123", "John", "", "Doe", "", "john@example.com",
"regular", "EMP123", "01", "001", "001", "01", "001", "Y",
"Y", "123 Street", "09123456789", "device1", 1,
"N", "secret", "Y", time.Now(), time.Now())
"EMP123", "Y", "Y", "123 Street", "09123456789", "device1",
1, "N", "secret", "Y", time.Now(), time.Now())
mock.ExpectQuery("SELECT user_id, first_name, middle_initial, last_name, suffix, email_address").
WithArgs("user123").
+8 -12
View File
@@ -220,13 +220,11 @@ func TestAuthorizeWithCache_Success(t *testing.T) {
// Mock user query (needed to get role_id)
userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_initial", "last_name", "suffix", "email_address",
"account_type", "emp_id", "reg", "prov", "aProv", "mun", "bgy", "is_logged_in",
"first_logged_in", "address", "contact_number", "device_id", "role_id",
"is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}).
"emp_id", "is_logged_in", "first_logged_in", "home_address", "contact_number", "device_id",
"role_id", "is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}).
AddRow("user123", "John", "", "Doe", "", "john@example.com",
"regular", "EMP123", "01", "001", "001", "01", "001", "Y",
"Y", "123 Street", "09123456789", "device1", 1,
"N", "secret", "Y", time.Now(), time.Now())
"EMP123", "Y", "Y", "123 Street", "09123456789", "device1",
1, "N", "secret", "Y", time.Now(), time.Now())
mock.ExpectQuery("SELECT user_id, first_name, middle_initial, last_name, suffix, email_address").
WithArgs("user123").
@@ -277,13 +275,11 @@ func TestAuthorizeWithCache_PermissionNotFound(t *testing.T) {
// Mock user query
userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_initial", "last_name", "suffix", "email_address",
"account_type", "emp_id", "reg", "prov", "aProv", "mun", "bgy", "is_logged_in",
"first_logged_in", "address", "contact_number", "device_id", "role_id",
"is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}).
"emp_id", "is_logged_in", "first_logged_in", "home_address", "contact_number", "device_id",
"role_id", "is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}).
AddRow("user123", "John", "", "Doe", "", "john@example.com",
"regular", "EMP123", "01", "001", "001", "01", "001", "Y",
"Y", "123 Street", "09123456789", "device1", 1,
"N", "secret", "Y", time.Now(), time.Now())
"EMP123", "Y", "Y", "123 Street", "09123456789", "device1",
1, "N", "secret", "Y", time.Now(), time.Now())
mock.ExpectQuery("SELECT user_id, first_name, middle_initial, last_name, suffix, email_address").
WithArgs("user123").
+4
View File
@@ -122,6 +122,10 @@ func inComparison(actual, expected string) bool {
}
func evaluatePolicy(policyAttribute models.PolicyAttribute, ctx *models.AuthorizationContext) (bool, string) {
if ctx == nil {
return false, "Authorization context is nil"
}
var actualValue string
var exists bool
+3 -3
View File
@@ -919,12 +919,12 @@ func TestEvaluatePolicies_RegionBypassForAdminRoles(t *testing.T) {
description: "Super Admin role string should bypass region check",
},
{
name: "Admin role bypasses region check",
name: "Admin role does not bypass region check",
roleID: "Admin",
userRegion: "03",
resourceRegion: "01",
shouldBeAllowed: true,
description: "Admin role string should bypass region check",
shouldBeAllowed: false,
description: "Admin role string should not bypass region check",
},
}