diff --git a/Moose-Blueprint-Models-Tests/CBAbstractClassBlueprintTest.class.st b/Moose-Blueprint-Models-Tests/CBAbstractClassBlueprintTest.class.st index 7d9c756..681c90e 100644 --- a/Moose-Blueprint-Models-Tests/CBAbstractClassBlueprintTest.class.st +++ b/Moose-Blueprint-Models-Tests/CBAbstractClassBlueprintTest.class.st @@ -229,13 +229,6 @@ CBAbstractClassBlueprintTest >> testInitializers [ hasSameElements: self initializerMethodNames ] -{ #category : 'tests' } -CBAbstractClassBlueprintTest >> testIsInitializerMethod [ - - self assert: (classBlueprint models detect: [ :each | - each name includesSubstring: 'initialize' ]) entity isInitializer -] - { #category : 'tests' } CBAbstractClassBlueprintTest >> testModels [ diff --git a/Moose-Blueprint-Models-Tests/CBClassBlueprintForJavaModelTest.class.st b/Moose-Blueprint-Models-Tests/CBClassBlueprintForJavaModelTest.class.st index c59e048..38c054c 100644 --- a/Moose-Blueprint-Models-Tests/CBClassBlueprintForJavaModelTest.class.st +++ b/Moose-Blueprint-Models-Tests/CBClassBlueprintForJavaModelTest.class.st @@ -46,19 +46,15 @@ CBClassBlueprintForJavaModelTest >> createExternalMethod [ { #category : 'entities' } CBClassBlueprintForJavaModelTest >> createInitializers [ - (model newMethodNamed: 'initializer1()') - isConstructor: true; - parentType: mainClass. + (model newInitializerNamed: mainClass name) parentType: mainClass. - (model newMethodNamed: 'initializer2()') - isConstructor: true; - parentType: mainClass + (model newInitializerNamed: mainClass name) parentType: mainClass ] { #category : 'accessing' } CBClassBlueprintForJavaModelTest >> initializerMethodNames [ - ^ { 'initializer1()'. 'initializer2()' } + ^ { mainClass name } ] { #category : 'entities' } diff --git a/Moose-Blueprint-Models-Tests/CBJavaClassPojoTest.class.st b/Moose-Blueprint-Models-Tests/CBJavaClassPojoTest.class.st index 6025809..76c1e11 100644 --- a/Moose-Blueprint-Models-Tests/CBJavaClassPojoTest.class.st +++ b/Moose-Blueprint-Models-Tests/CBJavaClassPojoTest.class.st @@ -101,9 +101,7 @@ CBJavaClassPojoTest >> initializePojoClass [ { #category : 'initialization' } CBJavaClassPojoTest >> newConstructorMethodFor: aFamixjavaClass [ - ^ (model newMethodNamed: ('{1}()' format: aFamixjavaClass name)) - isConstructor: true; - yourself + ^ model newInitializerNamed: aFamixjavaClass name ] { #category : 'initialization' } diff --git a/Moose-Blueprint-Models-Tests/CBPojoTest.class.st b/Moose-Blueprint-Models-Tests/CBPojoTest.class.st index 3b94ea2..94b7336 100644 --- a/Moose-Blueprint-Models-Tests/CBPojoTest.class.st +++ b/Moose-Blueprint-Models-Tests/CBPojoTest.class.st @@ -88,16 +88,12 @@ CBPojoTest >> setNotDeadAttributeAndDeadAccessors [ { #category : 'running' } CBPojoTest >> setUp [ - | constructor | super setUp. model := FamixJavaModel new. class := model newClassNamed: 'Pojo'. attribute := model newAttributeNamed: 'attribute'. - constructor := (model newMethodNamed: 'constructor()') - isConstructor: true; - yourself. getter := (model newMethodNamed: 'getAttribute()') typing: (model newEntityTyping declaredType: @@ -116,7 +112,7 @@ CBPojoTest >> setUp [ class addMethod: getter; addMethod: setter; - addMethod: constructor; + addMethod: (model newInitializerNamed: 'Pojo'); addAttribute: attribute ]