diff --git a/sfdx-source/apex-common/main/classes/fflib_SObjectDomain.cls b/sfdx-source/apex-common/main/classes/fflib_SObjectDomain.cls index bd982249d4..8b7616f580 100644 --- a/sfdx-source/apex-common/main/classes/fflib_SObjectDomain.cls +++ b/sfdx-source/apex-common/main/classes/fflib_SObjectDomain.cls @@ -932,7 +932,7 @@ public virtual with sharing class fflib_SObjectDomain public override void onAfterInsert() { // This is a stateless domain class, so should not retain anything betweet before and after - System.assertEquals(null, someState); + Assert.areEqual(null, someState); } } @@ -966,7 +966,7 @@ public virtual with sharing class fflib_SObjectDomain public override void onBeforeInsert() { // This must always be null, as we do not reuse domain instances within recursive scenarios (different record sets) - System.assertEquals(null, someState); + Assert.areEqual(null, someState); // Process records List newOpps = new List(); diff --git a/sfdx-source/apex-common/test/classes/fflib_ApplicationTest.cls b/sfdx-source/apex-common/test/classes/fflib_ApplicationTest.cls index af1dd15274..dedefbea41 100644 --- a/sfdx-source/apex-common/test/classes/fflib_ApplicationTest.cls +++ b/sfdx-source/apex-common/test/classes/fflib_ApplicationTest.cls @@ -38,8 +38,8 @@ private class fflib_ApplicationTest { new Account( Id = testAccountId, Name = 'Test Account') }); - System.assert(domainObjectAcct instanceof AccountsDomain); - System.assertEquals(testAccountId, getFirstSObject(domainObjectAcct).Id); + Assert.isInstanceOfType(domainObjectAcct, AccountsDomain.class); + Assert.areEqual(testAccountId, getFirstSObject(domainObjectAcct).Id); // Registered Accounts domain class by SObject List testAccountId = fflib_IDGenerator.generate(Account.SObjectType); @@ -50,8 +50,8 @@ private class fflib_ApplicationTest Id = testAccountId, Name = 'Test Account') } , Account.SObjectType); - System.assert(domainObjectAcct instanceof AccountsDomain); - System.assertEquals(testAccountId, getFirstSObject(domainObjectAcct).Id); + Assert.isInstanceOfType(domainObjectAcct, AccountsDomain.class); + Assert.areEqual(testAccountId, getFirstSObject(domainObjectAcct).Id); // Registered Opportunities domain class by SObject List Id testOpportunityId = fflib_IDGenerator.generate(Opportunity.SObjectType); @@ -61,8 +61,8 @@ private class fflib_ApplicationTest { new Opportunity( Id = testOpportunityId, Name = 'Test Opportunity') }); - System.assertEquals(testOpportunityId, getFirstSObject(domainObjectOpp).Id); - System.assert(domainObjectOpp instanceof OpportuntiesDomain); + Assert.areEqual(testOpportunityId, getFirstSObject(domainObjectOpp).Id); + Assert.isInstanceOfType(domainObjectOpp, OpportunitiesDomain.class); // Test failure for creating new instance using IConstructable2 // for domain class that does not support it @@ -74,8 +74,8 @@ private class fflib_ApplicationTest Id = testOpportunityId, Name = 'Test Opportunity') } , Opportunity.SObjectType); - System.assertEquals(testOpportunityId, getFirstSObject(domainObjectOpp).Id); - System.assert(domainObjectOpp instanceof OpportuntiesDomain); + Assert.areEqual(testOpportunityId, getFirstSObject(domainObjectOpp).Id); + Assert.isInstanceOfType(domainObjectOpp, OpportunitiesDomain.class); // Given fflib_ApexMocks mocks = new fflib_ApexMocks(); @@ -94,7 +94,7 @@ private class fflib_ApplicationTest Name = 'Test Account') }); // Then - System.assert(domainObjectAcct instanceof fflib_SObjectMocks.SObjectDomain); + Assert.isInstanceOfType(domainObjectAcct, fflib_SObjectMocks.SObjectDomain.class); // When domainObjectAcct = @@ -106,7 +106,7 @@ private class fflib_ApplicationTest , Account.SObjectType); // Then - System.assert(domainObjectAcct instanceof fflib_SObjectMocks.SObjectDomain); + Assert.isInstanceOfType(domainObjectAcct, fflib_SObjectMocks.SObjectDomain.class); } private static SObject getFirstSObject(fflib_IDomain domainObjectAcct) @@ -138,11 +138,11 @@ private class fflib_ApplicationTest // Then List assertAccounts = (List) domainObjectAcc.getObjects(); - System.assert(domainObjectAcc instanceof AccountsDomain); - System.assertEquals(testAccountId, getFirstSObject(domainObjectAcc).Id); - System.assertEquals(1, assertAccounts.size()); - System.assertEquals(testAccountId, assertAccounts[0].Id); - System.assertEquals('Test Account', assertAccounts[0].Name); + Assert.isInstanceOfType(domainObjectAcc, AccountsDomain.class); + Assert.areEqual(testAccountId, getFirstSObject(domainObjectAcc).Id); + Assert.areEqual(1, assertAccounts.size()); + Assert.areEqual(testAccountId, assertAccounts[0].Id); + Assert.areEqual('Test Account', assertAccounts[0].Name); } @IsTest @@ -150,9 +150,9 @@ private class fflib_ApplicationTest { try { Domain.newInstance(new List()); - System.assert(false, 'Expected exception'); + Assert.fail('Expected exception'); } catch (fflib_Application.DeveloperException e) { - System.assertEquals('Unable to determine SObjectType', e.getMessage()); + Assert.areEqual('Unable to determine SObjectType', e.getMessage()); } } @@ -161,9 +161,9 @@ private class fflib_ApplicationTest { try { Domain.newInstance(new List(), null); - System.assert(false, 'Expected exception'); + Assert.fail('Expected exception'); } catch (fflib_Application.DeveloperException e) { - System.assertEquals('Must specify sObjectType', e.getMessage()); + Assert.areEqual('Must specify sObjectType', e.getMessage()); } } @@ -172,16 +172,16 @@ private class fflib_ApplicationTest { try { Domain.newInstance(new List{ new Product2(Name = 'Test Product') }); - System.assert(false, 'Expected exception'); + Assert.fail('Expected exception'); } catch (fflib_Application.DeveloperException e) { - System.assertEquals('Domain constructor class not found for SObjectType Product2', e.getMessage()); + Assert.areEqual('Domain constructor class not found for SObjectType Product2', e.getMessage()); } try { Domain.newInstance(new List{ new Product2(Name = 'Test Product') }, Product2.SObjectType); - System.assert(false, 'Expected exception'); + Assert.fail('Expected exception'); } catch (fflib_Application.DeveloperException e) { - System.assertEquals('Domain constructor class not found for SObjectType Product2', e.getMessage()); + Assert.areEqual('Domain constructor class not found for SObjectType Product2', e.getMessage()); } } @@ -190,18 +190,18 @@ private class fflib_ApplicationTest { try { Domain.newInstance(new List{ new Contact(LastName = 'TestContactLName') }); - System.assert(false, 'Expected exception'); + Assert.fail('Expected exception'); } catch (System.TypeException e) { - System.assert(Pattern.Matches('Invalid conversion from runtime type \\w*\\.?fflib_ApplicationTest\\.ContactsConstructor to \\w*\\.?fflib_IDomainConstructor', + Assert.isTrue(Pattern.Matches('Invalid conversion from runtime type \\w*\\.?fflib_ApplicationTest\\.ContactsConstructor to \\w*\\.?fflib_IDomainConstructor', e.getMessage()), 'Exception message did not match the expected pattern: ' + e.getMessage()); } try { Domain.newInstance(new List{ new Contact(LastName = 'TestContactLName') }, Contact.SObjectType); - System.assert(false, 'Expected exception'); + Assert.fail('Expected exception'); } catch (System.TypeException e) { - System.assert(Pattern.Matches('Invalid conversion from runtime type \\w*\\.?fflib_ApplicationTest\\.ContactsConstructor to \\w*\\.?fflib_IDomainConstructor', + Assert.isTrue(Pattern.Matches('Invalid conversion from runtime type \\w*\\.?fflib_ApplicationTest\\.ContactsConstructor to \\w*\\.?fflib_IDomainConstructor', e.getMessage()), 'Exception message did not match the expected pattern: ' + e.getMessage()); } } @@ -210,60 +210,60 @@ private class fflib_ApplicationTest private static void callingUnitOfWorkFactoryShouldGivenStandardImplsAndMockImpls() { // Standard behaviour - System.assert(UnitOfWork.newInstance() instanceof fflib_SObjectUnitOfWork); + Assert.isInstanceOfType(UnitOfWork.newInstance(), fflib_SObjectUnitOfWork.class); // Mocking behaviour UnitOfWork.setMock(new fflib_SObjectMocks.SObjectUnitOfWork(new fflib_ApexMocks())); - System.assert(UnitOfWork.newInstance() instanceof fflib_SObjectMocks.SObjectUnitOfWork); + Assert.isInstanceOfType(UnitOfWork.newInstance(), fflib_SObjectMocks.SObjectUnitOfWork.class); } @IsTest private static void callingUnitOfWorkFactoryWithCustomTypesShouldGivenStandardImplsAndMockImpls() { // Standard behaviour - System.assert( + Assert.isInstanceOfType( UnitOfWork.newInstance( new List{ Account.SObjectType} - ) instanceof fflib_SObjectUnitOfWork); + ), fflib_SObjectUnitOfWork.class); // Mocking behaviour UnitOfWork.setMock(new fflib_SObjectMocks.SObjectUnitOfWork(new fflib_ApexMocks())); - System.assert( + Assert.isInstanceOfType( UnitOfWork.newInstance( new List{ Account.SObjectType} - ) instanceof fflib_SObjectMocks.SObjectUnitOfWork); + ), fflib_SObjectMocks.SObjectUnitOfWork.class); } @IsTest private static void callingServiceFactoryShouldGiveRegisteredImplsAndMockImpls() { // Standard behaviour - System.assert(Service.newInstance(IAccountService.class) instanceof AccountsServiceImpl); - System.assert(Service.newInstance(IOpportunitiesService.class) instanceof OpportunitiesServiceImpl); + Assert.isInstanceOfType(Service.newInstance(IAccountService.class), AccountsServiceImpl.class); + Assert.isInstanceOfType(Service.newInstance(IOpportunitiesService.class), OpportunitiesServiceImpl.class); try { Service.newInstance(IContactService.class); - System.assert(false, 'Expected exception'); + Assert.fail('Expected exception'); } catch (fflib_Application.DeveloperException e) { - System.assertEquals('No implementation registered for service interface ' + IContactService.class.getName(), e.getMessage()); + Assert.areEqual('No implementation registered for service interface ' + IContactService.class.getName(), e.getMessage()); } // Mocking behaviour Service.setMock(IAccountService.class, new AccountsServiceMock()); - System.assert(Service.newInstance(IOpportunitiesService.class) instanceof OpportunitiesServiceImpl); - System.assert(Service.newInstance(IAccountService.class) instanceof AccountsServiceMock); + Assert.isInstanceOfType(Service.newInstance(IOpportunitiesService.class), OpportunitiesServiceImpl.class); + Assert.isInstanceOfType(Service.newInstance(IAccountService.class), AccountsServiceMock.class); } @IsTest private static void callingSelectorFactoryShouldGiveRegisteredImpls() { // Standard behaviour - System.assert(Selector.newInstance(Account.SObjectType) instanceof AccountsSelector); - System.assert(Selector.newInstance(Opportunity.SObjectType) instanceof OpportuntiesSelector); + Assert.isInstanceOfType(Selector.newInstance(Account.SObjectType), AccountsSelector.class); + Assert.isInstanceOfType(Selector.newInstance(Opportunity.SObjectType), OpportunitiesSelector.class); try { Selector.newInstance(User.SObjectType); - System.assert(false, 'Expected exception'); + Assert.fail('Expected exception'); } catch (fflib_Application.DeveloperException e) { - System.assertEquals('Selector class not found for SObjectType User', e.getMessage()); + Assert.areEqual('Selector class not found for SObjectType User', e.getMessage()); } } @@ -272,15 +272,15 @@ private class fflib_ApplicationTest { try { Selector.selectById(null); - System.assert(false, 'Expected exception'); + Assert.fail('Expected exception'); } catch (fflib_Application.DeveloperException e) { - System.assertEquals('Invalid record Id\'s set', e.getMessage()); + Assert.areEqual('Invalid record Id\'s set', e.getMessage()); } try { Selector.selectById(new Set()); - System.assert(false, 'Expected exception'); + Assert.fail('Expected exception'); } catch (fflib_Application.DeveloperException e) { - System.assertEquals('Invalid record Id\'s set', e.getMessage()); + Assert.areEqual('Invalid record Id\'s set', e.getMessage()); } } @@ -292,9 +292,9 @@ private class fflib_ApplicationTest new Set { fflib_IDGenerator.generate(Opportunity.SObjectType), fflib_IDGenerator.generate(Account.SObjectType) }); - System.assert(true, 'Expected exception'); + Assert.fail('Expected exception'); } catch (fflib_Application.DeveloperException e) { - System.assertEquals('Unable to determine SObjectType, Set contains Id\'s from different SObject types', e.getMessage()); + Assert.areEqual('Unable to determine SObjectType, Set contains Id\'s from different SObject types', e.getMessage()); } } @@ -321,11 +321,11 @@ private class fflib_ApplicationTest List assertAccounts = Selector.selectById(accountIds); // Then - System.assert(Selector.newInstance(Account.SObjectType) instanceof fflib_SObjectMocks.SObjectSelector); - System.assertEquals(1, assertAccounts.size()); - System.assertEquals(testAccountId, assertAccounts[0].Id); - System.assertEquals('Test Account', assertAccounts[0].Name); - System.assert(Selector.newInstance(Opportunity.SObjectType) instanceof OpportuntiesSelector); + Assert.isInstanceOfType(Selector.newInstance(Account.SObjectType), fflib_SObjectMocks.SObjectSelector.class); + Assert.areEqual(1, assertAccounts.size()); + Assert.areEqual(testAccountId, assertAccounts[0].Id); + Assert.areEqual('Test Account', assertAccounts[0].Name); + Assert.isInstanceOfType(Selector.newInstance(Opportunity.SObjectType), OpportunitiesSelector.class); } @@ -350,7 +350,7 @@ private class fflib_ApplicationTest Selector.setMock(selectorMock); // When - List opportunties = + List opportunities = new List { new Opportunity( Id = testOpportunityId, @@ -360,14 +360,14 @@ private class fflib_ApplicationTest new Opportunity( Id = testOpportunityId, Name = 'Test Opportunity 2') }; - List assertAccounts = Selector.selectByRelationship(opportunties, Opportunity.AccountId); + List assertAccounts = Selector.selectByRelationship(opportunities, Opportunity.AccountId); // Then - System.assert(Selector.newInstance(Account.SObjectType) instanceof fflib_SObjectMocks.SObjectSelector); - System.assertEquals(1, assertAccounts.size()); - System.assertEquals(testAccountId, assertAccounts[0].Id); - System.assertEquals('Test Account', assertAccounts[0].Name); - System.assert(Selector.newInstance(Opportunity.SObjectType) instanceof OpportuntiesSelector); + Assert.isInstanceOfType(Selector.newInstance(Account.SObjectType), fflib_SObjectMocks.SObjectSelector.class); + Assert.areEqual(1, assertAccounts.size()); + Assert.areEqual(testAccountId, assertAccounts[0].Id); + Assert.areEqual('Test Account', assertAccounts[0].Name); + Assert.isInstanceOfType(Selector.newInstance(Opportunity.SObjectType), OpportunitiesSelector.class); } @@ -384,7 +384,7 @@ private class fflib_ApplicationTest unitOfWork.commitWork(); // Then the Custom DML is used by the unit of Work - System.assert(customDML.isInsertCalled, 'Oops, custom DML was not called'); + Assert.isTrue(customDML.isInsertCalled, 'Oops, custom DML was not called'); } @IsTest @@ -402,7 +402,7 @@ private class fflib_ApplicationTest uow.commitWork(); // Then the Custom DML should not be used by the unit of Work - System.assert(!customDML.isInsertCalled, 'Oops, custom DML was called'); + Assert.isFalse(customDML.isInsertCalled, 'Oops, custom DML was called'); } @IsTest @@ -421,7 +421,7 @@ private class fflib_ApplicationTest unitOfWork.commitWork(); // Then the Custom DML is used by the unit of Work - System.assert(customDML.isInsertCalled, 'Oops, custom DML was not called'); + Assert.isTrue(customDML.isInsertCalled, 'Oops, custom DML was not called'); } @IsTest @@ -441,7 +441,7 @@ private class fflib_ApplicationTest uow.commitWork(); // Then the Custom DML should not be used by the unit of Work - System.assert(!customDML.isInsertCalled, 'Oops, custom DML was called'); + Assert.isFalse(customDML.isInsertCalled, 'Oops, custom DML was called'); } public class CustomDML implements fflib_SObjectUnitOfWork.IDML @@ -491,7 +491,7 @@ private class fflib_ApplicationTest new fflib_Application.SelectorFactory( new Map { Account.SObjectType => AccountsSelector.class, - Opportunity.SObjectType => OpportuntiesSelector.class }); + Opportunity.SObjectType => OpportunitiesSelector.class }); // Configure and create the DomainFactory for this Application public static final fflib_Application.DomainFactory Domain = @@ -499,7 +499,7 @@ private class fflib_ApplicationTest fflib_ApplicationTest.Selector, new Map { Account.SObjectType => AccountsConstructor.class, - Opportunity.SObjectType => OpportuntiesConstructor.class, + Opportunity.SObjectType => OpportunitiesConstructor.class, Contact.SObjectType => ContactsConstructor.class }); public class AccountsDomain extends fflib_SObjectDomain @@ -528,29 +528,29 @@ private class fflib_ApplicationTest } } - public class OpportuntiesDomain extends fflib_SObjectDomain + public class OpportunitiesDomain extends fflib_SObjectDomain { - public OpportuntiesDomain(List sObjectList) + public OpportunitiesDomain(List sObjectList) { super(sObjectList); } - public OpportuntiesDomain(List sObjectList, SObjectType sObjectType) + public OpportunitiesDomain(List sObjectList, SObjectType sObjectType) { super(sObjectList, sObjectType); } } - public class OpportuntiesConstructor implements fflib_SObjectDomain.IConstructable2 + public class OpportunitiesConstructor implements fflib_SObjectDomain.IConstructable2 { public fflib_SObjectDomain construct(List sObjectList) { - return new OpportuntiesDomain(sObjectList); + return new OpportunitiesDomain(sObjectList); } public fflib_SObjectDomain construct(List sObjectList, SObjectType sObjectType) { - return new OpportuntiesDomain(sObjectList, sObjectType); + return new OpportunitiesDomain(sObjectList, sObjectType); } } @@ -573,7 +573,7 @@ private class fflib_ApplicationTest } - class OpportuntiesSelector extends fflib_SObjectSelector + class OpportunitiesSelector extends fflib_SObjectSelector { public List getSObjectFieldList() { diff --git a/sfdx-source/apex-common/test/classes/fflib_ObjectsTest.cls b/sfdx-source/apex-common/test/classes/fflib_ObjectsTest.cls index 91454ef0c3..a94663fca4 100644 --- a/sfdx-source/apex-common/test/classes/fflib_ObjectsTest.cls +++ b/sfdx-source/apex-common/test/classes/fflib_ObjectsTest.cls @@ -43,7 +43,7 @@ private class fflib_ObjectsTest } ); - System.assertEquals( + Assert.areEqual( DataTransferObject.class, dtoDomain.getType(), 'Wrong domain type' @@ -62,7 +62,7 @@ private class fflib_ObjectsTest } ); - System.assert( + Assert.isTrue( dtoDomain.contains(transferObject), 'The object should have been part of the domain' ); @@ -73,7 +73,7 @@ private class fflib_ObjectsTest { fflib_ObjectsTest.Domain dtoDomain = generateDomain(); - System.assert( + Assert.isTrue( dtoDomain.containsNot(TRANSFER_OBJECT_D), 'The object should not have been part of the domain' ); @@ -89,7 +89,7 @@ private class fflib_ObjectsTest TRANSFER_OBJECT_B }); - System.assert( + Assert.isTrue( dtoDomain.containsNot( new Set { @@ -98,7 +98,7 @@ private class fflib_ObjectsTest }), 'The set of objects should not have been part of the domain' ); - System.assert( + Assert.isTrue( dtoDomain.containsNot( new List { @@ -113,15 +113,15 @@ private class fflib_ObjectsTest static void itShouldHaveAnEmptyDomain() { fflib_ObjectsTest.Domain dtoDomain = new Domain(new List()); - System.assert(dtoDomain.isEmpty(), 'Domain should be empty'); + Assert.isTrue(dtoDomain.isEmpty(), 'Domain should be empty'); } @IsTest static void itShouldNotBeAnEmptyDomain() { fflib_ObjectsTest.Domain dtoDomain = generateDomain(); - System.assert(dtoDomain.isNotEmpty(), 'Domain should not be empty'); - System.assertEquals(3, dtoDomain.size(), 'Incorrect amount of records in the domain'); + Assert.isTrue(dtoDomain.isNotEmpty(), 'Domain should not be empty'); + Assert.areEqual(3, dtoDomain.size(), 'Incorrect amount of records in the domain'); } @IsTest @@ -129,7 +129,7 @@ private class fflib_ObjectsTest { fflib_ObjectsTest.Domain dtoDomain = generateDomain(); - System.assert( + Assert.isTrue( dtoDomain.containsAll( new List { @@ -139,7 +139,7 @@ private class fflib_ObjectsTest ), 'Domain should contain the whole List of objects' ); - System.assert( + Assert.isTrue( dtoDomain.containsAll( new Set { @@ -155,7 +155,7 @@ private class fflib_ObjectsTest static void itShouldGetTheObjectType() { fflib_Objects domain = new fflib_Objects(new List()); - System.assertEquals(Object.class, domain.getType(), 'Incorrect returned type'); + Assert.areEqual(Object.class, domain.getType(), 'Incorrect returned type'); } private static Domain generateDomain() diff --git a/sfdx-source/apex-common/test/classes/fflib_QueryFactoryTest.cls b/sfdx-source/apex-common/test/classes/fflib_QueryFactoryTest.cls index b9c83a6ba7..393920ea60 100644 --- a/sfdx-source/apex-common/test/classes/fflib_QueryFactoryTest.cls +++ b/sfdx-source/apex-common/test/classes/fflib_QueryFactoryTest.cls @@ -35,7 +35,7 @@ private class fflib_QueryFactoryTest { qf.selectFields( new Set{'acCounTId', 'account.name'} ); qf.selectFields( new List{'homePhonE','fAX'} ); qf.selectFields( new List{ Contact.Email, Contact.Title } ); - System.assertEquals(new Set{ + Assert.areEqual(new Set{ 'FirstName', 'LastName', 'AccountId', @@ -52,11 +52,11 @@ private class fflib_QueryFactoryTest { fflib_QueryFactory qf = new fflib_QueryFactory(Contact.SObjectType); qf.selectField('NAMe').selectFields( new Set{'naMe', 'email'}); String query = qf.toSOQL(); - System.assert( Pattern.matches('SELECT.*Name.*FROM.*',query), 'Expected Name field in query, got '+query); - System.assert( Pattern.matches('SELECT.*Email.*FROM.*',query), 'Expected Name field in query, got '+query); + Assert.isTrue( Pattern.matches('SELECT.*Name.*FROM.*',query), 'Expected Name field in query, got '+query); + Assert.isTrue( Pattern.matches('SELECT.*Email.*FROM.*',query), 'Expected Name field in query, got '+query); qf.setLimit(100); - System.assertEquals(100,qf.getLimit()); - System.assert( qf.toSOQL().endsWithIgnoreCase('LIMIT '+qf.getLimit()), 'Failed to respect limit clause:'+qf.toSOQL() ); + Assert.areEqual(100,qf.getLimit()); + Assert.isTrue( qf.toSOQL().endsWithIgnoreCase('LIMIT '+qf.getLimit()), 'Failed to respect limit clause:'+qf.toSOQL() ); } @isTest @@ -66,9 +66,9 @@ private class fflib_QueryFactoryTest { qf.selectField('name'); qf.selectField('email'); qf.setCondition( whereClause ); - System.assertEquals(whereClause,qf.getCondition()); + Assert.areEqual(whereClause,qf.getCondition()); String query = qf.toSOQL(); - System.assert(query.endsWith('WHERE name = \'test\''),'Query should have ended with a filter on name, got: '+query); + Assert.isTrue(query.endsWith('WHERE name = \'test\''),'Query should have ended with a filter on name, got: '+query); } @isTest @@ -76,20 +76,20 @@ private class fflib_QueryFactoryTest { fflib_QueryFactory qf = new fflib_QueryFactory(Contact.SObjectType); qf.selectField('NAMe').selectFields( new Set{'naMe', 'email'}); String query = qf.toSOQL(); - System.assertEquals(1, query.countMatches('Name'), 'Expected one name field in query: '+query ); + Assert.areEqual(1, query.countMatches('Name'), 'Expected one name field in query: '+query ); } @isTest static void equalityCheck(){ fflib_QueryFactory qf1 = new fflib_QueryFactory(Contact.SObjectType); fflib_QueryFactory qf2 = new fflib_QueryFactory(Contact.SObjectType); - System.assertEquals(qf1,qf2); + Assert.areEqual(qf1,qf2); qf1.selectField('name'); - System.assertNotEquals(qf1,qf2); + Assert.areNotEqual(qf1,qf2); qf2.selectField('NAmE'); - System.assertEquals(qf1,qf2); + Assert.areEqual(qf1,qf2); qf1.selectField('name').selectFields( new Set{ 'NAME', 'name' }).selectFields( new Set{ Contact.Name, Contact.Name} ); - System.assertEquals(qf1,qf2); + Assert.areEqual(qf1,qf2); } @isTest @@ -101,7 +101,7 @@ private class fflib_QueryFactoryTest { }catch(fflib_QueryFactory.NonReferenceFieldException ex){ e = ex; } - System.assertNotEquals(null,e,'Cross-object notation on a non-reference field should throw NonReferenceFieldException.'); + Assert.areNotEqual(null,e,'Cross-object notation on a non-reference field should throw NonReferenceFieldException.'); } @isTest @@ -113,7 +113,7 @@ private class fflib_QueryFactoryTest { }catch(fflib_QueryFactory.InvalidFieldException ex){ e = ex; } - System.assertNotEquals(null,e,'Cross-object notation on a non-reference field should throw NonReferenceFieldException.'); + Assert.areNotEqual(null,e,'Cross-object notation on a non-reference field should throw NonReferenceFieldException.'); } @isTest @@ -140,7 +140,7 @@ private class fflib_QueryFactoryTest { }catch(fflib_QueryFactory.InvalidFieldException e){ exceptions.add(e); } - System.assertEquals(4,exceptions.size()); + Assert.areEqual(4, exceptions.size(), 'Expected 4 InvalidFieldExceptions to be thrown'); } @isTest @@ -152,13 +152,13 @@ private class fflib_QueryFactoryTest { qf.addOrdering( new fflib_QueryFactory.Ordering('Contact','name',fflib_QueryFactory.SortOrder.ASCENDING) ).addOrdering( new fflib_QueryFactory.Ordering('Contact','CreatedDATE',fflib_QueryFactory.SortOrder.DESCENDING) ); String query = qf.toSOQL(); - System.assertEquals(2,qf.getOrderings().size()); - System.assertEquals('Name',qf.getOrderings()[0].getField() ); - System.assertEquals(fflib_QueryFactory.SortOrder.DESCENDING,qf.getOrderings()[1].getDirection() ); + Assert.areEqual(2,qf.getOrderings().size()); + Assert.areEqual('Name',qf.getOrderings()[0].getField() ); + Assert.areEqual(fflib_QueryFactory.SortOrder.DESCENDING,qf.getOrderings()[1].getDirection() ); - System.assert( Pattern.matches('SELECT.*Name.*FROM.*',query), 'Expected Name field in query, got '+query); - System.assert( Pattern.matches('SELECT.*Email.*FROM.*',query), 'Expected Name field in query, got '+query); + Assert.isTrue(Pattern.matches('SELECT.*Name.*FROM.*',query), 'Expected Name field in query, got '+query); + Assert.isTrue(Pattern.matches('SELECT.*Email.*FROM.*',query), 'Expected Email field in query, got '+query); } @isTest @@ -171,36 +171,36 @@ private class fflib_QueryFactoryTest { //test base method with ordeting by OwnerId Descending qf.setOrdering( new fflib_QueryFactory.Ordering('Contact','OwnerId',fflib_QueryFactory.SortOrder.DESCENDING) ); - System.assertEquals(1, qf.getOrderings().size(), 'Unexpected order size - setOrder should replace default Orderings'); - System.assertEquals(Contact.OwnerId.getDescribe().getName(), qf.getOrderings()[0].getField(), 'Unexpected order field - should have been resolved from the field OwnerId'); - System.assertEquals(fflib_QueryFactory.SortOrder.DESCENDING, qf.getOrderings()[0].getDirection(), 'Unexpected order direction.'); + Assert.areEqual(1, qf.getOrderings().size(), 'Unexpected order size - setOrder should replace default Orderings'); + Assert.areEqual(Contact.OwnerId.getDescribe().getName(), qf.getOrderings()[0].getField(), 'Unexpected order field - should have been resolved from the field OwnerId'); + Assert.areEqual(fflib_QueryFactory.SortOrder.DESCENDING, qf.getOrderings()[0].getDirection(), 'Unexpected order direction.'); //test method overload with ordering by LastModifiedDate Ascending qf.setOrdering('LastModifiedDate', fflib_QueryFactory.SortOrder.ASCENDING, true); - System.assertEquals(1, qf.getOrderings().size(), 'Unexpected order size - setOrder should replace previous Orderings'); - System.assertEquals(Contact.LastModifiedDate.getDescribe().getName(), qf.getOrderings()[0].getField(), 'Unexpected order field - should have been resolved from the field LastModifiedDate'); - System.assertEquals(fflib_QueryFactory.SortOrder.ASCENDING, qf.getOrderings()[0].getDirection(), 'Unexpected order direction.'); + Assert.areEqual(1, qf.getOrderings().size(), 'Unexpected order size - setOrder should replace previous Orderings'); + Assert.areEqual(Contact.LastModifiedDate.getDescribe().getName(), qf.getOrderings()[0].getField(), 'Unexpected order field - should have been resolved from the field LastModifiedDate'); + Assert.areEqual(fflib_QueryFactory.SortOrder.ASCENDING, qf.getOrderings()[0].getDirection(), 'Unexpected order direction.'); //test method overload with ordering by CreatedDate Descending qf.setOrdering(Contact.CreatedDate, fflib_QueryFactory.SortOrder.DESCENDING, true); - System.assertEquals(1, qf.getOrderings().size(), 'Unexpected order size - setOrder should replace previous Orderings'); - System.assertEquals(Contact.CreatedDate.getDescribe().getName(), qf.getOrderings()[0].getField(), 'Unexpected order field - should have been resolved from the field CreatedDate'); - System.assertEquals(fflib_QueryFactory.SortOrder.DESCENDING, qf.getOrderings()[0].getDirection(), 'Unexpected order direction.'); + Assert.areEqual(1, qf.getOrderings().size(), 'Unexpected order size - setOrder should replace previous Orderings'); + Assert.areEqual(Contact.CreatedDate.getDescribe().getName(), qf.getOrderings()[0].getField(), 'Unexpected order field - should have been resolved from the field CreatedDate'); + Assert.areEqual(fflib_QueryFactory.SortOrder.DESCENDING, qf.getOrderings()[0].getDirection(), 'Unexpected order direction.'); //test method overload with ordering by CreatedBy.Name Descending qf.setOrdering('CreatedBy.Name', fflib_QueryFactory.SortOrder.DESCENDING); - System.assertEquals(1, qf.getOrderings().size(), 'Unexpected order size - setOrder should replace previous Orderings'); - System.assertEquals(fflib_QueryFactory.SortOrder.DESCENDING, qf.getOrderings()[0].getDirection(), 'Unexpected order direction.'); + Assert.areEqual(1, qf.getOrderings().size(), 'Unexpected order size - setOrder should replace previous Orderings'); + Assert.areEqual(fflib_QueryFactory.SortOrder.DESCENDING, qf.getOrderings()[0].getDirection(), 'Unexpected order direction.'); //test method overload with ordering by Birthdate Ascending qf.setOrdering(Contact.Birthdate, fflib_QueryFactory.SortOrder.ASCENDING); - System.assertEquals(1, qf.getOrderings().size(), 'Unexpected order size - setOrder should replace previous Orderings'); - System.assertEquals(Contact.Birthdate.getDescribe().getName(), qf.getOrderings()[0].getField(), 'Unexpected order field - should have been resolved from the field Birthdate'); - System.assertEquals(fflib_QueryFactory.SortOrder.ASCENDING, qf.getOrderings()[0].getDirection(), 'Unexpected order direction.'); + Assert.areEqual(1, qf.getOrderings().size(), 'Unexpected order size - setOrder should replace previous Orderings'); + Assert.areEqual(Contact.Birthdate.getDescribe().getName(), qf.getOrderings()[0].getField(), 'Unexpected order field - should have been resolved from the field Birthdate'); + Assert.areEqual(fflib_QueryFactory.SortOrder.ASCENDING, qf.getOrderings()[0].getDirection(), 'Unexpected order direction.'); String query = qf.toSOQL(); } @@ -215,7 +215,7 @@ private class fflib_QueryFactoryTest { }catch(fflib_QueryFactory.InvalidFieldException ex){ e = ex; } - System.assertNotEquals(null,e); + Assert.areNotEqual(null,e); } @isTest @@ -228,7 +228,7 @@ private class fflib_QueryFactoryTest { }catch(fflib_QueryFactory.InvalidFieldException ex){ e = ex; } - System.assertNotEquals(null,e); + Assert.areNotEqual(null,e); } @isTest @@ -242,7 +242,7 @@ private class fflib_QueryFactoryTest { }catch(fflib_QueryFactory.InvalidFieldException ex){ e = ex; } - System.assertNotEquals(null,e); + Assert.areNotEqual(null,e); } @isTest @@ -258,20 +258,20 @@ private class fflib_QueryFactoryTest { }catch(fflib_QueryFactory.InvalidFieldException ex){ e = ex; } - System.assertNotEquals(null,e); + Assert.areNotEqual(null,e); } @isTest static void invalidFields_noQueryField(){ try { String path = fflib_QueryFactory.getFieldTokenPath(null); - System.assert(false,'Expected InvalidFieldException; none was thrown'); + Assert.fail('Expected InvalidFieldException; none was thrown'); } catch (fflib_QueryFactory.InvalidFieldException ife) { //Expected } catch (Exception e){ - System.assert(false,'Expected InvalidFieldException; ' + e.getTypeName() + ' was thrown instead: ' + e); + Assert.fail('Expected InvalidFieldException; ' + e.getTypeName() + ' was thrown instead: ' + e); } } @@ -279,7 +279,7 @@ private class fflib_QueryFactoryTest { static void queryFieldsNotEquals(){ String qfld = fflib_QueryFactory.getFieldTokenPath(Contact.Name); String qfld2 = fflib_QueryFactory.getFieldTokenPath(Contact.LastName); - System.assert(!qfld.equals(qfld2)); + Assert.isFalse(qfld.equals(qfld2), 'Field paths should not be equal'); } @isTest @@ -290,8 +290,8 @@ private class fflib_QueryFactoryTest { //explicitly assert object accessibility when creating the subselect qf.subselectQuery('Tasks', true).selectField('Id').selectField('Subject').setCondition(' IsDeleted = false '); List queries = qf.getSubselectQueries(); - System.assert(queries != null); - System.assert( + Assert.isNotNull(queries); + Assert.isTrue( Pattern.matches('SELECT.*(SELECT.*FROM Tasks WHERE.*).*FROM Contact WHERE.*', qf.toSOQL()), 'Incorrect returned query' ); @@ -304,8 +304,8 @@ private class fflib_QueryFactoryTest { //explicitly assert object accessibility when creating the subselect qf.subselectQuery('Tasks').selectField('Id').selectField('Subject').setCondition(' IsDeleted = false '); List queries = qf.getSubselectQueries(); - System.assert(queries != null); - System.assert( + Assert.isNotNull(queries); + Assert.isTrue( Pattern.matches('SELECT.*(SELECT.*FROM Tasks WHERE.*).*FROM Contact WHERE.*', qf.toSOQL()), 'Incorrect returned query' ); @@ -327,8 +327,8 @@ private class fflib_QueryFactoryTest { //explicitly assert object accessibility when creating the subselect qf.subselectQuery(relationship, true).selectField('Id').selectField('Subject').setCondition(' IsDeleted = false '); List queries = qf.getSubselectQueries(); - System.assert(queries != null); - System.assert( + Assert.isNotNull(queries); + Assert.isTrue( Pattern.matches('SELECT.*(SELECT.*FROM Tasks WHERE.*).*FROM Contact WHERE.*', qf.toSOQL()), 'Incorrect returned query' ); @@ -350,8 +350,8 @@ private class fflib_QueryFactoryTest { //explicitly assert object accessibility when creating the subselect qf.subselectQuery(relationship).selectField('Id').selectField('Subject').setCondition(' IsDeleted = false '); List queries = qf.getSubselectQueries(); - System.assert(queries != null); - System.assert( + Assert.isNotNull(queries); + Assert.isTrue( Pattern.matches('SELECT.*(SELECT.*FROM Tasks WHERE.*).*FROM Contact WHERE.*', qf.toSOQL()), 'Incorrect returned query' ); @@ -370,7 +370,7 @@ private class fflib_QueryFactoryTest { } catch (fflib_QueryFactory.InvalidSubqueryRelationshipException ex) { e = ex; } - System.assertNotEquals(e, null); + Assert.areNotEqual(e, null); } @isTest @@ -381,8 +381,8 @@ private class fflib_QueryFactoryTest { //explicitly assert object accessibility when creating the subselect qf.subselectQuery(Task.SObjectType, true).selectField('Id').selectField('Subject').setCondition(' IsDeleted = false '); List queries = qf.getSubselectQueries(); - System.assert(queries != null); - System.assert( + Assert.isNotNull(queries); + Assert.isTrue( Pattern.matches('SELECT.*(SELECT.*FROM Tasks WHERE.*).*FROM Contact WHERE.*', qf.toSOQL()), 'Incorrect returned query' ); @@ -402,15 +402,15 @@ private class fflib_QueryFactoryTest { relationship = childRow; } } - System.assert(qf.getSubselectQueries() == null); + Assert.isNull(qf.getSubselectQueries(), 'Subselect queries should initially be null'); fflib_QueryFactory childQf = qf.subselectQuery(Task.SObjectType); childQf.assertIsAccessible(); childQf.setEnforceFLS(true); childQf.selectField('Id'); fflib_QueryFactory childQf2 = qf.subselectQuery(Task.SObjectType); List queries = qf.getSubselectQueries(); - System.assert(queries != null); - System.assert(queries.size() == 1); + Assert.isNotNull(queries, 'Subselect queries should not be null after adding subquery'); + Assert.areEqual(1, queries.size(), 'Should have exactly one subquery'); } @isTest @@ -429,7 +429,7 @@ private class fflib_QueryFactoryTest { } catch (fflib_QueryFactory.InvalidSubqueryRelationshipException ex) { e = ex; } - System.assertNotEquals(e, null); + Assert.areNotEqual(e, null); } @isTest @@ -451,9 +451,9 @@ private class fflib_QueryFactoryTest { .addOrdering(Contact.CreatedDate,fflib_QueryFactory.SortOrder.DESCENDING, true); Set fields = qf.getSelectedFields(); fflib_QueryFactory.Ordering ordering = new fflib_QueryFactory.Ordering('Contact','name',fflib_QueryFactory.SortOrder.ASCENDING); - System.assertEquals('Name',ordering.getField()); + Assert.areEqual('Name',ordering.getField()); - System.assertEquals(new Set{ + Assert.areEqual(new Set{ 'CreatedBy.Name', 'LastModifiedById', 'LastModifiedDate', @@ -462,7 +462,7 @@ private class fflib_QueryFactoryTest { 'FirstName'}, fields); - System.assert(qf.toSOQL().containsIgnoreCase('NULLS LAST')); + Assert.isTrue(qf.toSOQL().containsIgnoreCase('NULLS LAST')); } @isTest @@ -479,7 +479,7 @@ private class fflib_QueryFactoryTest { } catch (fflib_SecurityUtils.CrudException e) { excThrown = true; } - System.assert(excThrown); + Assert.isTrue(excThrown); } } } @@ -499,7 +499,7 @@ private class fflib_QueryFactoryTest { } catch (fflib_SecurityUtils.FlsException e) { excThrown = true; } - System.assert(excThrown); + Assert.isTrue(excThrown); } } } @@ -509,7 +509,7 @@ private class fflib_QueryFactoryTest { fflib_QueryFactory qf = new fflib_QueryFactory(Contact.SObjectType); qf.assertIsAccessible().setEnforceFLS(true).setCondition( 'name like \'%test%\'' ).addOrdering('CreatedDate',fflib_QueryFactory.SortOrder.DESCENDING); String query = qf.toSOQL(); - System.assert(query.containsIgnoreCase('SELECT Id FROM Contact'),'Expected \'SELECT Id FROM Contact\' in the SOQL, found: ' + query); + Assert.isTrue(query.containsIgnoreCase('SELECT Id FROM Contact'),'Expected \'SELECT Id FROM Contact\' in the SOQL, found: ' + query); } @isTest @@ -530,9 +530,9 @@ private class fflib_QueryFactoryTest { 'SELECT CreatedBy.ManagerId, CreatedBy.Name, ' +'FirstName, Id, LastModifiedBy.Email, LastName ' +'FROM User'; - System.assertEquals(qf1.toSOQL(), qf2.toSOQL()); - System.assertEquals(expectedQuery, qf1.toSOQL()); - System.assertEquals(expectedQuery, qf2.toSOQL()); + Assert.areEqual(qf1.toSOQL(), qf2.toSOQL()); + Assert.areEqual(expectedQuery, qf1.toSOQL()); + Assert.areEqual(expectedQuery, qf2.toSOQL()); } @isTest @@ -547,12 +547,12 @@ private class fflib_QueryFactoryTest { fflib_QueryFactory qf2 = qf.deepClone(); - System.assertEquals(qf2, qf); + Assert.areEqual(qf2, qf); - System.assertEquals(qf.getLimit(), qf2.getLimit()); - System.assertEquals(qf.getCondition(), qf2.getCondition()); - System.assertEquals(qf.toSOQL(), qf2.toSOQL()); - System.assertEquals(qf.getOrderings(), qf2.getOrderings()); + Assert.areEqual(qf.getLimit(), qf2.getLimit()); + Assert.areEqual(qf.getCondition(), qf2.getCondition()); + Assert.areEqual(qf.toSOQL(), qf2.toSOQL()); + Assert.areEqual(qf.getOrderings(), qf2.getOrderings()); } @isTest @@ -569,13 +569,13 @@ private class fflib_QueryFactoryTest { fflib_QueryFactory qf2 = qf.deepClone(); - System.assertEquals(qf, qf2); + Assert.areEqual(qf, qf2); - System.assertEquals(qf.getLimit(), qf2.getLimit()); - System.assertEquals(qf.getCondition(), qf2.getCondition()); - System.assertEquals(qf.toSOQL(), qf2.toSOQL()); - System.assertEquals(qf.getOrderings(), qf2.getOrderings()); - System.assertEquals(qf.getSubselectQueries(), qf2.getSubselectQueries()); + Assert.areEqual(qf.getLimit(), qf2.getLimit()); + Assert.areEqual(qf.getCondition(), qf2.getCondition()); + Assert.areEqual(qf.toSOQL(), qf2.toSOQL()); + Assert.areEqual(qf.getOrderings(), qf2.getOrderings()); + Assert.areEqual(qf.getSubselectQueries(), qf2.getSubselectQueries()); } @isTest @@ -598,27 +598,27 @@ private class fflib_QueryFactoryTest { qf2.getOrderings().remove(0); - System.assertEquals(10, qf.getLimit()); - System.assertEquals(200, qf2.getLimit()); + Assert.areEqual(10, qf.getLimit()); + Assert.areEqual(200, qf2.getLimit()); - System.assertEquals('id=12345', qf.getCondition()); - System.assertEquals('id=54321', qf2.getCondition()); + Assert.areEqual('id=12345', qf.getCondition()); + Assert.areEqual('id=54321', qf2.getCondition()); String query = qf.toSOQL(); String query2 = qf2.toSOQL(); - System.assert(query.containsIgnoreCase('Fax') == false); - System.assert(query.containsIgnoreCase('Description')); - System.assert(query2.containsIgnoreCase('Description')); - System.assert(query2.containsIgnoreCase('Fax')); + Assert.isFalse(query.containsIgnoreCase('Fax')); + Assert.isTrue(query.containsIgnoreCase('Description')); + Assert.isTrue(query2.containsIgnoreCase('Description')); + Assert.isTrue(query2.containsIgnoreCase('Fax')); - System.assertEquals(2, qf.getOrderings().size()); - System.assertEquals('Name', qf.getOrderings()[0].getField() ); - System.assertEquals(fflib_QueryFactory.SortOrder.DESCENDING, qf.getOrderings()[1].getDirection()); + Assert.areEqual(2, qf.getOrderings().size()); + Assert.areEqual('Name', qf.getOrderings()[0].getField() ); + Assert.areEqual(fflib_QueryFactory.SortOrder.DESCENDING, qf.getOrderings()[1].getDirection()); - System.assertEquals(2, qf2.getOrderings().size()); - System.assertEquals('Fax', qf2.getOrderings()[1].getField()); - System.assertEquals(fflib_QueryFactory.SortOrder.ASCENDING, qf2.getOrderings()[1].getDirection()); + Assert.areEqual(2, qf2.getOrderings().size()); + Assert.areEqual('Fax', qf2.getOrderings()[1].getField()); + Assert.areEqual(fflib_QueryFactory.SortOrder.ASCENDING, qf2.getOrderings()[1].getDirection()); } @@ -637,11 +637,11 @@ private class fflib_QueryFactoryTest { subquery2_0.addOrdering(new fflib_QueryFactory.Ordering('Contact','Name',fflib_QueryFactory.SortOrder.ASCENDING)); - System.assert(subqueries.size() == 1); - System.assert(subqueries2.size() == 2); + Assert.areEqual(1, subqueries.size()); + Assert.areEqual(2, subqueries2.size()); - System.assert(qf.getSubselectQueries().get(0).getOrderings().size() == 0); - System.assert(qf2.getSubselectQueries().get(0).getOrderings().size() == 1); + Assert.areEqual(0, qf.getSubselectQueries().get(0).getOrderings().size()); + Assert.areEqual(1, qf2.getSubselectQueries().get(0).getOrderings().size()); } @isTest @@ -669,7 +669,7 @@ private class fflib_QueryFactoryTest { String actualSoql = qf.toSOQL(); //Then - System.assertNotEquals(orderedQuery, actualSoql); + Assert.areNotEqual(orderedQuery, actualSoql); } @isTest @@ -688,7 +688,7 @@ private class fflib_QueryFactoryTest { String actualSoql = qf.toSOQL(); //Then - System.assertEquals(allRowsQuery, actualSoql); + Assert.areEqual(allRowsQuery, actualSoql); } public static User createTestUser_noAccess(){ diff --git a/sfdx-source/apex-common/test/classes/fflib_SObjectDescribeTest.cls b/sfdx-source/apex-common/test/classes/fflib_SObjectDescribeTest.cls index 1333a3207e..48bdf38f91 100644 --- a/sfdx-source/apex-common/test/classes/fflib_SObjectDescribeTest.cls +++ b/sfdx-source/apex-common/test/classes/fflib_SObjectDescribeTest.cls @@ -41,30 +41,30 @@ private class fflib_SObjectDescribeTest { Schema.SObjectType nullType = null; Schema.DescribeSObjectResult nullDescribe = null; SObject nullSObject = null; - System.assertEquals(null, fflib_SObjectDescribe.getDescribe(nullStr)); - System.assertEquals(null, fflib_SObjectDescribe.getDescribe('')); - System.assertEquals(null, fflib_SObjectDescribe.getDescribe(' ')); - System.assertEquals(null, fflib_SObjectDescribe.getDescribe(nullType)); - System.assertEquals(null, fflib_SObjectDescribe.getDescribe(nullDescribe)); - System.assertEquals(null, fflib_SObjectDescribe.getDescribe(nullSObject)); + Assert.areEqual(null, fflib_SObjectDescribe.getDescribe(nullStr)); + Assert.areEqual(null, fflib_SObjectDescribe.getDescribe('')); + Assert.areEqual(null, fflib_SObjectDescribe.getDescribe(' ')); + Assert.areEqual(null, fflib_SObjectDescribe.getDescribe(nullType)); + Assert.areEqual(null, fflib_SObjectDescribe.getDescribe(nullDescribe)); + Assert.areEqual(null, fflib_SObjectDescribe.getDescribe(nullSObject)); } @isTest static void NamespacedAttributeMap_implementations(){ fflib_SObjectDescribe.GlobalDescribeMap gdm = fflib_SObjectDescribe.getGlobalDescribe(); Schema.SObjectType accountObjType = gdm.get('AccOunT'); - System.assertEquals(accountObjType, Account.SobjectType); - System.assertEquals(Schema.getGlobalDescribe().size(), gdm.size()); + Assert.areEqual(accountObjType, Account.SobjectType); + Assert.areEqual(Schema.getGlobalDescribe().size(), gdm.size()); fflib_SObjectDescribe acccountDescribe = fflib_SObjectDescribe.getDescribe(accountObjType); fflib_SObjectDescribe.FieldsMap fields = acccountDescribe.getFields(); - System.assert( fields.keySet().containsAll(acccountDescribe.getFieldsMap().keySet()) ); + Assert.isTrue( fields.keySet().containsAll(acccountDescribe.getFieldsMap().keySet()) ); - System.assertEquals(fields.get('name'), Account.SObjectType.fields.name); //behavior of FieldsMap is tested in another method - System.assertEquals(Schema.SObjectType.Account.fields.getMap().size(), fields.size()); + Assert.areEqual(fields.get('name'), Account.SObjectType.fields.name); //behavior of FieldsMap is tested in another method + Assert.areEqual(Schema.SObjectType.Account.fields.getMap().size(), fields.size()); - System.assertEquals(null, fields.get(null), 'Null input should result in null ouput.'); - System.assertEquals(null, fields.get(''), 'Invalid fieldname input should result in null ouput.'); + Assert.areEqual(null, fields.get(null), 'Null input should result in null ouput.'); + Assert.areEqual(null, fields.get(''), 'Invalid fieldname input should result in null ouput.'); } @isTest @@ -78,18 +78,18 @@ private class fflib_SObjectDescribeTest { }; fflib_SObjectDescribe.FieldsMap fields = new fflib_SObjectDescribe.FieldsMap(fakeFieldData); fields.currentNamespace = fakeNamespace; - System.assertEquals(true, fields.containsKey('name__c') ); - System.assertEquals(true, fields.containsKey(fakeNamespace.toUpperCase()+'__nAMe__c') ); - System.assert(fields.get('NAme__c') === fields.get(fakeNamespace+'__namE__c')); + Assert.areEqual(true, fields.containsKey('name__c') ); + Assert.areEqual(true, fields.containsKey(fakeNamespace.toUpperCase()+'__nAMe__c') ); + Assert.isTrue(fields.get('NAme__c') === fields.get(fakeNamespace+'__namE__c')); - System.assert(!fields.keySet(false).contains('otherField__c')); - System.assert(fields.keySet(false).contains(fakeNamespace+'__otherField__c')); + Assert.isFalse(fields.keySet(false).contains('otherField__c')); + Assert.isTrue(fields.keySet(false).contains(fakeNamespace+'__otherField__c')); - System.assert(fields.keySet(true).contains('otherField__c')); - System.assert(!fields.keySet(true).contains(fakeNamespace+'__otherField__c')); + Assert.isTrue(fields.keySet(true).contains('otherField__c')); + Assert.isFalse(fields.keySet(true).contains(fakeNamespace+'__otherField__c')); fields.currentNamespace = 'someOtherNamespace'; - System.assertNotEquals(fields.get('name__C'), fields.get(fakeNamespace.capitalize()+'__nAme__c')); + Assert.areNotEqual(fields.get('name__C'), fields.get(fakeNamespace.capitalize()+'__nAme__c')); } @isTest @@ -102,12 +102,12 @@ private class fflib_SObjectDescribeTest { }; fflib_SObjectDescribe.GlobalDescribeMap gdm = new fflib_SObjectDescribe.GlobalDescribeMap(fakeFieldData); gdm.currentNamespace = fakeNamespace; - System.assertEquals(true, gdm.containsKey('name__c') ); - System.assertEquals(true, gdm.containsKey(fakeNamespace+'__name__c') ); - System.assert(gdm.get('name__c') === gdm.get(fakeNamespace+'__name__c')); + Assert.areEqual(true, gdm.containsKey('name__c') ); + Assert.areEqual(true, gdm.containsKey(fakeNamespace+'__name__c') ); + Assert.areEqual(gdm.get('name__c'), gdm.get(fakeNamespace+'__name__c')); gdm.currentNamespace = 'someOtherNamespace'; - System.assertNotEquals(gdm.get('name__c'), gdm.get(fakeNamespace+'__name__c')); + Assert.areNotEqual(gdm.get('name__c'), gdm.get(fakeNamespace+'__name__c')); } @isTest //Tests all forms of the getDescribe static @@ -115,8 +115,8 @@ private class fflib_SObjectDescribeTest { fflib_SObjectDescribe d = fflib_SObjectDescribe.getDescribe('Account'); fflib_SObjectDescribe d2 = fflib_SObjectDescribe.getDescribe(Account.SObjectType); fflib_SObjectDescribe d3 = fflib_SObjectDescribe.getDescribe(Schema.SObjectType.Account); - System.assertEquals('Account', d.getDescribe().getName()); - System.assert( (d === d2 && d2 === d3) ,'All three getDescribe calls should return the same cached instance.'); + Assert.areEqual('Account', d.getDescribe().getName()); + Assert.isTrue( (d === d2 && d2 === d3) ,'All three getDescribe calls should return the same cached instance.'); } @isTest @@ -133,10 +133,10 @@ private class fflib_SObjectDescribeTest { // Because describe limits are no longer enforced in any API version, this method is no longer available. // In API version 30.0 and earlier, this method is available but is deprecated. - // System.assertEquals(1, Limits.getFieldsDescribes() ); + // Assert.areEqual(1, Limits.getFieldsDescribes() ); - System.assertEquals(false,fields.isEmpty()); - System.assertEquals(Account.SObjectType, d.getSObjectType()); + Assert.areEqual(false,fields.isEmpty()); + Assert.areEqual(Account.SObjectType, d.getSObjectType()); } @isTest @@ -153,7 +153,7 @@ private class fflib_SObjectDescribeTest { // Because describe limits are no longer enforced in any API version, this method is no longer available. // In API version 30.0 and earlier, this method is available but is deprecated. - // System.assertEquals(1, Limits.getFieldSetsDescribes() ); + // Assert.areEqual(1, Limits.getFieldSetsDescribes() ); // no asserts on result size to avoid a requirement on field sets existing } @@ -162,7 +162,7 @@ private class fflib_SObjectDescribeTest { static void simpleAccountGetNameField(){ fflib_SObjectDescribe d = fflib_SObjectDescribe.getDescribe(Account.SObjectType); Schema.SObjectField nameField = d.getNameField(); - System.assertEquals('Name', nameField.getDescribe().getName()); + Assert.areEqual('Name', nameField.getDescribe().getName()); } @isTest @@ -170,14 +170,14 @@ private class fflib_SObjectDescribeTest { fflib_SObjectDescribe d = fflib_SObjectDescribe.getDescribe('Account'); fflib_SObjectDescribe.flushCache(); fflib_SObjectDescribe d2 = fflib_SObjectDescribe.getDescribe('Account'); - System.assert(d !== d2, 'Second object should be a fresh instance after a cache flush.' ); + Assert.isTrue(d !== d2, 'Second object should be a fresh instance after a cache flush.' ); } @isTest static void rawGlobalDescribeCheck(){ Map systemGd = Schema.getGlobalDescribe(); Map cachedGd = fflib_SObjectDescribe.getRawGlobalDescribe(); - System.assertEquals(systemGd.size(),cachedGd.size()); + Assert.areEqual(systemGd.size(),cachedGd.size()); } } diff --git a/sfdx-source/apex-common/test/classes/fflib_SObjectDomainTest.cls b/sfdx-source/apex-common/test/classes/fflib_SObjectDomainTest.cls index 96555833d3..9f4139da29 100644 --- a/sfdx-source/apex-common/test/classes/fflib_SObjectDomainTest.cls +++ b/sfdx-source/apex-common/test/classes/fflib_SObjectDomainTest.cls @@ -32,27 +32,27 @@ private with sharing class fflib_SObjectDomainTest { fflib_SObjectDomain.TestSObjectDomain opps = new fflib_SObjectDomain.TestSObjectDomain(new Opportunity[] { new Opportunity ( Name = 'Test', Type = 'Existing Account' ) } ); opps.onValidate(); - System.assertEquals(1, fflib_SObjectDomain.Errors.getAll().size()); - System.assertEquals('You must provide an Account for Opportunities for existing Customers.', fflib_SObjectDomain.Errors.getAll()[0].message); - System.assertEquals(Opportunity.AccountId, ((fflib_SObjectDomain.FieldError)fflib_SObjectDomain.Errors.getAll()[0]).field); + Assert.areEqual(1, fflib_SObjectDomain.Errors.getAll().size()); + Assert.areEqual('You must provide an Account for Opportunities for existing Customers.', fflib_SObjectDomain.Errors.getAll()[0].message); + Assert.areEqual(Opportunity.AccountId, ((fflib_SObjectDomain.FieldError)fflib_SObjectDomain.Errors.getAll()[0]).field); opps = new fflib_SObjectDomain.TestSObjectDomain(new SObject[] { new Opportunity ( Name = 'Test', Type = 'Existing Account' ) }, Opportunity.SObjectType ); - System.assertEquals(1, fflib_SObjectDomain.Errors.getAll().size()); - System.assertEquals('You must provide an Account for Opportunities for existing Customers.', fflib_SObjectDomain.Errors.getAll()[0].message); - System.assertEquals(Opportunity.AccountId, ((fflib_SObjectDomain.FieldError)fflib_SObjectDomain.Errors.getAll()[0]).field); + Assert.areEqual(1, fflib_SObjectDomain.Errors.getAll().size()); + Assert.areEqual('You must provide an Account for Opportunities for existing Customers.', fflib_SObjectDomain.Errors.getAll()[0].message); + Assert.areEqual(Opportunity.AccountId, ((fflib_SObjectDomain.FieldError)fflib_SObjectDomain.Errors.getAll()[0]).field); } @IsTest private static void testInsertValidationFailedWithoutDML() { Opportunity opp = new Opportunity ( Name = 'Test', Type = 'Existing Account' ); - System.assertEquals(false, fflib_SObjectDomain.Test.Database.hasRecords()); + Assert.areEqual(false, fflib_SObjectDomain.Test.Database.hasRecords()); fflib_SObjectDomain.Test.Database.onInsert(new Opportunity[] { opp } ); - System.assertEquals(true, fflib_SObjectDomain.Test.Database.hasRecords()); + Assert.areEqual(true, fflib_SObjectDomain.Test.Database.hasRecords()); fflib_SObjectDomain.triggerHandler(fflib_SObjectDomain.TestSObjectDomainConstructor.class); - System.assertEquals(1, fflib_SObjectDomain.Errors.getAll().size()); - System.assertEquals('You must provide an Account for Opportunities for existing Customers.', fflib_SObjectDomain.Errors.getAll()[0].message); - System.assertEquals(Opportunity.AccountId, ((fflib_SObjectDomain.FieldError)fflib_SObjectDomain.Errors.getAll()[0]).field); + Assert.areEqual(1, fflib_SObjectDomain.Errors.getAll().size()); + Assert.areEqual('You must provide an Account for Opportunities for existing Customers.', fflib_SObjectDomain.Errors.getAll()[0].message); + Assert.areEqual(Opportunity.AccountId, ((fflib_SObjectDomain.FieldError)fflib_SObjectDomain.Errors.getAll()[0]).field); } @IsTest @@ -64,13 +64,13 @@ private with sharing class fflib_SObjectDomainTest Opportunity newOpp = (Opportunity) Opportunity.sObjectType.newSObject('006E0000006mkRQ'); newOpp.Name = 'Test'; newOpp.Type = 'New Account'; - System.assertEquals(false, fflib_SObjectDomain.Test.Database.hasRecords()); + Assert.areEqual(false, fflib_SObjectDomain.Test.Database.hasRecords()); fflib_SObjectDomain.Test.Database.onUpdate(new Opportunity[] { newOpp }, new Map { newOpp.Id => oldOpp } ); - System.assertEquals(true, fflib_SObjectDomain.Test.Database.hasRecords()); + Assert.areEqual(true, fflib_SObjectDomain.Test.Database.hasRecords()); fflib_SObjectDomain.triggerHandler(fflib_SObjectDomain.TestSObjectDomainConstructor.class); - System.assertEquals(1, fflib_SObjectDomain.Errors.getAll().size()); - System.assertEquals('You cannot change the Opportunity type once it has been created.', fflib_SObjectDomain.Errors.getAll()[0].message); - System.assertEquals(Opportunity.Type, ((fflib_SObjectDomain.FieldError)fflib_SObjectDomain.Errors.getAll()[0]).field); + Assert.areEqual(1, fflib_SObjectDomain.Errors.getAll().size()); + Assert.areEqual('You cannot change the Opportunity type once it has been created.', fflib_SObjectDomain.Errors.getAll()[0].message); + Assert.areEqual(Opportunity.Type, ((fflib_SObjectDomain.FieldError)fflib_SObjectDomain.Errors.getAll()[0]).field); } @IsTest @@ -79,12 +79,12 @@ private with sharing class fflib_SObjectDomainTest Opportunity opp = (Opportunity) Opportunity.sObjectType.newSObject('006E0000006mkRQ'); opp.Name = 'Test'; opp.Type = 'Existing Account'; - System.assertEquals(false, fflib_SObjectDomain.Test.Database.hasRecords()); + Assert.areEqual(false, fflib_SObjectDomain.Test.Database.hasRecords()); fflib_SObjectDomain.Test.Database.onDelete(new Map { opp.Id => opp } ); - System.assertEquals(true, fflib_SObjectDomain.Test.Database.hasRecords()); + Assert.areEqual(true, fflib_SObjectDomain.Test.Database.hasRecords()); fflib_SObjectDomain.triggerHandler(fflib_SObjectDomain.TestSObjectDomainConstructor.class); - System.assertEquals(1, fflib_SObjectDomain.Errors.getAll().size()); - System.assertEquals('You cannot delete this Opportunity.', fflib_SObjectDomain.Errors.getAll()[0].message); + Assert.areEqual(1, fflib_SObjectDomain.Errors.getAll().size()); + Assert.areEqual('You cannot delete this Opportunity.', fflib_SObjectDomain.Errors.getAll()[0].message); } @IsTest @@ -93,9 +93,9 @@ private with sharing class fflib_SObjectDomainTest Opportunity opp = (Opportunity) Opportunity.sObjectType.newSObject('006E0000006mkRQ'); opp.Name = 'Test'; opp.Type = 'Existing Account'; - System.assertEquals(false, fflib_SObjectDomain.Test.Database.hasRecords()); + Assert.areEqual(false, fflib_SObjectDomain.Test.Database.hasRecords()); fflib_SObjectDomain.Test.Database.onUndelete(new list { opp } ); - System.assertEquals(true, fflib_SObjectDomain.Test.Database.hasRecords()); + Assert.areEqual(true, fflib_SObjectDomain.Test.Database.hasRecords()); fflib_SObjectDomain.triggerHandler(fflib_SObjectDomain.TestSObjectDomainConstructor.class); } @@ -113,9 +113,9 @@ private with sharing class fflib_SObjectDomainTest fflib_SObjectDomain.Test.Database.onInsert(new Opportunity[] { opp } ); try { fflib_SObjectDomain.triggerHandler(fflib_SObjectDomain.TestSObjectDomainConstructor.class); - System.assert(false, 'Expected access denied exception'); + Assert.fail('Expected access denied exception'); } catch (Exception e) { - System.assertEquals('Permission to create an Opportunity denied.', e.getMessage()); + Assert.areEqual('Permission to create an Opportunity denied.', e.getMessage()); } // Test Update object security @@ -125,18 +125,18 @@ private with sharing class fflib_SObjectDomainTest fflib_SObjectDomain.Test.Database.onUpdate(new List { opp }, new Map { opp.Id => opp } ); try { fflib_SObjectDomain.triggerHandler(fflib_SObjectDomain.TestSObjectDomainConstructor.class); - System.assert(false, 'Expected access denied exception'); + Assert.fail('Expected access denied exception'); } catch (Exception e) { - System.assertEquals('Permission to update an Opportunity denied.', e.getMessage()); + Assert.areEqual('Permission to update an Opportunity denied.', e.getMessage()); } // Test Delete object security fflib_SObjectDomain.Test.Database.onDelete(new Map { opp.Id => opp }); try { fflib_SObjectDomain.triggerHandler(fflib_SObjectDomain.TestSObjectDomainConstructor.class); - System.assert(false, 'Expected access denied exception'); + Assert.fail('Expected access denied exception'); } catch (Exception e) { - System.assertEquals('Permission to delete an Opportunity denied.', e.getMessage()); + Assert.areEqual('Permission to delete an Opportunity denied.', e.getMessage()); } } } @@ -148,12 +148,12 @@ private with sharing class fflib_SObjectDomainTest Opportunity opp = new Opportunity ( Name = 'Test', Type = 'Existing Account' ); fflib_SObjectDomain.Errors.error('Error', opp); fflib_SObjectDomain.Errors.error('Error', opp, Opportunity.Type); - System.assertEquals(2, fflib_SObjectDomain.Errors.getAll().size()); - System.assertEquals('Error', fflib_SObjectDomain.Errors.getAll()[0].message); - System.assertEquals('Error', fflib_SObjectDomain.Errors.getAll()[1].message); - System.assertEquals(Opportunity.Type, ((fflib_SObjectDomain.FieldError)fflib_SObjectDomain.Errors.getAll()[1]).field); + Assert.areEqual(2, fflib_SObjectDomain.Errors.getAll().size()); + Assert.areEqual('Error', fflib_SObjectDomain.Errors.getAll()[0].message); + Assert.areEqual('Error', fflib_SObjectDomain.Errors.getAll()[1].message); + Assert.areEqual(Opportunity.Type, ((fflib_SObjectDomain.FieldError)fflib_SObjectDomain.Errors.getAll()[1]).field); fflib_SObjectDomain.Errors.clearAll(); - System.assertEquals(0, fflib_SObjectDomain.Errors.getAll().size()); + Assert.areEqual(0, fflib_SObjectDomain.Errors.getAll().size()); } @IsTest @@ -162,8 +162,8 @@ private with sharing class fflib_SObjectDomainTest Opportunity opp = new Opportunity ( Name = 'Test', Type = 'Existing Account' ); fflib_SObjectDomain.Test.Database.onInsert(new Opportunity[] { opp } ); fflib_SObjectDomain.triggerHandler(fflib_SObjectDomain.TestSObjectStatefulDomainConstructor.class); - System.assertEquals(1, fflib_SObjectDomain.Errors.getAll().size()); - System.assertEquals('Error on Record Test', fflib_SObjectDomain.Errors.getAll()[0].message); + Assert.areEqual(1, fflib_SObjectDomain.Errors.getAll().size()); + Assert.areEqual('Error on Record Test', fflib_SObjectDomain.Errors.getAll()[0].message); } @IsTest @@ -172,9 +172,9 @@ private with sharing class fflib_SObjectDomainTest Opportunity opp = new Opportunity ( Name = 'Test Recursive 1', Type = 'Existing Account' ); fflib_SObjectDomain.Test.Database.onInsert(new Opportunity[] { opp } ); fflib_SObjectDomain.triggerHandler(fflib_SObjectDomain.TestSObjectStatefulDomainConstructor.class); - System.assertEquals(2, fflib_SObjectDomain.Errors.getAll().size()); - System.assertEquals('Error on Record Test Recursive 2', fflib_SObjectDomain.Errors.getAll()[0].message); - System.assertEquals('Error on Record Test Recursive 1', fflib_SObjectDomain.Errors.getAll()[1].message); + Assert.areEqual(2, fflib_SObjectDomain.Errors.getAll().size()); + Assert.areEqual('Error on Record Test Recursive 2', fflib_SObjectDomain.Errors.getAll()[0].message); + Assert.areEqual('Error on Record Test Recursive 1', fflib_SObjectDomain.Errors.getAll()[1].message); } @IsTest @@ -202,9 +202,9 @@ private with sharing class fflib_SObjectDomainTest fflib_SObjectDomain.Test.Database.onUpdate(new Opportunity[] { newOpp }, new Map { newOpp.Id => oldOpp } ); try { fflib_SObjectDomain.triggerHandler(fflib_SObjectDomain.TestSObjectOnValidateBehaviourConstructor.class); - System.assert(false, 'Expected exception'); + Assert.fail('Expected exception'); } catch (Exception e) { - System.assertEquals('onValidate called', e.getMessage()); + Assert.areEqual('onValidate called', e.getMessage()); } } @@ -213,9 +213,9 @@ private with sharing class fflib_SObjectDomainTest { Account acct1 = new Account ( Id = '001E0000006mkRP', Name = 'Test1', AccountNumber = '12345', Site = 'Here'), acct2 = new Account ( Id = '001E0000006mkRQ', Name = 'Test2', AccountNumber = '54321', Site = 'There'); - System.assertEquals(false, fflib_SObjectDomain.Test.Database.hasRecords()); + Assert.areEqual(false, fflib_SObjectDomain.Test.Database.hasRecords()); fflib_SObjectDomain.Test.Database.onInsert(new Account[] { acct1, acct2 } ); - System.assertEquals(true, fflib_SObjectDomain.Test.Database.hasRecords()); + Assert.areEqual(true, fflib_SObjectDomain.Test.Database.hasRecords()); fflib_SObjectDomain.triggerHandler(fflib_SObjectDomain.TestSObjectChangedRecordsConstructor.class); Account acct1changed = acct1.clone(), acct2changed = acct2.clone(); @@ -263,9 +263,9 @@ private with sharing class fflib_SObjectDomainTest // THEN it should only return the changed records Map resultMap = new Map(result); - System.assertEquals(2, result.size()); - System.assert(resultMap.containsKey(idLuke)); - System.assert(resultMap.containsKey(idHan)); + Assert.areEqual(2, result.size()); + Assert.isTrue(resultMap.containsKey(idLuke)); + Assert.isTrue(resultMap.containsKey(idHan)); } @IsTest @@ -301,9 +301,9 @@ private with sharing class fflib_SObjectDomainTest // THEN it should only return the changed records Map resultMap = new Map(result); - System.assertEquals(2, result.size()); - System.assert(resultMap.containsKey(idLuke)); - System.assert(resultMap.containsKey(idHan)); + Assert.areEqual(2, result.size()); + Assert.isTrue(resultMap.containsKey(idLuke)); + Assert.isTrue(resultMap.containsKey(idHan)); } @@ -361,7 +361,7 @@ private with sharing class fflib_SObjectDomainTest bError = true; } - System.AssertEquals(false, bError, 'Error - Trigger events have been fired when they are disabled'); + Assert.areEqual(false, bError, 'Error - Trigger events have been fired when they are disabled'); //////////////////////////// // Insert! @@ -378,7 +378,7 @@ private with sharing class fflib_SObjectDomainTest System.Debug('Exception Fired :' + e.getMEssage()); } - System.AssertEquals('onAfterInsert called', sErrorMessage, 'Error - After Insert Event is enabled but did not run'); + Assert.areEqual('onAfterInsert called', sErrorMessage, 'Error - After Insert Event is enabled but did not run'); try { @@ -392,7 +392,7 @@ private with sharing class fflib_SObjectDomainTest sErrorMessage = e.getMessage(); } - System.AssertEquals('onBeforeInsert called', sErrorMessage, 'Error - Before Insert Event is enabled but did not run'); + Assert.areEqual('onBeforeInsert called', sErrorMessage, 'Error - Before Insert Event is enabled but did not run'); //////////////////////////// // Update! @@ -408,7 +408,7 @@ private with sharing class fflib_SObjectDomainTest sErrorMessage = e.getMessage(); } - System.AssertEquals('onAfterUpdate called', sErrorMessage, 'Error - After Update Event is enabled but did not run'); + Assert.areEqual('onAfterUpdate called', sErrorMessage, 'Error - After Update Event is enabled but did not run'); try { @@ -422,7 +422,7 @@ private with sharing class fflib_SObjectDomainTest sErrorMessage = e.getMessage(); } - System.AssertEquals('onBeforeUpdate called', sErrorMessage, 'Error - Before Update Event is enabled but did not run'); + Assert.areEqual('onBeforeUpdate called', sErrorMessage, 'Error - Before Update Event is enabled but did not run'); //////////////////////////// // Delete! @@ -438,7 +438,7 @@ private with sharing class fflib_SObjectDomainTest sErrorMessage = e.getMessage(); } - System.AssertEquals('onAfterDelete called', sErrorMessage, 'Error - After Delete Event is enabled but did not run'); + Assert.areEqual('onAfterDelete called', sErrorMessage, 'Error - After Delete Event is enabled but did not run'); try { @@ -452,7 +452,7 @@ private with sharing class fflib_SObjectDomainTest sErrorMessage = e.getMessage(); } - System.AssertEquals('onBeforeDelete called', sErrorMessage, 'Error - Before Delete Event is enabled but did not run'); + Assert.areEqual('onBeforeDelete called', sErrorMessage, 'Error - Before Delete Event is enabled but did not run'); //////////////////////////// // Undelete! @@ -468,7 +468,7 @@ private with sharing class fflib_SObjectDomainTest sErrorMessage = e.getMessage(); } - System.AssertEquals('onAfterUndelete called', sErrorMessage, 'Error - After Undelete Event is enabled but did not run'); + Assert.areEqual('onAfterUndelete called', sErrorMessage, 'Error - After Undelete Event is enabled but did not run'); /* @@ -485,9 +485,9 @@ private with sharing class fflib_SObjectDomainTest try { fflib_SObjectDomain.triggerHandler(fflib_SObjectDomain.TestSObjectOnValidateBehaviourConstructor.class); - System.assert(false, 'Expected exception'); + Assert.fail('Expected exception'); } catch (Exception e) { - System.assertEquals('onValidate called', e.getMessage()); + Assert.areEqual('onValidate called', e.getMessage()); } */ } diff --git a/sfdx-source/apex-common/test/classes/fflib_SObjectSelectorTest.cls b/sfdx-source/apex-common/test/classes/fflib_SObjectSelectorTest.cls index 63b2d837b4..306d191c69 100644 --- a/sfdx-source/apex-common/test/classes/fflib_SObjectSelectorTest.cls +++ b/sfdx-source/apex-common/test/classes/fflib_SObjectSelectorTest.cls @@ -35,8 +35,8 @@ private with sharing class fflib_SObjectSelectorTest static testMethod void testGetSObjectName() { AccountSelector selector = new AccountSelector(); - system.assertEquals(null, selector.getSObjectFieldSetList()); - system.assertEquals('Account',selector.getSObjectName()); + Assert.areEqual(null, selector.getSObjectFieldSetList()); + Assert.areEqual('Account',selector.getSObjectName()); } static testMethod void testSelectSObjectsById() @@ -55,13 +55,13 @@ private with sharing class fflib_SObjectSelectorTest List result = (List) selector.selectSObjectsById(idSet); Test.stopTest(); - system.assertEquals(2,result.size()); - system.assertEquals('TestAccount2',result[0].Name); - system.assertEquals('A2',result[0].AccountNumber); - system.assertEquals(12345.67,result[0].AnnualRevenue); - system.assertEquals('TestAccount1',result[1].Name); - system.assertEquals('A1',result[1].AccountNumber); - system.assertEquals(76543.21,result[1].AnnualRevenue); + Assert.areEqual(2,result.size()); + Assert.areEqual('TestAccount2',result[0].Name); + Assert.areEqual('A2',result[0].AccountNumber); + Assert.areEqual(12345.67,result[0].AnnualRevenue); + Assert.areEqual('TestAccount1',result[1].Name); + Assert.areEqual('A1',result[1].AccountNumber); + Assert.areEqual(76543.21,result[1].AnnualRevenue); } static testMethod void testQueryLocatorById() @@ -81,17 +81,17 @@ private with sharing class fflib_SObjectSelectorTest System.Iterator iteratorResult = result.iterator(); Test.stopTest(); - System.assert(true, iteratorResult.hasNext()); + Assert.isTrue(iteratorResult.hasNext()); Account account = (Account) iteratorResult.next(); - system.assertEquals('TestAccount2',account.Name); - system.assertEquals('A2',account.AccountNumber); - system.assertEquals(12345.67,account.AnnualRevenue); - System.assert(true, iteratorResult.hasNext()); + Assert.areEqual('TestAccount2',account.Name); + Assert.areEqual('A2',account.AccountNumber); + Assert.areEqual(12345.67,account.AnnualRevenue); + Assert.isTrue(iteratorResult.hasNext()); account = (Account) iteratorResult.next(); - system.assertEquals('TestAccount1',account.Name); - system.assertEquals('A1',account.AccountNumber); - system.assertEquals(76543.21,account.AnnualRevenue); - System.assertEquals(false, iteratorResult.hasNext()); + Assert.areEqual('TestAccount1',account.Name); + Assert.areEqual('A1',account.AccountNumber); + Assert.areEqual(76543.21,account.AnnualRevenue); + Assert.areEqual(false, iteratorResult.hasNext()); } static testMethod void testAssertIsAccessible() @@ -114,11 +114,11 @@ private with sharing class fflib_SObjectSelectorTest try { List result = (List) selector.selectSObjectsById(idSet); - System.assert(false,'Expected exception was not thrown'); + Assert.fail('Expected exception was not thrown'); } catch(fflib_SObjectDomain.DomainException e) { - System.assertEquals('Permission to access an Account denied.',e.getMessage()); + Assert.areEqual('Permission to access an Account denied.',e.getMessage()); } } } @@ -146,7 +146,7 @@ private with sharing class fflib_SObjectSelectorTest } catch(fflib_SObjectDomain.DomainException e) { - System.assert(false,'Did not expect an exception to be thrown'); + Assert.fail('Did not expect an exception to be thrown'); } } } @@ -157,8 +157,8 @@ private with sharing class fflib_SObjectSelectorTest String soql = selector.newQueryFactory().toSOQL(); Pattern p = Pattern.compile('SELECT (.*) FROM Account ORDER BY AccountNumber DESC NULLS FIRST , AnnualRevenue ASC NULLS LAST '); Matcher m = p.matcher(soql); - System.assert(m.matches(), 'Generated SOQL does not match expected pattern. Here is the generated SOQL: ' + soql); - System.assertEquals(1, m.groupCount(), 'Unexpected number of groups captured.'); + Assert.isTrue(m.matches(), 'Generated SOQL does not match expected pattern. Here is the generated SOQL: ' + soql); + Assert.areEqual(1, m.groupCount(), 'Unexpected number of groups captured.'); String fieldListString = m.group(1); assertFieldListString(fieldListString, null); } @@ -170,8 +170,8 @@ private with sharing class fflib_SObjectSelectorTest Pattern p = Pattern.compile(String.format('SELECT (.*) FROM Account ORDER BY {0} ASC NULLS FIRST ', new List{selector.getOrderBy()})); Matcher m = p.matcher(soql); - System.assert(m.matches(), 'Generated SOQL does not match expected pattern. Here is the generated SOQL: ' + soql); - System.assertEquals(1, m.groupCount(), 'Unexpected number of groups captured.'); + Assert.isTrue(m.matches(), 'Generated SOQL does not match expected pattern. Here is the generated SOQL: ' + soql); + Assert.areEqual(1, m.groupCount(), 'Unexpected number of groups captured.'); String fieldListString = m.group(1); assertFieldListString(fieldListString, null); } @@ -179,32 +179,32 @@ private with sharing class fflib_SObjectSelectorTest static testMethod void testDefaultConfig() { AccountSelector selector = new AccountSelector(); - System.assertEquals(false, selector.isEnforcingFLS()); - System.assertEquals(true, selector.isEnforcingCRUD()); - System.assertEquals(false, selector.isIncludeFieldSetFields()); - System.assertEquals(fflib_SObjectSelector.DataAccess.LEGACY, selector.getDataAccess()); + Assert.areEqual(false, selector.isEnforcingFLS()); + Assert.areEqual(true, selector.isEnforcingCRUD()); + Assert.areEqual(false, selector.isIncludeFieldSetFields()); + Assert.areEqual(fflib_SObjectSelector.DataAccess.LEGACY, selector.getDataAccess()); - System.assertEquals('Account', selector.getSObjectName()); - System.assertEquals(Account.SObjectType, selector.getSObjectType2()); + Assert.areEqual('Account', selector.getSObjectName()); + Assert.areEqual(Account.SObjectType, selector.getSObjectType2()); } private static void assertFieldListString(String fieldListString, String prefix) { String prefixString = (!String.isBlank(prefix)) ? prefix + '.' : ''; List fieldList = fieldListString.split(',{1}\\s?'); - System.assertEquals(UserInfo.isMultiCurrencyOrganization() ? 5 : 4, fieldList.size()); + Assert.areEqual(UserInfo.isMultiCurrencyOrganization() ? 5 : 4, fieldList.size()); Set fieldSet = new Set(); fieldSet.addAll(fieldList); String expected = prefixString + 'AccountNumber'; - System.assert(fieldSet.contains(expected), expected + ' missing from field list string: ' + fieldListString); + Assert.isTrue(fieldSet.contains(expected), expected + ' missing from field list string: ' + fieldListString); expected = prefixString + 'AnnualRevenue'; - System.assert(fieldSet.contains(expected), expected + ' missing from field list string: ' + fieldListString); + Assert.isTrue(fieldSet.contains(expected), expected + ' missing from field list string: ' + fieldListString); expected = prefixString + 'Id'; - System.assert(fieldSet.contains(expected), expected + ' missing from field list string: ' + fieldListString); + Assert.isTrue(fieldSet.contains(expected), expected + ' missing from field list string: ' + fieldListString); expected = prefixString + 'Name'; - System.assert(fieldSet.contains(expected), expected + ' missing from field list string: ' + fieldListString); + Assert.isTrue(fieldSet.contains(expected), expected + ' missing from field list string: ' + fieldListString); if (UserInfo.isMultiCurrencyOrganization()) { expected = prefixString + 'CurrencyIsoCode'; - System.assert(fieldSet.contains(expected), expected + ' missing from field list string: ' + fieldListString); + Assert.isTrue(fieldSet.contains(expected), expected + ' missing from field list string: ' + fieldListString); } } @@ -231,7 +231,7 @@ private with sharing class fflib_SObjectSelectorTest soqlMatcher.matches(); List actualSelectFields = soqlMatcher.group(1).deleteWhiteSpace().split(','); - System.assertEquals(expectedSelectFields, new Set(actualSelectFields)); + Assert.areEqual(expectedSelectFields, new Set(actualSelectFields)); } // Test case of ordering with NULLS LAST option passed into the ordering method @@ -255,7 +255,7 @@ private with sharing class fflib_SObjectSelectorTest // Assert that the Pattern soqlPattern = Pattern.compile('SELECT (.*) FROM Account ORDER BY AccountNumber DESC NULLS FIRST , AnnualRevenue ASC NULLS LAST '); Matcher soqlMatcher = soqlPattern.matcher(soql); - system.assert(soqlMatcher.matches(), 'The SOQL should have that expected.'); + Assert.isTrue(soqlMatcher.matches(), 'The SOQL should have that expected.'); } @IsTest @@ -277,10 +277,10 @@ private with sharing class fflib_SObjectSelectorTest String soql = qf.toSOQL(); Pattern soqlPattern = Pattern.compile('SELECT (.*) FROM Account'); Matcher soqlMatcher = soqlPattern.matcher(soql); - System.assert(soqlMatcher.matches(), 'Generated SOQL does not match expected pattern. Here is the generated SOQL: ' + soql); + Assert.isTrue(soqlMatcher.matches(), 'Generated SOQL does not match expected pattern. Here is the generated SOQL: ' + soql); List actualSelectFields = soqlMatcher.group(1).deleteWhiteSpace().split(','); - System.assertEquals(expectedSelectFields, new Set(actualSelectFields)); + Assert.areEqual(expectedSelectFields, new Set(actualSelectFields)); } @IsTest @@ -302,10 +302,10 @@ private with sharing class fflib_SObjectSelectorTest String soql = qf.toSOQL(); Pattern soqlPattern = Pattern.compile(String.format('SELECT Id, \\(SELECT (.*) FROM Users ORDER BY {0} ASC NULLS FIRST \\) +FROM Account',new List{selector.getOrderBy()})); Matcher soqlMatcher = soqlPattern.matcher(soql); - System.assert(soqlMatcher.matches(), 'Generated SOQL does not match expected pattern. Here is the generated SOQL: ' + soql); + Assert.isTrue(soqlMatcher.matches(), 'Generated SOQL does not match expected pattern. Here is the generated SOQL: ' + soql); List actualSelectFields = soqlMatcher.group(1).deleteWhiteSpace().split(','); - System.assertEquals(expectedSelectFields, new Set(actualSelectFields)); + Assert.areEqual(expectedSelectFields, new Set(actualSelectFields)); } @IsTest @@ -328,10 +328,10 @@ private with sharing class fflib_SObjectSelectorTest Pattern soqlPattern = Pattern.compile(String.format('SELECT Id, \\(SELECT (.*) FROM Users ORDER BY {0} ASC NULLS FIRST \\) +FROM Account', new List{selector.getOrderBy()})); Matcher soqlMatcher = soqlPattern.matcher(soql); - System.assert(soqlMatcher.matches(), 'Generated SOQL does not match expected pattern. Here is the generated SOQL: ' + soql); + Assert.isTrue(soqlMatcher.matches(), 'Generated SOQL does not match expected pattern. Here is the generated SOQL: ' + soql); List actualSelectFields = soqlMatcher.group(1).deleteWhiteSpace().split(','); - System.assertEquals(expectedSelectFields, new Set(actualSelectFields)); + Assert.areEqual(expectedSelectFields, new Set(actualSelectFields)); } @IsTest @@ -351,7 +351,7 @@ private with sharing class fflib_SObjectSelectorTest //Then List actualSelectFields = fieldListString.deleteWhiteSpace().split(','); - System.assertEquals(expectedSelectFields, new Set(actualSelectFields)); + Assert.areEqual(expectedSelectFields, new Set(actualSelectFields)); } @IsTest @@ -370,7 +370,7 @@ private with sharing class fflib_SObjectSelectorTest //Then List actualSelectFields = fieldListString.deleteWhiteSpace().split(','); - System.assertEquals(expectedSelectFields, new Set(actualSelectFields)); + Assert.areEqual(expectedSelectFields, new Set(actualSelectFields)); } @@ -449,7 +449,7 @@ private with sharing class fflib_SObjectSelectorTest new List{sel.getOrderBy()}); Pattern soqlPattern = Pattern.compile(expected); Matcher soqlMatcher = soqlPattern.matcher(soql); - System.assert(soqlMatcher.matches(),'Expected: ' + expected + ' Actual:' + soql); + Assert.isTrue(soqlMatcher.matches(),'Expected: ' + expected + ' Actual:' + soql); } @IsTest @@ -462,7 +462,7 @@ private with sharing class fflib_SObjectSelectorTest new List{sel.getOrderBy()}); Pattern soqlPattern = Pattern.compile(expected); Matcher soqlMatcher = soqlPattern.matcher(soql); - System.assert(soqlMatcher.matches(),'Expected: ' + expected + ' Actual:' + soql); + Assert.isTrue(soqlMatcher.matches(),'Expected: ' + expected + ' Actual:' + soql); } @@ -734,7 +734,7 @@ private with sharing class fflib_SObjectSelectorTest soqlMatcher.matches(); List actualSelectFields = soqlMatcher.group(1).deleteWhiteSpace().split(','); - System.assertEquals(expectedSelectFields, new Set(actualSelectFields)); + Assert.areEqual(expectedSelectFields, new Set(actualSelectFields)); } @IsTest @@ -809,7 +809,7 @@ private with sharing class fflib_SObjectSelectorTest String actualSOQL = qf.toSOQL(); //Then - System.assertEquals(expectedSOQL, actualSOQL); + Assert.areEqual(expectedSOQL, actualSOQL); } @IsTest diff --git a/sfdx-source/apex-common/test/classes/fflib_SObjectUnitOfWorkTest.cls b/sfdx-source/apex-common/test/classes/fflib_SObjectUnitOfWorkTest.cls index 63a05949e8..883f8413a6 100644 --- a/sfdx-source/apex-common/test/classes/fflib_SObjectUnitOfWorkTest.cls +++ b/sfdx-source/apex-common/test/classes/fflib_SObjectUnitOfWorkTest.cls @@ -62,9 +62,9 @@ private with sharing class fflib_SObjectUnitOfWorkTest uow.commitWork(); // assert that mock email functionality was called - System.assert(((Mock_SendEmailWork) uow.m_emailWork).doWorkWasCalled); + Assert.isTrue(((Mock_SendEmailWork) uow.m_emailWork).doWorkWasCalled, 'Email work should have been called'); - System.assertEquals(1, mockDML.recordsForInsert.size()); + Assert.areEqual(1, mockDML.recordsForInsert.size()); } @IsTest @@ -83,7 +83,7 @@ private with sharing class fflib_SObjectUnitOfWorkTest catch (Exception e) { exceptionThrown = true; - System.assertEquals( + Assert.areEqual( 'Only new records can be registered as new', e.getMessage(), 'Incorrect exception message thrown' @@ -91,7 +91,7 @@ private with sharing class fflib_SObjectUnitOfWorkTest } // THEN it should have thrown an exception - System.assert(exceptionThrown); + Assert.isTrue(exceptionThrown); } @IsTest @@ -110,7 +110,7 @@ private with sharing class fflib_SObjectUnitOfWorkTest catch (Exception e) { exceptionThrown = true; - System.assertEquals( + Assert.areEqual( 'New records cannot be registered as dirty', e.getMessage(), 'Incorrect exception message thrown' @@ -118,7 +118,7 @@ private with sharing class fflib_SObjectUnitOfWorkTest } // THEN it should have thrown an exception - System.assert(exceptionThrown); + Assert.isTrue(exceptionThrown); } @IsTest @@ -135,7 +135,7 @@ private with sharing class fflib_SObjectUnitOfWorkTest unitOfWork.commitWork(); // THEN - the dmlDelete action should be invoked - System.assertEquals(new List { opportunity, product }, mockDML.recordsForDelete); + Assert.areEqual(new List { opportunity, product }, mockDML.recordsForDelete); } @IsTest @@ -152,8 +152,8 @@ private with sharing class fflib_SObjectUnitOfWorkTest unitOfWork.commitWork(); // THEN - the dmlDelete and emptyRecycleBin actions should be invoked - System.assertEquals(new List { opportunity, product }, mockDML.recordsForDelete); - System.assertEquals(new List { opportunity, product }, mockDML.recordsForRecycleBin); + Assert.areEqual(new List { opportunity, product }, mockDML.recordsForDelete); + Assert.areEqual(new List { opportunity, product }, mockDML.recordsForRecycleBin); } @IsTest @@ -169,7 +169,7 @@ private with sharing class fflib_SObjectUnitOfWorkTest unitOfWork.commitWork(); // THEN - the emptyRecycleBin action should be invoked - System.assertEquals(1, mockDML.recordsForRecycleBin.size()); + Assert.areEqual(1, mockDML.recordsForRecycleBin.size()); } @IsTest @@ -191,13 +191,13 @@ private with sharing class fflib_SObjectUnitOfWorkTest catch (Exception e) { exceptionThrown = true; - System.assert( + Assert.isTrue( e.getMessage().contains('registerPublishBeforeTransaction'), 'Incorrect exception message thrown' ); } - System.assert(exceptionThrown); + Assert.isTrue(exceptionThrown); } @IsTest @@ -219,13 +219,13 @@ private with sharing class fflib_SObjectUnitOfWorkTest catch (Exception e) { exceptionThrown = true; - System.assert( + Assert.isTrue( e.getMessage().contains('invalid for publishing'), 'Incorrect exception message thrown' ); } - System.assert(exceptionThrown); + Assert.isTrue(exceptionThrown); } @IsTest @@ -240,13 +240,13 @@ private with sharing class fflib_SObjectUnitOfWorkTest catch (Exception e) { exceptionThrown = true; - System.assert( + Assert.isTrue( e.getMessage().contains('not supported by this unit of work'), 'Incorrect exception message thrown' ); } - System.assert(exceptionThrown); + Assert.isTrue(exceptionThrown); } /** @@ -290,7 +290,7 @@ private with sharing class fflib_SObjectUnitOfWorkTest uow.commitWork(); // Assert Results - System.assertEquals(175, mockDML.recordsForInsert.size(), 'Incorrect of new records'); + Assert.areEqual(175, mockDML.recordsForInsert.size(), 'Incorrect of new records'); assertEvents(new List { 'onCommitWorkStarting' @@ -335,8 +335,8 @@ private with sharing class fflib_SObjectUnitOfWorkTest } // Assert Results - System.assertEquals(didFail, true, 'didFail'); - System.assert(caughtEx.getMessage().contains('REQUIRED_FIELD_MISSING'), String.format('Exception message was {0}', new List { caughtEx.getMessage() })); + Assert.areEqual(didFail, true, 'didFail'); + Assert.isTrue(caughtEx.getMessage().contains('REQUIRED_FIELD_MISSING'), String.format('Exception message was {0}', new List { caughtEx.getMessage() })); assertEvents(new List { 'onCommitWorkStarting' @@ -386,8 +386,8 @@ private with sharing class fflib_SObjectUnitOfWorkTest } // Assert Results - System.assertEquals(didFail, true, 'didFail'); - System.assert(caughtEx.getMessage().contains('Work failed.'), String.format('Exception message was {0}', new List { caughtEx.getMessage() })); + Assert.areEqual(didFail, true, 'didFail'); + Assert.isTrue(caughtEx.getMessage().contains('Work failed.'), String.format('Exception message was {0}', new List { caughtEx.getMessage() })); assertEvents(new List { 'onCommitWorkStarting' @@ -428,8 +428,8 @@ private with sharing class fflib_SObjectUnitOfWorkTest uow.registerDirty(opp2); uow.commitWork(); - System.assertEquals(1, mockDML.recordsForUpdate.size()); - System.assertEquals('Expected', mockDML.recordsForUpdate.get(0).get(Schema.Opportunity.Name)); + Assert.areEqual(1, mockDML.recordsForUpdate.size()); + Assert.areEqual('Expected', mockDML.recordsForUpdate.get(0).get(Schema.Opportunity.Name)); } /** @@ -455,9 +455,9 @@ private with sharing class fflib_SObjectUnitOfWorkTest uow.registerDirty(amountUpdate, new List { Opportunity.Amount } ); uow.commitWork(); - System.assertEquals(1, mockDML.recordsForUpdate.size()); - System.assertEquals(nameUpdate.Name, mockDML.recordsForUpdate.get(0).get(Schema.Opportunity.Name)); - System.assertEquals(amountUpdate.Amount, mockDML.recordsForUpdate.get(0).get(Schema.Opportunity.Amount)); + Assert.areEqual(1, mockDML.recordsForUpdate.size()); + Assert.areEqual(nameUpdate.Name, mockDML.recordsForUpdate.get(0).get(Schema.Opportunity.Name)); + Assert.areEqual(amountUpdate.Amount, mockDML.recordsForUpdate.get(0).get(Schema.Opportunity.Amount)); } /** @@ -499,7 +499,7 @@ private with sharing class fflib_SObjectUnitOfWorkTest uow.commitWork(); // THEN the records should be registered with both changed values for Amount and StageName - System.assert( + Assert.isTrue( new fflib_MatcherDefinitions.SObjectsWith( new List>{ new Map @@ -567,7 +567,7 @@ private with sharing class fflib_SObjectUnitOfWorkTest uow.commitWork(); // THEN only the first record should be registered with both changed values for Amount and StageName and the second should be the original - System.assert( + Assert.isTrue( !new fflib_MatcherDefinitions.SObjectsWith( new List>{ new Map @@ -587,7 +587,7 @@ private with sharing class fflib_SObjectUnitOfWorkTest .matches(mockDML.recordsForUpdate), 'Not all records should not be registered with the dirty values' ); - System.assert( + Assert.isTrue( new fflib_MatcherDefinitions.SObjectsWith( new List>{ new Map @@ -625,20 +625,20 @@ private with sharing class fflib_SObjectUnitOfWorkTest uow.commitWork(); Test.stopTest(); - System.assertEquals(1, mockDML.recordsForUpdate.size()); - System.assertEquals(1, mockDML.recordsForInsert.size()); + Assert.areEqual(1, mockDML.recordsForUpdate.size()); + Assert.areEqual(1, mockDML.recordsForInsert.size()); } @IsTest private static void constructUserModeDML_When_DefaultConstructor_Expect_UserMode(){ fflib_SObjectUnitOfWork.UserModeDML dml = new fflib_SObjectUnitOfWork.UserModeDML(); - System.assertEquals(AccessLevel.USER_MODE,dml.m_accessLevel); + Assert.areEqual(AccessLevel.USER_MODE,dml.m_accessLevel); } @IsTest private static void constructUserModeDML_When_AccessLevelSupplied_Expect_SameAccessLevel(){ fflib_SObjectUnitOfWork.UserModeDML dml = new fflib_SObjectUnitOfWork.UserModeDML(AccessLevel.SYSTEM_MODE); - System.assertEquals(AccessLevel.SYSTEM_MODE,dml.m_accessLevel); + Assert.areEqual(AccessLevel.SYSTEM_MODE,dml.m_accessLevel); } /** @@ -648,17 +648,17 @@ private with sharing class fflib_SObjectUnitOfWorkTest private static void assertEvents(List expectedEvents, List actualEvents, Set expectedTypes, Set actualTypes) { // assert that events match - System.assertEquals(expectedEvents.size(), actualEvents.size(), 'events size'); + Assert.areEqual(expectedEvents.size(), actualEvents.size(), 'events size'); for (Integer i = 0; i < expectedEvents.size(); i++) { - System.assertEquals(expectedEvents[i], actualEvents[i], String.format('Event {0} was not fired in order expected.', new List { expectedEvents[i] })); + Assert.areEqual(expectedEvents[i], actualEvents[i], String.format('Event {0} was not fired in order expected.', new List { expectedEvents[i] })); } // assert that types match - System.assertEquals(expectedTypes.size(), actualTypes.size(), 'types size'); + Assert.areEqual(expectedTypes.size(), actualTypes.size(), 'types size'); for (Schema.SObjectType sObjectType :expectedTypes) { - System.assertEquals(true, actualTypes.contains(sObjectType), String.format('Type {0} was not registered.', new List { sObjectType.getDescribe().getName() })); + Assert.areEqual(true, actualTypes.contains(sObjectType), String.format('Type {0} was not registered.', new List { sObjectType.getDescribe().getName() })); } } diff --git a/sfdx-source/apex-common/test/classes/fflib_SObjectsTest.cls b/sfdx-source/apex-common/test/classes/fflib_SObjectsTest.cls index dd5bd13f0a..b889fb1898 100644 --- a/sfdx-source/apex-common/test/classes/fflib_SObjectsTest.cls +++ b/sfdx-source/apex-common/test/classes/fflib_SObjectsTest.cls @@ -33,23 +33,23 @@ private class fflib_SObjectsTest { Account record = new Account(ShippingCountry = 'Holland'); DomainAccounts domain = new DomainAccounts(new List{ record }); - System.assert(!domain.selectByShippingCountry('Holland').isEmpty(), 'Incorrect test data'); + Assert.isFalse(domain.selectByShippingCountry('Holland').isEmpty(), 'Incorrect test data'); domain.clearShippingCountry(); - System.assert(domain.selectByShippingCountry('Holland').isEmpty(), 'Field should have been nullified'); + Assert.isTrue(domain.selectByShippingCountry('Holland').isEmpty(), 'Field should have been nullified'); } @IsTest static void itShouldReturnTheDomainsType() { - System.assertEquals( + Assert.areEqual( (Object) Schema.Account.SObjectType, new DomainAccounts(new List()) .getType(), 'Unexpected Domain Type' ); - System.assertEquals( + Assert.areEqual( Schema.Account.SObjectType, new DomainAccounts(new List()) .getSObjectType(), @@ -76,12 +76,12 @@ private class fflib_SObjectsTest ); Set recordIds = new Set {idA, idB, idC}; - System.assert( + Assert.isTrue( domain.getRecordIds().equals(recordIds), 'The domain should return all the record Ids' ); - System.assert( + Assert.isTrue( domain.getIdFieldValues(Schema.Account.Id).equals(recordIds), 'The domain should return all the record Ids' ); @@ -92,7 +92,7 @@ private class fflib_SObjectsTest { DomainAccounts domain = generateDomain(); - System.assert(domain.selectByShippingCountry('USA').size() == 1); + Assert.areEqual(1, domain.selectByShippingCountry('USA').size(), 'Should have one record with USA shipping country'); } @IsTest @@ -100,7 +100,7 @@ private class fflib_SObjectsTest { DomainAccounts domain = generateDomain(); - System.assertEquals(3, domain.selectWithoutShippingCountry().size()); + Assert.areEqual(3, domain.selectWithoutShippingCountry().size()); } @IsTest @@ -108,7 +108,7 @@ private class fflib_SObjectsTest { DomainAccounts domain = generateDomain(); - System.assert(domain.selectWithEmptyRecord().size() == 1); + Assert.areEqual(1, domain.selectWithEmptyRecord().size(), 'Should have one empty record'); } @IsTest @@ -116,7 +116,7 @@ private class fflib_SObjectsTest { DomainAccounts domain = generateDomain(); - System.assert(domain.selectWithShippingCountry().size() == 4); + Assert.areEqual(4, domain.selectWithShippingCountry().size(), 'Should have four records with shipping country'); } @IsTest @@ -124,7 +124,7 @@ private class fflib_SObjectsTest { DomainAccounts domain = generateDomain(); - System.assert(domain.selectPopulatedRecords().size() == 4); + Assert.areEqual(4, domain.selectPopulatedRecords().size()); } @IsTest @@ -141,11 +141,11 @@ private class fflib_SObjectsTest 'UK', 'USA' }; - System.assert( + Assert.isTrue( domain.getStringFieldValues(Schema.Account.ShippingCountry).equals(expected) ); - System.assert( + Assert.isTrue( domain.getFieldValues(Schema.Account.ShippingCountry) .equals(expected) ); @@ -158,7 +158,7 @@ private class fflib_SObjectsTest String country = 'Holland'; domain.setShippingCountry(country); - System.assert(domain.selectByShippingCountry(country).size() == 7); + Assert.areEqual(7, domain.selectByShippingCountry(country).size()); } @@ -173,7 +173,7 @@ private class fflib_SObjectsTest } ); - System.assert(domain.selectByRating('Hot').size() == 1); + Assert.areEqual(1, domain.selectByRating('Hot').size()); } @IsTest @@ -185,9 +185,9 @@ private class fflib_SObjectsTest DomainAccounts domain = new DomainAccounts(new List{ record }); domain.addNameError(errorMessage); - System.assertEquals(1, fflib_SObjects.Errors.getAll().size()); - System.assertEquals(errorMessage, fflib_SObjects.Errors.getAll()[0].message); - System.assertEquals(Account.Name, ((fflib_SObjects.FieldError) fflib_SObjects.Errors.getAll()[0]).field); + Assert.areEqual(1, fflib_SObjects.Errors.getAll().size()); + Assert.areEqual(errorMessage, fflib_SObjects.Errors.getAll()[0].message); + Assert.areEqual(Account.Name, ((fflib_SObjects.FieldError) fflib_SObjects.Errors.getAll()[0]).field); } @IsTest @@ -197,12 +197,12 @@ private class fflib_SObjectsTest Opportunity opp = new Opportunity ( Name = 'Test', Type = 'Existing Account' ); fflib_SObjects.Errors.error('Error', opp); fflib_SObjects.Errors.error('Error', opp, Opportunity.Type); - System.assertEquals(2, fflib_SObjects.Errors.getAll().size()); - System.assertEquals('Error', fflib_SObjects.Errors.getAll()[0].message); - System.assertEquals('Error', fflib_SObjects.Errors.getAll()[1].message); - System.assertEquals(Opportunity.Type, ((fflib_SObjects.FieldError) fflib_SObjects.Errors.getAll()[1]).field); + Assert.areEqual(2, fflib_SObjects.Errors.getAll().size()); + Assert.areEqual('Error', fflib_SObjects.Errors.getAll()[0].message); + Assert.areEqual('Error', fflib_SObjects.Errors.getAll()[1].message); + Assert.areEqual(Opportunity.Type, ((fflib_SObjects.FieldError) fflib_SObjects.Errors.getAll()[1]).field); fflib_SObjects.Errors.clearAll(); - System.assertEquals(0, fflib_SObjects.Errors.getAll().size()); + Assert.areEqual(0, fflib_SObjects.Errors.getAll().size()); } private static DomainAccounts generateDomain() diff --git a/sfdx-source/apex-common/test/classes/fflib_SecurityUtilsTest.cls b/sfdx-source/apex-common/test/classes/fflib_SecurityUtilsTest.cls index 5b30aab02e..7de7a31384 100644 --- a/sfdx-source/apex-common/test/classes/fflib_SecurityUtilsTest.cls +++ b/sfdx-source/apex-common/test/classes/fflib_SecurityUtilsTest.cls @@ -136,8 +136,8 @@ private class fflib_SecurityUtilsTest { }catch(fflib_SecurityUtils.SecurityException e){ ex = e; } - System.assertNotEquals(null, ex, 'Read only profile should not be able to insert Account.Name'); - System.assert(ex instanceof fflib_SecurityUtils.FlsException, 'Expected an FlsException, got '+ex.getTypeName()); + Assert.areNotEqual(null, ex, 'Read only profile should not be able to insert Account.Name'); + Assert.isInstanceOfType(ex, fflib_SecurityUtils.FlsException.class, 'Expected an FlsException, got '+ex.getTypeName()); } { fflib_SecurityUtils.SecurityException ex; @@ -146,7 +146,7 @@ private class fflib_SecurityUtilsTest { }catch(fflib_SecurityUtils.SecurityException e){ ex = e; } - System.assertEquals(null, ex, 'Read only profile should be able to read Contact.LastName'); + Assert.areEqual(null, ex, 'Read only profile should be able to read Contact.LastName'); } { fflib_SecurityUtils.SecurityException ex; @@ -155,8 +155,8 @@ private class fflib_SecurityUtilsTest { }catch(fflib_SecurityUtils.SecurityException e){ ex = e; } - System.assertNotEquals(null, ex, 'Read only profile should not be able to update Lead.Company'); - System.assert(ex instanceof fflib_SecurityUtils.FlsException, 'Expected an FlsException, got '+ex.getTypeName()); + Assert.areNotEqual(null, ex, 'Read only profile should not be able to update Lead.Company'); + Assert.isInstanceOfType(ex, fflib_SecurityUtils.FlsException.class, 'Expected an FlsException, got '+ex.getTypeName()); } fflib_SecurityUtils.BYPASS_INTERNAL_FLS_AND_CRUD = true; @@ -179,8 +179,8 @@ private class fflib_SecurityUtilsTest { }catch(fflib_SecurityUtils.SecurityException e){ ex = e; } - System.assertNotEquals(null, ex, 'Read only profile should not be able to insert Account'); - System.assert(ex instanceof fflib_SecurityUtils.CrudException, 'Expected an CrudException, got '+ex.getTypeName()); + Assert.areNotEqual(null, ex, 'Read only profile should not be able to insert Account'); + Assert.isInstanceOfType(ex, fflib_SecurityUtils.CrudException.class, 'Expected an CrudException, got '+ex.getTypeName()); } { fflib_SecurityUtils.SecurityException ex; @@ -189,7 +189,7 @@ private class fflib_SecurityUtilsTest { }catch(fflib_SecurityUtils.SecurityException e){ ex = e; } - System.assertEquals(null, ex, 'Read only profile should be able to read Contact'); + Assert.areEqual(null, ex, 'Read only profile should be able to read Contact'); } { fflib_SecurityUtils.SecurityException ex; @@ -198,8 +198,8 @@ private class fflib_SecurityUtilsTest { }catch(fflib_SecurityUtils.SecurityException e){ ex = e; } - System.assertNotEquals(null, ex, 'Read only profile should not be able to update Lead'); - System.assert(ex instanceof fflib_SecurityUtils.CrudException, 'Expected an CrudException, got '+ex.getTypeName()); + Assert.areNotEqual(null, ex, 'Read only profile should not be able to update Lead'); + Assert.isInstanceOfType(ex, fflib_SecurityUtils.CrudException.class, 'Expected an CrudException, got '+ex.getTypeName()); } { fflib_SecurityUtils.SecurityException ex; @@ -208,8 +208,8 @@ private class fflib_SecurityUtilsTest { }catch(fflib_SecurityUtils.SecurityException e){ ex = e; } - System.assertNotEquals(null, ex, 'Read only profile should not be able to delete Opportunity'); - System.assert(ex instanceof fflib_SecurityUtils.CrudException, 'Expected an CrudException, got '+ex.getTypeName()); + Assert.areNotEqual(null, ex, 'Read only profile should not be able to delete Opportunity'); + Assert.isInstanceOfType(ex, fflib_SecurityUtils.CrudException.class, 'Expected an CrudException, got '+ex.getTypeName()); } fflib_SecurityUtils.BYPASS_INTERNAL_FLS_AND_CRUD = true; @@ -240,8 +240,8 @@ private class fflib_SecurityUtilsTest { }catch(fflib_SecurityUtils.SecurityException e){ ex = e; } - System.assertNotEquals(null, ex, 'Read only profile should not be able to insert Account'); - System.assert(ex instanceof fflib_SecurityUtils.CrudException, 'Expected an CrudException, got '+ex.getTypeName()); + Assert.areNotEqual(null, ex, 'Read only profile should not be able to insert Account'); + Assert.isInstanceOfType(ex, fflib_SecurityUtils.CrudException.class, 'Expected an CrudException, got '+ex.getTypeName()); } { fflib_SecurityUtils.SecurityException ex; @@ -257,7 +257,7 @@ private class fflib_SecurityUtilsTest { }catch(fflib_SecurityUtils.SecurityException e){ ex = e; } - System.assertEquals(null, ex, 'Read only profile should be able to read Contact'); + Assert.areEqual(null, ex, 'Read only profile should be able to read Contact'); } { fflib_SecurityUtils.SecurityException ex; @@ -273,8 +273,8 @@ private class fflib_SecurityUtilsTest { }catch(fflib_SecurityUtils.SecurityException e){ ex = e; } - System.assertNotEquals(null, ex, 'Read only profile should not be able to update Lead'); - System.assert(ex instanceof fflib_SecurityUtils.CrudException, 'Expected an CrudException, got '+ex.getTypeName()); + Assert.areNotEqual(null, ex, 'Read only profile should not be able to update Lead'); + Assert.isInstanceOfType(ex, fflib_SecurityUtils.CrudException.class, 'Expected an CrudException, got '+ex.getTypeName()); } fflib_SecurityUtils.BYPASS_INTERNAL_FLS_AND_CRUD = true; diff --git a/sfdx-source/apex-common/test/classes/fflib_StringBuilderTest.cls b/sfdx-source/apex-common/test/classes/fflib_StringBuilderTest.cls index 4b48e377e4..e22d387a24 100644 --- a/sfdx-source/apex-common/test/classes/fflib_StringBuilderTest.cls +++ b/sfdx-source/apex-common/test/classes/fflib_StringBuilderTest.cls @@ -32,7 +32,7 @@ private with sharing class fflib_StringBuilderTest fflib_StringBuilder sb = new fflib_StringBuilder(); sb.add('this is a string'); sb.add(new List{', which is made',' up from\r ','a number of smaller strings', '. 5 in this case!'}); - system.assertEquals(sb.getStringValue(),'this is a string, which is made up from\r a number of smaller strings. 5 in this case!'); + Assert.areEqual(sb.getStringValue(),'this is a string, which is made up from\r a number of smaller strings. 5 in this case!'); } static testMethod void testfflib_StringBuilder2() @@ -40,7 +40,7 @@ private with sharing class fflib_StringBuilderTest fflib_StringBuilder sb = new fflib_StringBuilder(new List{'apples',' and ','pears',': stairs. '}); sb.add('this is a string'); sb.add(new List{', which is made',' up from\r ','a number of smaller strings', '. 5 in this case!'}); - system.assertEquals(sb.getStringValue(),'apples and pears: stairs. this is a string, which is made up from\r a number of smaller strings. 5 in this case!'); + Assert.areEqual(sb.getStringValue(),'apples and pears: stairs. this is a string, which is made up from\r a number of smaller strings. 5 in this case!'); } static testMethod void testCommaDelimitedBuilder1() @@ -48,7 +48,7 @@ private with sharing class fflib_StringBuilderTest fflib_StringBuilder.CommaDelimitedListBuilder sb = new fflib_StringBuilder.CommaDelimitedListBuilder(); sb.add('a'); sb.add(new List{'b','c','d'}); - system.assertEquals(sb.getStringValue(),'a,b,c,d'); + Assert.areEqual(sb.getStringValue(),'a,b,c,d'); } static testMethod void testCommaDelimitedBuilder2() @@ -56,7 +56,7 @@ private with sharing class fflib_StringBuilderTest fflib_StringBuilder.CommaDelimitedListBuilder sb = new fflib_StringBuilder.CommaDelimitedListBuilder(new List{'x','y'}); sb.add('a'); sb.add(new List{'b','c','d'}); - system.assertEquals(sb.getStringValue(),'x,y,a,b,c,d'); + Assert.areEqual(sb.getStringValue(),'x,y,a,b,c,d'); } static testMethod void testCommanDelimitedBuilderWithItemPrefix() @@ -64,7 +64,7 @@ private with sharing class fflib_StringBuilderTest fflib_StringBuilder.CommaDelimitedListBuilder sb = new fflib_StringBuilder.CommaDelimitedListBuilder(new List{'x','y'}); sb.add('a'); sb.add(new List{'b','c','d'}); - system.assertEquals(sb.getStringValue('$'),'$x,$y,$a,$b,$c,$d'); + Assert.areEqual(sb.getStringValue('$'),'$x,$y,$a,$b,$c,$d'); } static testMethod void testCommanDelimitedBuilderWithAlternativeDelimiter() @@ -73,7 +73,7 @@ private with sharing class fflib_StringBuilderTest sb.setDelimiter(';'); sb.add('a'); sb.add(new List{'b','c','d'}); - system.assertEquals(sb.getStringValue(),'x;y;a;b;c;d'); + Assert.areEqual(sb.getStringValue(),'x;y;a;b;c;d'); } static testMethod void testCommanDelimitedBuilderWithAlternativeDelimiterAndPrefix() @@ -83,7 +83,7 @@ private with sharing class fflib_StringBuilderTest sb.setDelimiter(':'); sb.add('a'); sb.add(new List{'b','c','d'}); - system.assertEquals(sb.getStringValue(),'#x:#y:#a:#b:#c:#d'); + Assert.areEqual(sb.getStringValue(),'#x:#y:#a:#b:#c:#d'); } static testMethod void testFieldListBuilder() @@ -92,11 +92,11 @@ private with sharing class fflib_StringBuilderTest fflib_StringBuilder.FieldListBuilder sb = new fflib_StringBuilder.FieldListBuilder(fields); List fieldList = sb.getStringValue().split(','); Set fieldSet = new Set(fieldList); - system.assertEquals(4, fieldSet.size()); - system.assert(fieldSet.contains('Name')); - system.assert(fieldSet.contains('Id')); - system.assert(fieldSet.contains('AccountNumber')); - system.assert(fieldSet.contains('AnnualRevenue')); + Assert.areEqual(4, fieldSet.size()); + Assert.isTrue(fieldSet.contains('Name')); + Assert.isTrue(fieldSet.contains('Id')); + Assert.isTrue(fieldSet.contains('AccountNumber')); + Assert.isTrue(fieldSet.contains('AnnualRevenue')); } static testMethod void testMultiCurrencyFieldListBuilder() @@ -105,11 +105,11 @@ private with sharing class fflib_StringBuilderTest fflib_StringBuilder.MultiCurrencyFieldListBuilder sb = new fflib_StringBuilder.MultiCurrencyFieldListBuilder(fields); List fieldList = sb.getStringValue().split(','); Set fieldSet = new Set(fieldList); - system.assert(fieldSet.contains('Name')); - system.assert(fieldSet.contains('Id')); - system.assert(fieldSet.contains('AccountNumber')); - system.assert(fieldSet.contains('AnnualRevenue')); + Assert.isTrue(fieldSet.contains('Name')); + Assert.isTrue(fieldSet.contains('Id')); + Assert.isTrue(fieldSet.contains('AccountNumber')); + Assert.isTrue(fieldSet.contains('AnnualRevenue')); if(UserInfo.isMultiCurrencyOrganization()) - system.assert(fieldSet.contains('CurrencyIsoCode')); + Assert.isTrue(fieldSet.contains('CurrencyIsoCode')); } } \ No newline at end of file