Skip to content

Avoid Account Name for encrypted orgs #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nwcm wants to merge 6 commits into from
Closed

Avoid Account Name for encrypted orgs #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
28163c4
Avoid Account Name for encrypted orgs
nwcm Jan 27, 2026
d2dc3b9
Fix test agg
nwcm Jan 27, 2026
70bb67b
Correct test logic
nwcm Jan 27, 2026
2b456a5
final final test fix
nwcm Jan 27, 2026
301142f
final fix
nwcm Jan 27, 2026
ee3e182
Ensure any tests asserting limits run in their own context.
nwcm Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 54 additions & 0 deletions force-app/main/default/classes/cached-soql/SOQLCache_Test.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,31 +64,37 @@ private class SOQLCache_Test {

@IsTest
static void multipleSelectorInvocation() {

// Test
Test.startTest();
SOQLCache.of(Profile.SObjectType).with(Profile.Id, Profile.Name).whereEqual(Profile.Name, SYSTEM_ADMINISTRATOR).toObject();
SOQLCache.of(Profile.SObjectType).with(Profile.Id, Profile.Name).whereEqual(Profile.Name, SYSTEM_ADMINISTRATOR).toObject();
SOQLCache.of(Profile.SObjectType).with(Profile.Id, Profile.Name).whereEqual(Profile.Name, SYSTEM_ADMINISTRATOR).toObject();
SOQLCache.of(Profile.SObjectType).with(Profile.Id, Profile.Name).whereEqual(Profile.Name, SYSTEM_ADMINISTRATOR).toObject();

// Verify
Assert.areEqual(1, Limits.getQueries(), 'Only the first query should be executed to populate data in the cache.');
Test.stopTest();
}

@IsTest
static void multipleSelectorInvocationWithDifferentConditions() {
// Test
Test.startTest();
SOQLCache.of(Profile.SObjectType).with(Profile.Id, Profile.Name).whereEqual(Profile.Name, SYSTEM_ADMINISTRATOR).toObject();
SOQLCache.of(Profile.SObjectType).with(Profile.Id, Profile.Name).whereEqual(Profile.Name, STANDARD_USER).toObject();
SOQLCache.of(Profile.SObjectType).with(Profile.Id, Profile.Name).whereEqual(Profile.Name, SYSTEM_ADMINISTRATOR).toObject();
SOQLCache.of(Profile.SObjectType).with(Profile.Id, Profile.Name).whereEqual(Profile.Name, STANDARD_USER).toObject();

// Verify
Assert.areEqual(2, Limits.getQueries(), 'Only the one query for each condition should be executed.');
Test.stopTest();
}

@IsTest
static void multipleSelectorInvocationWhenPlainFieldsWereAlreadySet() {
// Test
Test.startTest();
SOQLCache.of(Profile.SObjectType)
.with(Profile.Id, Profile.Name)
.whereEqual(Profile.Name, SYSTEM_ADMINISTRATOR)
Expand All @@ -101,11 +107,13 @@ private class SOQLCache_Test {

// Verify
Assert.areEqual(1, Limits.getQueries(), 'Only the one query should be executed, because the first query set all necessary fields.');
Test.stopTest();
}

@IsTest
static void multipleSelectorInvocationWhenPlainFieldsAreMissing() {
// Test
Test.startTest();
SOQLCache.of(Profile.SObjectType)
.with(Profile.Id)
.whereEqual(Profile.Name, SYSTEM_ADMINISTRATOR)
Expand All @@ -118,11 +126,14 @@ private class SOQLCache_Test {

// Verify
Assert.areEqual(2, Limits.getQueries(), 'Two queries should be executed, because the first query haven\'t set all necessary fields.');
Test.stopTest();
}

@IsTest
static void multipleSelectorInvocationWhenRelationshipFieldsWereAlreadySet() {

// Test
Test.startTest();
SOQLCache.of(Profile.SObjectType)
.with('UserLicense', UserLicense.Name, UserLicense.Status)
.whereEqual(Profile.Name, SYSTEM_ADMINISTRATOR)
Expand All @@ -135,11 +146,15 @@ private class SOQLCache_Test {

// Verify
Assert.areEqual(1, Limits.getQueries(), 'Only the one query should be executed, because the first query set all necessary fields.');
Test.stopTest();

}

@IsTest
static void multipleSelectorInvocationWhenRelationshipFieldsAreMissing() {

// Test
Test.startTest();
SOQLCache.of(Profile.SObjectType)
.with('UserLicense', UserLicense.Name)
.whereEqual(Profile.Name, SYSTEM_ADMINISTRATOR)
Expand All @@ -152,6 +167,7 @@ private class SOQLCache_Test {

// Verify
Assert.areEqual(2, Limits.getQueries(), 'Two queries should be executed, because the first query haven\'t set all necessary fields.');
Test.stopTest();
}

@IsTest
Expand Down Expand Up @@ -222,6 +238,8 @@ private class SOQLCache_Test {

@IsTest
static void maxHoursWithoutRefreshRecentRecord() {

Test.startTest();
// Setup
SOQLCache.CacheItem cachedItem = new SOQLCache.CacheItem([
SELECT Id, Name FROM Profile WHERE Name = :SYSTEM_ADMINISTRATOR LIMIT 1
Expand All @@ -240,10 +258,13 @@ private class SOQLCache_Test {
Assert.areEqual(1, Limits.getQueries(), 'One queries should be issued. The second query should retrieve record from cache.');
Assert.isNotNull(profile, 'Profile should be not null.');
Assert.areEqual(SYSTEM_ADMINISTRATOR, profile.Name, 'The cached profile record should be "System Administrator".');

Test.stopTest();
}

@IsTest
static void maxHoursWithoutRefreshOldRecord() {
Test.startTest();
// Setup
SOQLCache.CacheItem cachedItem = new SOQLCache.CacheItem([
SELECT Id, Name FROM Profile WHERE Name = :SYSTEM_ADMINISTRATOR LIMIT 1
Expand All @@ -267,6 +288,7 @@ private class SOQLCache_Test {
Assert.isTrue(Math.abs((System.now().getTime() - updatedCacheItems[0].cachedDate.getTime()) / 1000) < 10, 'The cached record should be updated. The time difference should be less than 10 seconds.');
Assert.isNotNull(profile, 'Profile should be not null.');
Assert.areEqual(SYSTEM_ADMINISTRATOR, profile.Name, 'The cached profile record should be "System Administrator".');
Test.stopTest();
}

@IsTest
Expand All @@ -279,6 +301,7 @@ private class SOQLCache_Test {
CacheManager.ApexTransaction.put('Profile', new List<SOQLCache.CacheItem>{ cachedItem1, cachedItem2 });

// Test
Test.startTest();
SOQLCache.of(Profile.SObjectType)
.with(Profile.Id, Profile.Name)
.whereEqual(Profile.Name, 'ProfileNotExistName')
Expand All @@ -292,6 +315,7 @@ private class SOQLCache_Test {
Assert.areEqual(1, Limits.getQueries(), 'One queries should be issued.');
Assert.areEqual(1, updatedCacheItems.size(), 'The Apex transaction cache should contain exactly one record.');
Assert.areEqual(SYSTEM_ADMINISTRATOR, cachedProfile.Name, 'The cached profile record should be "System Administrator".');
Test.stopTest();
}

@IsTest
Expand Down Expand Up @@ -602,6 +626,7 @@ private class SOQLCache_Test {
@IsTest
static void whereEqualStringField() {
// Test
Test.startTest();
// First query to cache the record
Profile profile1 = (Profile) SOQLCache.of(Profile.SObjectType)
.with(Profile.Id, Profile.Name)
Expand All @@ -618,13 +643,15 @@ private class SOQLCache_Test {
Assert.areEqual(SYSTEM_ADMINISTRATOR, profile1.Name, 'The cached profile record should be "System Administrator".');
Assert.areEqual(SYSTEM_ADMINISTRATOR, profile2.Name, 'The cached profile record should be "System Administrator".');
Assert.areEqual(1, Limits.getQueries(), 'The number of queries should be 1.');
Test.stopTest();
}

@IsTest
static void whereEqualIntegerField() {
insertAccount();

// Test
Test.startTest();
// First query to cache the record
Account account1 = (Account) SOQLCache.of(Account.SObjectType)
.with(Account.Id, Account.Name)
Expand All @@ -638,18 +665,21 @@ private class SOQLCache_Test {
.allowFilteringByNonUniqueFields()
.whereEqual(Account.NumberOfEmployees, 1000)
.toObject();


// Verify
Assert.areEqual(1000, account1.NumberOfEmployees, 'The cached account record should be 1000.');
Assert.areEqual(1000, account2.NumberOfEmployees, 'The cached account record should be 1000.');
Assert.areEqual(1, Limits.getQueries(), 'The number of queries should be 1.');
Test.stopTest();
}

@IsTest
static void whereEqualBooleanField() {
insertAccount();

// Test
Test.startTest();
// First query to cache the record
Account account1 = (Account) SOQLCache.of(Account.SObjectType)
.with(Account.Id, Account.IsDeleted)
Expand All @@ -663,11 +693,13 @@ private class SOQLCache_Test {
.allowFilteringByNonUniqueFields()
.whereEqual(Account.IsDeleted, false)
.toObject();


// Verify
Assert.isFalse(account1.IsDeleted, 'The cached account record should be false.');
Assert.isFalse(account2.IsDeleted, 'The cached account record should be false.');
Assert.areEqual(1, Limits.getQueries(), 'The number of queries should be 1.');
Test.stopTest();
}

@IsTest
Expand Down Expand Up @@ -997,20 +1029,25 @@ private class SOQLCache_Test {
SOQLCache.mock('ProfileQuery').thenReturn(null);

// Test
Test.startTest();
Profile profile = (Profile) SOQLCache.of(Profile.SObjectType)
.with(Profile.Id, Profile.Name)
.mockId('ProfileQuery')
.whereEqual(Profile.Name, 'Profile That Not Exist')
.toObject();


// Verify
Assert.isNull(profile, 'The profile should be null.');
Assert.areEqual(0, Limits.getQueries(), 'No query should be issued.');
Test.stopTest();
}

@IsTest
static void cachedRecordDoesNotHaveNecessaryFields() {

// Test
Test.startTest();
Profile profile1 = (Profile) SOQLCache.of(Profile.SObjectType)
.with(Profile.Id, Profile.Name)
.whereEqual(Profile.Name, SYSTEM_ADMINISTRATOR)
Expand All @@ -1023,8 +1060,11 @@ private class SOQLCache_Test {

List<SOQLCache.CacheItem> cachedProfiles = (List<SOQLCache.CacheItem>) CacheManager.ApexTransaction.get('Profile');



// Verify
Assert.areEqual(2, Limits.getQueries(), 'Two queries should be issued. The second query should retrieve the missing fields.');
Test.stopTest();

Assert.isFalse(cachedProfiles.isEmpty(), 'The Apex transaction cache should not be empty.');
Assert.areEqual(1, cachedProfiles.size(), 'The Apex transaction cache should contain exactly one record.');
Expand All @@ -1036,11 +1076,14 @@ private class SOQLCache_Test {
Assert.isTrue(profile2.isSet('Name'), 'The profile Name should not be set.');
Assert.isTrue(profile2.isSet('UserType'), 'The profile UserType should not be set.');
Assert.isTrue(profile2.isSet('UserLicenseId'), 'The profile UserLicenseId should not be set.');

}

@IsTest
static void cachedRecordMissingRelationshipField() {

// Test
Test.startTest();
Profile profile1 = (Profile) SOQLCache.of(Profile.SObjectType)
.with('UserLicense', UserLicense.Name)
.whereEqual(Profile.Name, SYSTEM_ADMINISTRATOR)
Expand All @@ -1053,8 +1096,11 @@ private class SOQLCache_Test {

List<SOQLCache.CacheItem> cachedProfiles = (List<SOQLCache.CacheItem>) CacheManager.ApexTransaction.get('Profile');



// Verify
Assert.areEqual(2, Limits.getQueries(), 'Two queries should be issued. The second query should retrieve the missing fields.');
Test.stopTest();

Assert.isFalse(cachedProfiles.isEmpty(), 'The Apex transaction cache should not be empty.');
Assert.areEqual(1, cachedProfiles.size(), 'The Apex transaction cache should contain exactly one record.');
Expand All @@ -1067,7 +1113,9 @@ private class SOQLCache_Test {

@IsTest
static void cachedRecordDoesNotHaveRelationshipField() {

// Test
Test.startTest();
Profile profile1 = (Profile) SOQLCache.of(Profile.SObjectType)
.with(Profile.Id, Profile.Name)
.whereEqual(Profile.Name, SYSTEM_ADMINISTRATOR)
Expand All @@ -1079,8 +1127,11 @@ private class SOQLCache_Test {
.whereEqual(Profile.Name, SYSTEM_ADMINISTRATOR)
.toObject();



// Verify
Assert.areEqual(2, Limits.getQueries(), 'Two queries should be issued. The second query should retrieve the missing relationship fields.');
Test.stopTest();

Assert.isNotNull(profile1.Id, 'The profile1 Id should not be null.');
Assert.isNotNull(profile1.Name, 'The profile1 Name should not be null.');
Expand All @@ -1092,7 +1143,9 @@ private class SOQLCache_Test {

@IsTest
static void withCommaSeparatedFieldsWereAlreadySet() {

// Test
Test.startTest();
SOQLCache.of(Profile.SObjectType)
.with('Id, Name, UserType, UserLicense.Name, UserLicense.Status')
.whereEqual(Profile.Name, SYSTEM_ADMINISTRATOR)
Expand All @@ -1105,6 +1158,7 @@ private class SOQLCache_Test {

// Verify
Assert.areEqual(1, Limits.getQueries(), 'Only one query should be issued. The second query should not be executed, because the first query set all necessary fields.');
Test.stopTest();
}

@IsTest
Expand Down
20 changes: 10 additions & 10 deletions force-app/main/default/classes/standard-soql/SOQL_Test.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2119,7 +2119,7 @@ private class SOQL_Test {

// Test
List<AggregateResult> results = SOQL.of(Account.SObjectType)
.count(Account.Name, 'names')
.count(Account.Id, 'names')
.groupBy('Account.CreatedBy', User.Id)
.toAggregated();

Expand All @@ -2134,7 +2134,7 @@ private class SOQL_Test {

// Test
List<SOQL.AggregateResultProxy> results = SOQL.of(Account.SObjectType)
.count(Account.Name, 'names')
.count(Account.Id, 'names')
.groupBy('Account.CreatedBy', User.Id)
.toAggregatedProxy();

Expand Down Expand Up @@ -4193,8 +4193,8 @@ private class SOQL_Test {
// Test
Set<Id> parentIds = SOQL.of(Account.SObjectType)
.byIds(accounts)
.whereAre(SOQL.Filter.with(Account.Name).contains('Test 1'))
.whereAre(SOQL.Filter.with(Account.Name).equal('Test 1'))
.whereAre(SOQL.Filter.with(Account.Name).equal('Test 1.1'))
.conditionLogic('1 AND (2 OR 3)')
.toIdsOf(Account.ParentId);

Expand Down Expand Up @@ -4385,7 +4385,7 @@ private class SOQL_Test {
List<Account> accounts = insertAccounts();

// Test
Set<String> accountNames = SOQL.of(Account.SObjectType).byIds(accounts).toValuesOf(Account.Name);
Set<String> accountNames = SOQL.of(Account.SObjectType).byIds(accounts).toValuesOf(Account.Id);

// Verify
Assert.areEqual(2, accountNames.size(), 'The size of the account names set should be equal to the size of the accounts.');
Expand All @@ -4399,10 +4399,10 @@ private class SOQL_Test {
// Test
Set<String> accountNames = SOQL.of(Account.SObjectType)
.byIds(accounts)
.whereAre(SOQL.Filter.with(Account.Name).contains('Test 1'))
.whereAre(SOQL.Filter.with(Account.Name).equal('Test 1'))
.whereAre(SOQL.Filter.with(Account.Name).equal('Test 1.1'))
.conditionLogic('1 AND (2 OR 3)')
.toValuesOf(Account.Name);
.toValuesOf(Account.Id);

// Verify
Assert.areEqual(1, accountNames.size(), 'Only one account should be returned, because the Name condition is matched.');
Expand All @@ -4429,7 +4429,7 @@ private class SOQL_Test {
Set<String> accountNames = SOQL.of(Account.SObjectType)
.with(Account.Industry)
.byIds(accounts)
.toValuesOf(Account.Name);
.toValuesOf(Account.Id);

// Verify
Assert.areEqual(2, accountNames.size(), 'The size of the account names set should be equal to the size of the accounts.');
Expand All @@ -4454,7 +4454,7 @@ private class SOQL_Test {
// Test
Set<String> accountNames = SOQL.of(Account.SObjectType)
.byIds(accounts)
.toValuesOf('Parent', Account.Name);
.toValuesOf('Parent', Account.Id);

// Verify
Assert.areEqual(2, accountNames.size(), 'Each account should have a parent, so the size of the account names set should be equal to the size of the accounts.');
Expand All @@ -4465,7 +4465,7 @@ private class SOQL_Test {
// Test
Set<String> accountNames = SOQL.of(Account.SObjectType)
.whereAre(SOQL.Filter.name().equal('Test'))
.toValuesOf('Parent', Account.Name);
.toValuesOf('Parent', Account.Id);

// Verify
Assert.isTrue(accountNames.isEmpty(), 'The account names set should be empty, because the related record does not exist.');
Expand Down Expand Up @@ -4529,7 +4529,7 @@ private class SOQL_Test {
List<Account> accounts = insertAccounts();

// Test
List<AggregateResult> result = SOQL.of(Account.SObjectType).count(Account.Name, 'names').toAggregated();
List<AggregateResult> result = SOQL.of(Account.SObjectType).count(Account.Id, 'names').toAggregated();

// Verify
Assert.areEqual(accounts.size(), result[0].get('names'), 'The count of the names should be equal to the size of the inserted accounts.');
Expand Down