Skip to content

Addresses intermittent unit test failures due to unexpected order of fields #33

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 28, 2015
Merged

Addresses intermittent unit test failures due to unexpected order of fields #33

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52b98d3
Modifies test assertions so they don't depend on fields being returne…
Feb 12, 2015
66d7c02
Simplifies testSOQL.
Feb 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 35 additions & 23 deletions fflib/src/classes/fflib_SObjectSelectorTest.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,10 @@ private with sharing class fflib_SObjectSelectorTest
static testMethod void testGetFieldListString()
{
Testfflib_SObjectSelector selector = new Testfflib_SObjectSelector();
List<String> fieldList = selector.getFieldListString().split(',');
Set<String> fieldSet = new Set<String>(fieldList);
system.assertEquals(Userinfo.isMultiCurrencyOrganization() ? 5 : 4, fieldSet.size());
system.assert(fieldSet.contains('Name'));
system.assert(fieldSet.contains('Id'));
system.assert(fieldSet.contains('AccountNumber'));
system.assert(fieldSet.contains('AnnualRevenue'));
if(UserInfo.isMultiCurrencyOrganization())
system.assert(fieldSet.contains('CurrencyIsoCode'));

String relatedFieldListString = Userinfo.isMultiCurrencyOrganization() ? 'myprefix.AccountNumber,myprefix.CurrencyIsoCode,myprefix.AnnualRevenue,myprefix.Id,myprefix.Name'
: 'myprefix.AccountNumber,myprefix.AnnualRevenue,myprefix.Id,myprefix.Name';
system.assertEquals(relatedFieldListString, selector.getRelatedFieldListString('myprefix'));
String fieldListString = selector.getFieldListString();
assertFieldListString(fieldListString, null);
String relatedFieldListString = selector.getRelatedFieldListString('myprefix');
assertFieldListString(relatedFieldListString, 'myprefix');
}

static testMethod void testGetSObjectName()
Expand Down Expand Up @@ -168,9 +159,13 @@ private with sharing class fflib_SObjectSelectorTest
static testMethod void testSOQL()
{
Testfflib_SObjectSelector selector = new Testfflib_SObjectSelector();
String soql = Userinfo.isMultiCurrencyOrganization() ? 'SELECT AccountNumber, CurrencyIsoCode, AnnualRevenue, Id, Name FROM Account ORDER BY Name DESC NULLS FIRST , AnnualRevenue ASC NULLS FIRST '
: 'SELECT AccountNumber, AnnualRevenue, Id, Name FROM Account ORDER BY Name DESC NULLS FIRST , AnnualRevenue ASC NULLS FIRST ';
System.assertEquals(soql, selector.newQueryFactory().toSOQL());
String soql = selector.newQueryFactory().toSOQL();
Pattern p = Pattern.compile('SELECT (.*) FROM Account ORDER BY Name DESC NULLS FIRST , AnnualRevenue ASC NULLS FIRST ');
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.');
String fieldListString = m.group(1);
assertFieldListString(fieldListString, null);
}

static testMethod void testDefaultConfig()
Expand All @@ -180,19 +175,36 @@ private with sharing class fflib_SObjectSelectorTest
System.assertEquals(true, selector.isEnforcingCRUD());
System.assertEquals(false, selector.isIncludeFieldSetFields());

String fieldListString = Userinfo.isMultiCurrencyOrganization() ? 'AccountNumber,CurrencyIsoCode,AnnualRevenue,Id,Name'
: 'AccountNumber,AnnualRevenue,Id,Name';
System.assertEquals(fieldListString, selector.getFieldListBuilder().getStringValue());
System.assertEquals(fieldListString, selector.getFieldListString());
String fieldListString = selector.getFieldListString();
assertFieldListString(fieldListString, null);

String relatedFieldListString = Userinfo.isMultiCurrencyOrganization() ? 'LookupField__r.AccountNumber,LookupField__r.CurrencyIsoCode,LookupField__r.AnnualRevenue,LookupField__r.Id,LookupField__r.Name'
: 'LookupField__r.AccountNumber,LookupField__r.AnnualRevenue,LookupField__r.Id,LookupField__r.Name';
System.assertEquals(relatedFieldListString, selector.getRelatedFieldListString('LookupField__r'));
String relatedFieldListString = selector.getRelatedFieldListString('LookupField__r');
assertFieldListString(relatedFieldListString, 'LookupField__r');

System.assertEquals('Account', selector.getSObjectName());
System.assertEquals(Account.SObjectType, selector.getSObjectType2());
}

private static void assertFieldListString(String fieldListString, String prefix) {
String prefixString = (!String.isBlank(prefix)) ? prefix + '.' : '';
List<String> fieldList = fieldListString.split(',{1}\\s?');
System.assertEquals(UserInfo.isMultiCurrencyOrganization() ? 5 : 4, fieldList.size());
Set<String> fieldSet = new Set<String>();
fieldSet.addAll(fieldList);
String expected = prefixString + 'AccountNumber';
System.assert(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);
expected = prefixString + 'Id';
System.assert(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);
if (UserInfo.isMultiCurrencyOrganization()) {
expected = prefixString + 'CurrencyIsoCode';
System.assert(fieldSet.contains(expected), expected + ' missing from field list string: ' + fieldListString);
}
}

private class Testfflib_SObjectSelector extends fflib_SObjectSelector
{
public Testfflib_SObjectSelector()
Expand Down