Merge pull request #695 from moosetechnology/p12

New batch of adaptations to P12
moosetechnology · Jan 23, 2024 · dbf7ae7 · dbf7ae7
2 parents 3afe8b0 + 63a6760
commit dbf7ae7
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 14 deletions.
diff --git a/src/Moose-SmalltalkImporter-LAN-Tests/FamixModelExtractionTest.class.st b/src/Moose-SmalltalkImporter-LAN-Tests/FamixModelExtractionTest.class.st
@@ -151,6 +151,7 @@ FamixModelExtractionTest >> testHasEmptyBody [
 
 { #category : #tests }
 FamixModelExtractionTest >> testInheritedAttributes [
+
 	| inheritedAtts |
 	inheritedAtts := msePrinterClass inheritedAttributes.
 	self assert: msePrinterClass superclassHierarchy size equals: 5.
@@ -159,7 +160,10 @@ FamixModelExtractionTest >> testInheritedAttributes [
 	self assert: (inheritedAtts includes: nodeName).
 	self assert: (inheritedAtts includes: nextNode).
 	self assert: (inheritedAtts includes: serverType).
-	self assert: (inheritedAtts select: [ :each | each isClassSide ]) size equals: 1
+	"In P12 DependentFileds class var gor removed from Object. Remove this condition once P12 will be the minimal version used for this project."
+	self assert: (inheritedAtts select: [ :each | each isClassSide ]) size equals: (SystemVersion current major < 12
+			 ifTrue: [ 1 ]
+			 ifFalse: [ 0 ])
 ]
 
 { #category : #tests }
@@ -233,7 +237,7 @@ FamixModelExtractionTest >> testIsSide [
 
 { #category : #tests }
 FamixModelExtractionTest >> testModelDoesNotContainDuplicateSharedVars [
-	self assert: (self model entities select: [ :e | e name = 'DependentsFields' ]) size equals: 1
+	self assert: (self model entities select: [ :e | e name = 'MySharedVariable' ]) size equals: 1
 ]
 
 { #category : #tests }

diff --git a/src/Moose-SmalltalkImporter-LAN-Tests/LANFamixPropertiesTest.class.st b/src/Moose-SmalltalkImporter-LAN-Tests/LANFamixPropertiesTest.class.st
@@ -61,14 +61,12 @@ LANFamixPropertiesTest >> testClassAllProperties [
 LANFamixPropertiesTest >> testClassAttributes [
 
 	self assert: self nodeClass numberOfAttributes equals: 2.
-	self assert: self nodeClass numberOfAttributesInherited equals: 3.
-	self
-		assert:
-		(self workstationClass propertyNamed: #numberOfAttributesInherited)
-		equals: (self totalNumberOfAttributesFor: LANWorkStation superclass).
-	self
-		assert: self workstationClass numberOfAttributesInherited
-		equals: (self totalNumberOfAttributesFor: LANWorkStation superclass)
+	"In P12 DependentFileds class var gor removed from Object. Remove this condition once P12 will be the minimal version used for this project."
+	self assert: self nodeClass numberOfAttributesInherited equals: (SystemVersion current major < 12
+			 ifTrue: [ 3 ]
+			 ifFalse: [ 2 ]).
+	self assert: (self workstationClass propertyNamed: #numberOfAttributesInherited) equals: (self totalNumberOfAttributesFor: LANWorkStation superclass).
+	self assert: self workstationClass numberOfAttributesInherited equals: (self totalNumberOfAttributesFor: LANWorkStation superclass)
 ]
 
 { #category : #testing }
@@ -259,9 +257,9 @@ LANFamixPropertiesTest >> testMethodsSimpleProperties [
 
 { #category : #testing }
 LANFamixPropertiesTest >> testNoDuplicatesOfClassVariables [
-	self assert: ((self model entityNamed: #'Smalltalk::Object') attributes contains: [ :each | each name = #DependentsFields ]).
-	self assert: (self model entityNamed: #'Smalltalk::Object') attributes first identicalTo: (self model entityNamed: #'Smalltalk::Object') attributes last.
-	self assert: (self model entityNamed: #'Smalltalk::Object') attributes size equals: 1
+	self assert: ((self model entityNamed: #'Smalltalk::LANAbstractDestinationAddress') attributes contains: [ :each | each name = #MySharedVariable ]).
+	self assert: (self model entityNamed: #'Smalltalk::LANAbstractDestinationAddress') attributes first identicalTo: (self model entityNamed: #'Smalltalk::LANAbstractDestinationAddress') attributes last.
+	self assert: (self model entityNamed: #'Smalltalk::LANAbstractDestinationAddress') attributes size equals: 1
 ]
 
 { #category : #testing }

diff --git a/src/Moose-SmalltalkImporter-LAN-Tests/LANMooseGroupTest.class.st b/src/Moose-SmalltalkImporter-LAN-Tests/LANMooseGroupTest.class.st
@@ -188,5 +188,5 @@ LANMooseGroupTest >> testSelectGroupType [
 
 { #category : #tests }
 LANMooseGroupTest >> testSum [
-	self assert: (self model allModelClasses sumNumbers: #numberOfAttributes) equals: 16
+	self assert: (self model allModelClasses sumNumbers: #numberOfAttributes) equals: 17
 ]
diff --git a/src/Moose-TestResources-LAN/LANAbstractDestinationAddress.class.st b/src/Moose-TestResources-LAN/LANAbstractDestinationAddress.class.st
@@ -1,6 +1,9 @@
 Class {
 	#name : #LANAbstractDestinationAddress,
 	#superclass : #Object,
+	#classVars : [
+		'MySharedVariable'
+	],
 	#category : #'Moose-TestResources-LAN'
 }