Skip to content

Add Meaningful variable names #68

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add Meaningful variable names #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f18f64
For fix https://github.com/OBJECTSEMANTICS/SmallSuiteGenerator/issues/16
Lin777 Jan 27, 2020
3fe67c8
Update tests
Lin777 Jan 27, 2020
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
30 changes: 15 additions & 15 deletions src/SmallSuiteGenerator-Tests/SChangeTest.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ SChangeTest >> testChangeStatementOfFactoryMessageWithAbstractClass [
self
assertCollection: (testCase statements collect: #printString)
hasSameElements:
#('_var0 := ArrayedCollection new.' '_var1 := ''hello''.' '_var2 := ArrayedCollection new.').
#('_anArrayedCollection0 := ArrayedCollection new.' '_aByteString1 := ''hello''.' '_anArrayedCollection2 := ArrayedCollection new.').
changed := testCase changeStatementOfClassName: #ArrayedCollection.
self assert: changed equals: false.
self
assertCollection: (testCase statements collect: #printString)
hasSameElements: #('_var1 := ''hello''.')
hasSameElements: #('_aByteString1 := ''hello''.')
]

{ #category : #'mutation-change' }
Expand All @@ -34,15 +34,15 @@ SChangeTest >> testChangeStatementOfFactoryMessageWithMoreThanOneLiteral [
expression := testCase addFactoryMessage: #SFoo ofSelector: #score:.
self
assertCollection: (testCase statements collect: #printString)
includesAll: #('_var0 := 7.3.' '_var1 := 7.3.').
includesAll: #('_aSmallFloat640 := 7.3.' '_aSmallFloat641 := 7.3.').
self
assert:
(#('_var2 := SFoo score: _var0.' '_var2 := SFoo score: _var1.')
(#('_aSFoo2 := SFoo score: _aSmallFloat640.' '_aSFoo2 := SFoo score: _aSmallFloat641.')
includes: expression printString).
expressionChanged := testCase changeStatementOfVarName: '_var2'.
expressionChanged := testCase changeStatementOfVarName: '_aSFoo2'.
self
assert:
(#('_var2 := SFoo score: _var0.' '_var2 := SFoo score: _var1.' '_var2 := SFoo new.')
(#('_aSFoo2 := SFoo score: _aSmallFloat640.' '_aSFoo2 := SFoo score: _aSmallFloat641.' '_aSFoo2 := SFoo new.')
includes: expressionChanged printString).
self assert: testCase validReferences
]
Expand All @@ -55,11 +55,11 @@ SChangeTest >> testChangeStatementOfFactoryMessageWithOneLiteral [
addFactoryMessage.
self
assertCollection: (testCase statements collect: #printString)
hasSameElements: #('_var0 := 7.3.' '_var1 := SFoo score: _var0.').
expressionChanged := testCase changeStatementOfVarName: '_var1'.
hasSameElements: #('_aSmallFloat640 := 7.3.' '_aSFoo1 := SFoo score: _aSmallFloat640.').
expressionChanged := testCase changeStatementOfVarName: '_aSFoo1'.
self
assert:
(#('_var1 := SFoo new.' '_var1 := SFoo score: _var2.')
(#('_aSFoo1 := SFoo new.' '_aSFoo1 := SFoo score: _aSmallFloat642.')
includes: expressionChanged printString).
self assert: testCase validReferences
]
Expand All @@ -75,11 +75,11 @@ SChangeTest >> testChangeStatementOfFieldAccessMessage [
from: #SStack) copy.
self
assertCollection: (testCase statements collect: #printString)
hasSameElements: #('_var0 := SStack newStack.' '_var1 := _var0 firstLinkStack.').
hasSameElements: #('_aSStack0 := SStack newStack.' '_aSmallInteger1 := _aSStack0 firstLinkStack.').
exprFieldChanged := testCase changeStatement: exprField.
self
assert:
(#('_var1 := _var0 lastLinkStack.' '_var1 := _var3 firstLinkStack.' '_var1 := _var2 firstLinkStack.')
(#('_aSmallInteger1 := _aSStack0 lastLinkStack.' '_aSmallInteger1 := _aSStack3 firstLinkStack.' '_aSmallInteger1 := _aSStack2 firstLinkStack.')
includes: exprFieldChanged printString).
self assert: testCase validReferences
]
Expand All @@ -91,8 +91,8 @@ SChangeTest >> testChangeStatementOfLiteral [
exprLiteral := (testCase addLiteral: #SmallInteger) copy.
self
assertCollection: (testCase statements collect: #printString)
hasSameElements: #('_var0 := 5.').
exprLiteralChanged := testCase changeStatementOfVarName: '_var0'.
hasSameElements: #('_aSmallInteger0 := 5.').
exprLiteralChanged := testCase changeStatementOfVarName: '_aSmallInteger0'.
self deny: exprLiteral equals: exprLiteralChanged.
self assert: testCase validReferences
]
Expand All @@ -106,11 +106,11 @@ SChangeTest >> testChangeStatementOfMessage [
exprMessage := (testCase addMessage: #pop from: #SStack) copy.
self
assertCollection: (testCase statements collect: #printString)
hasSameElements: #('_var0 := SStack newStack.' '_var1 := _var0 pop.').
hasSameElements: #('_aSStack0 := SStack newStack.' '_aSmallInteger1 := _aSStack0 pop.').
exprLiteralChanged := testCase changeStatement: exprMessage.
self
assert:
(#('_var1 := _var0 top.' '_var1 := _var0 push: _var2.' '_var1 := _var3 pop.' '_var1 := _var2 pop.')
(#('_aSmallInteger1 := _aSStack0 top.' '_aSmallInteger1 := _aSStack0 push: _aSmallInteger2.' '_aSmallInteger1 := _aSStack3 pop.' '_aSmallInteger1 := _aSStack2 pop.')
includes: exprLiteralChanged printString).
self assert: testCase validReferences
]
10 changes: 5 additions & 5 deletions src/SmallSuiteGenerator-Tests/SFactoryMessageTest.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ SFactoryMessageTest >> testInsertAsParameterUsing [
testCase addMessage.
self
assertCollection: (testCase statements collect: #printString)
hasSameElements: #('_var0 := SFoo new.' '_var1 := _var0 return: _var0.').
hasSameElements: #('_aSFoo0 := SFoo new.' '_aSFoo1 := _aSFoo0 return: _aSFoo0.').
insertedExpression := expression
insertAsParameter: expression
using: testCase.
self
assert:
(#('_var1 := _var0 return: _var0.')
(#('_aSFoo1 := _aSFoo0 return: _aSFoo0.')
includes: insertedExpression printString)
]

Expand All @@ -51,7 +51,7 @@ SFactoryMessageTest >> testInsertMethodMessageUsing [
expression := testCase addFactoryMessage: #SFoo.
self
assertCollection: (testCase statements collect: #printString)
hasSameElements: #('_var0 := 7.3.' '_var1 := SFoo score: _var0.').
hasSameElements: #('_aSmallFloat640 := 7.3.' '_aSFoo1 := SFoo score: _aSmallFloat640.').
self
should: [ expression insertMethodMessage: expression using: testCase ]
raise: SError
Expand All @@ -65,10 +65,10 @@ SFactoryMessageTest >> testInsertRandomMessageUsing [
factoryMessage := testCase addFactoryMessage: #SFoo.
self
assertCollection: (testCase statements collect: #printString)
hasSameElements: #('_var0 := 7.3.' '_var1 := SFoo score: _var0.').
hasSameElements: #('_aSmallFloat640 := 7.3.' '_aSFoo1 := SFoo score: _aSmallFloat640.').
factoryMessage insertRandomMessage: factoryMessage using: testCase.
self
assertCollection: (testCase statements collect: #printString)
includesAll:
#('_var0 := 7.3.' '_var2 := SFoo score: _var0.' '_var1 := SFoo score: _var0.')
#('_aSmallFloat640 := 7.3.' '_aSFoo2 := SFoo score: _aSmallFloat640.' '_aSFoo1 := SFoo score: _aSmallFloat640.')
]
12 changes: 6 additions & 6 deletions src/SmallSuiteGenerator-Tests/SFieldAccessMessageTest.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ SFieldAccessMessageTest >> testCopy [
id: 0;
returnType: #SStack);
selector: #firstLinkStack.
self assert: expression printString equals: '_var0 firstLinkStack'.
self assert: expression printString equals: '_aSStack0 firstLinkStack'.
copy := expression copy.
copy value receiver varName: '_sstack'.
copy value receiver id: 4.
self assert: copy printString equals: '_sstack4 firstLinkStack'.
copy value selector: #lastLinkStack.
self assert: copy printString equals: '_sstack4 lastLinkStack'.
self assert: expression printString equals: '_var0 firstLinkStack'
self assert: expression printString equals: '_aSStack0 firstLinkStack'
]

{ #category : #tests }
Expand All @@ -35,14 +35,14 @@ SFieldAccessMessageTest >> testInsertAsParameterUsing [
self
assertCollection: (testCase statements collect: #printString)
hasSameElements:
#('_var0 := #(1 4 5 ).' '_var1 := SStack newStackWith: _var0.' '_var2 := _var1 firstLinkStack.' '_var3 := 5.').
#('_anArray0 := #(1 4 5 ).' '_aSStack1 := SStack newStackWith: _anArray0.' '_aSmallInteger2 := _aSStack1 firstLinkStack.' '_aSmallInteger3 := 5.').
testCase addMessage: #push: from: #SStack.
insertedExpression := expression
insertAsParameter: expression
using: testCase.
self
assert: insertedExpression printString
equals: '_var4 := _var1 push: _var2.'
equals: '_aSmallInteger4 := _aSStack1 push: _aSmallInteger2.'
]

{ #category : #tests }
Expand All @@ -54,10 +54,10 @@ SFieldAccessMessageTest >> testInsertRandomMessageUsing [
self
assertCollection: (testCase statements collect: #printString)
hasSameElements:
#('_var0 := 7.3.' '_var1 := SFoo score: _var0.' '_var2 := _var1 score.').
#('_aSmallFloat640 := 7.3.' '_aSFoo1 := SFoo score: _aSmallFloat640.' '_aSmallFloat642 := _aSFoo1 score.').
aExpression insertRandomMessage: aExpression using: testCase.
self
assertCollection: (testCase statements collect: #printString)
includesAll:
#('_var0 := 7.3.' '_var1 := SFoo score: _var0.' '_var2 := _var1 score.' '_var3 := _var1 score.')
#('_aSmallFloat640 := 7.3.' '_aSFoo1 := SFoo score: _aSmallFloat640.' '_aSmallFloat642 := _aSFoo1 score.' '_aSmallFloat643 := _aSFoo1 score.')
]
70 changes: 35 additions & 35 deletions src/SmallSuiteGenerator-Tests/SInsertTest.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ SInsertTest >> testInsertStatementAsParameterInMessage [
assertCollection: (testCase statements collect: #printString)
hasSameElements:
(Array
with: '_var0 := SFoo new.'
with: '_var1 := ' , SStudent new storeString , '.'
with: '_var2 := _var0 return: _var1.'
with: '_var3 := ' , SStudent new storeString , '.').
with: '_aSFoo0 := SFoo new.'
with: '_aSStudent1 := ' , SStudent new storeString , '.'
with: '_aSStudent2 := _aSFoo0 return: _aSStudent1.'
with: '_aSStudent3 := ' , SStudent new storeString , '.').
self
should: [ testCase
perform: #insertAsParameter:using:
Expand All @@ -40,11 +40,11 @@ SInsertTest >> testInsertStatementAsParameterInMessage [
assertCollection: (testCase statements collect: #printString)
hasSameElements:
(Array
with: '_var0 := SFoo new.'
with: '_var1 := ' , SStudent new storeString , '.'
with: '_var2 := _var0 return: _var1.'
with: '_var3 := ' , SStudent new storeString , '.'
with: '_var4 := _var0 return: _var3.')
with: '_aSFoo0 := SFoo new.'
with: '_aSStudent1 := ' , SStudent new storeString , '.'
with: '_aSStudent2 := _aSFoo0 return: _aSStudent1.'
with: '_aSStudent3 := ' , SStudent new storeString , '.'
with: '_aSStudent4 := _aSFoo0 return: _aSStudent3.')
]

{ #category : #'mutation-insert' }
Expand All @@ -61,23 +61,23 @@ SInsertTest >> testInsertStatementOfMixingSelectors [
self
assertCollection: (testCase statements collect: #printString) allButLast
hasSameElements:
#('_var0 := 1.' '_var1 := SStudent new.' '_var2 := _var1 scoreStudent: _var0.' '_var3 := SStudent new.').
#('_aSmallInteger0 := 1.' '_aSStudent1 := SStudent new.' '_aSStudent2 := _aSStudent1 scoreStudent: _aSmallInteger0.' '_aSStudent3 := SStudent new.').
self
assert:
(#('_var4 := _var1 idStudent.' '_var4 := _var2 idStudent.' '_var4 := _var3 idStudent.')
includes: (testCase statementOfVarName: '_var4') printString).
fieldAccess := testCase statementOfVarName: '_var4'.
message := (testCase statementOfVarName: '_var2') value.
(#('_aSmallInteger4 := _aSStudent1 idStudent.' '_aSmallInteger4 := _aSStudent2 idStudent.' '_aSmallInteger4 := _var3 idStudent.')
includes: (testCase statementOfVarName: '_aSmallInteger4') printString).
fieldAccess := testCase statementOfVarName: '_aSmallInteger4'.
message := (testCase statementOfVarName: '_aSStudent2') value.
message := testCase insertExpression: message copy after: fieldAccess.
self
assert: message printString
equals: '_var5 := _var1 scoreStudent: _var0.'.
equals: '_aSStudent5 := _aSStudent1 scoreStudent: _aSmallInteger0.'.
message := testCase
perform: #insertAsParameter:using:
inStatement: fieldAccess.
self
assert: message printString
equals: '_var5 := _var1 scoreStudent: _var4.'
equals: '_aSStudent5 := _aSStudent1 scoreStudent: _aSmallInteger4.'
]

{ #category : #'mutation-insert' }
Expand All @@ -89,16 +89,16 @@ SInsertTest >> testInsertStatementOfSelectorAsParameterInFactoryMessage [
testCase addFactoryMessage.
self
assertCollection: (testCase statements collect: #printString)
hasSameElements: #('_var0 := SFoo new.' '_var1 := SFoo new.').
hasSameElements: #('_aSFoo0 := SFoo new.' '_aSFoo1 := SFoo new.').
auxExpr := testCase addMessage.
auxExpr value
receiver: (testCase statementOfVarName: '_var1') variable.
receiver: (testCase statementOfVarName: '_aSFoo1') variable.
auxExpr := testCase
perform: #insertAsParameter:using:
inStatement: expression.
self
assert: auxExpr printString
equals: '_var2 := _var1 return: _var0.'
equals: '_aSFoo2 := _aSFoo1 return: _aSFoo0.'
]

{ #category : #'mutation-insert' }
Expand All @@ -113,15 +113,15 @@ SInsertTest >> testInsertStatementOfSelectorAsParameterInFieldMessage [
self
assertCollection: (testCase statements collect: #printString)
hasSameElements:
#('_var0 := SStack newStack.' '_var1 := _var0 lastLinkStack.' '_var2 := 5.').
#('_aSStack0 := SStack newStack.' '_aSmallInteger1 := _aSStack0 lastLinkStack.' '_aSmallInteger2 := 5.').
testCase addMessage: #push: from: #SStack.
testCase
perform: #insertAsParameter:using:
inStatement: aExpression copy.
self
assertCollection: (testCase statements collect: #printString)
hasSameElements:
#('_var0 := SStack newStack.' '_var1 := _var0 lastLinkStack.' '_var2 := 5.' '_var3 := _var0 push: _var1.')
#('_aSStack0 := SStack newStack.' '_aSmallInteger1 := _aSStack0 lastLinkStack.' '_aSmallInteger2 := 5.' '_aSmallInteger3 := _aSStack0 push: _aSmallInteger1.')
]

{ #category : #'mutation-insert' }
Expand All @@ -134,15 +134,15 @@ SInsertTest >> testInsertStatementOfSelectorAsParameterInMessage [
self
assertCollection: (testCase statements collect: #printString)
hasSameElements:
#('_var0 := #(1 4 5 ).' '_var1 := SStack newStackWith: _var0.' '_var2 := _var1 pop.' '_var3 := 5.').
#('_anArray0 := #(1 4 5 ).' '_aSStack1 := SStack newStackWith: _anArray0.' '_aSmallInteger2 := _aSStack1 pop.' '_aSmallInteger3 := 5.').
testCase addMessage: #push: from: #SStack.
testCase
perform: #insertAsParameter:using:
inStatement: aExpression copy.
self
assertCollection: (testCase statements collect: #printString)
hasSameElements:
#('_var0 := #(1 4 5 ).' '_var1 := SStack newStackWith: _var0.' '_var2 := _var1 pop.' '_var3 := 5.' '_var4 := _var1 push: _var2.')
#('_anArray0 := #(1 4 5 ).' '_aSStack1 := SStack newStackWith: _anArray0.' '_aSmallInteger2 := _aSStack1 pop.' '_aSmallInteger3 := 5.' '_aSmallInteger4 := _aSStack1 push: _aSmallInteger2.')
]

{ #category : #'mutation-insert' }
Expand All @@ -153,7 +153,7 @@ SInsertTest >> testInsertStatementOfSelectorMethodMessageInFactoryMessage [
addFactoryMessage.
self
assertCollection: (testCase statements collect: #printString)
hasSameElements: #('_var0 := 7.3.' '_var1 := SFoo score: _var0.').
hasSameElements: #('_aSmallFloat640 := 7.3.' '_aSFoo1 := SFoo score: _aSmallFloat640.').
self
should: [ testCase insertStatementOfSelector: #insertMethodMessage:using: ]
raise: SError
Expand All @@ -168,7 +168,7 @@ SInsertTest >> testInsertStatementOfSelectorMethodMessageInFieldMessage [
self
assertCollection: (testCase statements collect: #printString)
hasSameElements:
#('_var0 := 7.3.' '_var1 := SFoo score: _var0.' '_var2 := _var1 score.').
#('_aSmallFloat640 := 7.3.' '_aSFoo1 := SFoo score: _aSmallFloat640.' '_aSmallFloat642 := _aSFoo1 score.').
self
should: [ testCase
perform: #insertMethodMessage:using:
Expand All @@ -183,7 +183,7 @@ SInsertTest >> testInsertStatementOfSelectorMethodMessageInLiteral [
testCase addLiteral: #SmallInteger.
self
assertCollection: (testCase statements collect: #printString)
hasSameElements: #('_var0 := 5.').
hasSameElements: #('_aSmallInteger0 := 5.').
self
should: [ testCase insertStatementOfSelector: #insertMethodMessage:using: ]
raise: SError
Expand All @@ -198,14 +198,14 @@ SInsertTest >> testInsertStatementOfSelectorMethodMessageInMessage [
self
assertCollection: (testCase statements collect: #printString)
hasSameElements:
#('_var0 := 7.3.' '_var1 := SFoo score: _var0.' '_var2 := _var1 returnNum.').
#('_aSmallFloat640 := 7.3.' '_aSFoo1 := SFoo score: _aSmallFloat640.' '_aSmallInteger2 := _aSFoo1 returnNum.').
testCase
perform: #insertMethodMessage:using:
inStatement: message copy.
self
assertCollection: (testCase statements collect: #printString)
hasSameElements:
#('_var0 := 7.3.' '_var1 := SFoo score: _var0.' '_var2 := _var1 returnNum.' '_var3 := _var1 returnNum.')
#('_aSmallFloat640 := 7.3.' '_aSFoo1 := SFoo score: _aSmallFloat640.' '_aSmallInteger2 := _aSFoo1 returnNum.' '_aSmallInteger3 := _aSFoo1 returnNum.')
]

{ #category : #'mutation-insert' }
Expand All @@ -216,12 +216,12 @@ SInsertTest >> testInsertStatementOfSelectorRandomMessageInFactoryMessage [
addFactoryMessage.
self
assertCollection: (testCase statements collect: #printString)
hasSameElements: #('_var0 := 7.3.' '_var1 := SFoo score: _var0.').
hasSameElements: #('_aSmallFloat640 := 7.3.' '_aSFoo1 := SFoo score: _aSmallFloat640.').
testCase insertStatementOfSelector: #insertRandomMessage:using:.
self
assertCollection: (testCase statements collect: #printString)
hasSameElements:
#('_var0 := 7.3.' '_var1 := SFoo score: _var0.' '_var2 := SFoo score: _var0.')
#('_aSmallFloat640 := 7.3.' '_aSFoo1 := SFoo score: _aSmallFloat640.' '_aSFoo2 := SFoo score: _aSmallFloat640.')
]

{ #category : #'mutation-insert' }
Expand All @@ -233,14 +233,14 @@ SInsertTest >> testInsertStatementOfSelectorRandomMessageInFieldMessage [
self
assertCollection: (testCase statements collect: #printString)
hasSameElements:
#('_var0 := 7.3.' '_var1 := SFoo score: _var0.' '_var2 := _var1 score.').
#('_aSmallFloat640 := 7.3.' '_aSFoo1 := SFoo score: _aSmallFloat640.' '_aSmallFloat642 := _aSFoo1 score.').
testCase
perform: #insertRandomMessage:using:
inStatement: fieldMessage copy.
self
assertCollection: (testCase statements collect: #printString)
hasSameElements:
#('_var0 := 7.3.' '_var1 := SFoo score: _var0.' '_var2 := _var1 score.' '_var3 := _var1 score.')
#('_aSmallFloat640 := 7.3.' '_aSFoo1 := SFoo score: _aSmallFloat640.' '_aSmallFloat642 := _aSFoo1 score.' '_aSmallFloat643 := _aSFoo1 score.')
]

{ #category : #'mutation-insert' }
Expand All @@ -250,7 +250,7 @@ SInsertTest >> testInsertStatementOfSelectorRandomMessageInLiteral [
testCase addLiteral: #SmallFloat64.
self
assertCollection: (testCase statements collect: #printString)
hasSameElements: #('_var0 := 7.3.').
hasSameElements: #('_aSmallFloat640 := 7.3.').
self
should: [ testCase insertStatementOfSelector: #insertRandomMessage:using: ]
raise: SError
Expand All @@ -265,12 +265,12 @@ SInsertTest >> testInsertStatementOfSelectorRandomMessageInMessage [
self
assertCollection: (testCase statements collect: #printString)
hasSameElements:
#('_var0 := 7.3.' '_var1 := SFoo score: _var0.' '_var2 := ''hello''.' '_var3 := _var1 return: _var2.').
#('_aSmallFloat640 := 7.3.' '_aSFoo1 := SFoo score: _aSmallFloat640.' '_aByteString2 := ''hello''.' '_aByteString3 := _aSFoo1 return: _aByteString2.').
testCase
perform: #insertRandomMessage:using:
inStatement: message copy.
self
assertCollection: (testCase statements collect: #printString)
hasSameElements:
#('_var0 := 7.3.' '_var1 := SFoo score: _var0.' '_var2 := ''hello''.' '_var3 := _var1 return: _var2.' '_var4 := _var1 return: _var2.')
#('_aSmallFloat640 := 7.3.' '_aSFoo1 := SFoo score: _aSmallFloat640.' '_aByteString2 := ''hello''.' '_aByteString3 := _aSFoo1 return: _aByteString2.' '_aByteString4 := _aSFoo1 return: _aByteString2.')
]
Loading