Merge pull request #18648 from pharo-project/revert-18645-refactor/generic-non-violatos

Revert "Generic nonViolators for ReConditions"

Author: Ducasse

src/Collections-Sequenceable/SequenceableCollection.class.st

@@ -1534,6 +1534,11 @@ SequenceableCollection >> lastIndexOfAnyOf: aCollection startingAt: lastIndex if
 	^ exceptionBlock value
 ]
 
+{ #category : 'comparing' }
+SequenceableCollection >> max: aSelectorOrOneArgBlock [
+	^ (self collect: aSelectorOrOneArgBlock) max
+]
+
 { #category : 'sorting' }
 SequenceableCollection >> mergeFirst: first middle: middle last: last into: dst by: aBlock [
 	"Private. Merge the sorted ranges [first..middle] and [middle+1..last]
@@ -1609,6 +1614,11 @@ SequenceableCollection >> middle [
 	^ self at: self size // 2 + 1
 ]
 
+{ #category : 'comparing' }
+SequenceableCollection >> min: aSelectorOrOneArgBlock [
+	^ (self collect: aSelectorOrOneArgBlock) min
+]
+
 { #category : 'accessing' }
 SequenceableCollection >> nextToLast [
 	"(#(1 2 3 4) nextToLast) >>> 3"

src/Refactoring-Core-Tests/ReClassHasSubclassesTest.class.st

@@ -1,11 +1,24 @@
 Class {
 	#name : 'ReClassHasSubclassesTest',
-	#superclass : 'ReClassesConditionTest',
+	#superclass : 'TestCase',
+	#instVars : [
+		'model'
+	],
 	#category : 'Refactoring-Core-Tests-Conditions',
 	#package : 'Refactoring-Core-Tests',
 	#tag : 'Conditions'
 }
 
+{ #category : 'tests' }
+ReClassHasSubclassesTest >> model [
+
+	^ model ifNil: [ model := RBNamespace onEnvironment: (RBClassEnvironment classes: {
+				   MyClassAlpha.
+				   MyClassBeta.
+				   MyClassBetaSibling.
+				   Object })]
+]
+
 { #category : 'tests' }
 ReClassHasSubclassesTest >> testClassDoesNotHaveSubclass [
 	| myClassBeta cond |
@@ -16,9 +29,7 @@ ReClassHasSubclassesTest >> testClassDoesNotHaveSubclass [
 		subclassesList: { #myClassAlpha . #Object }.
 
 	" MyClassAlpha is not a subclass of MyClassBeta "
-	self deny: cond check.
-	self assert: cond violators equals: { myClassBeta }.
-	self assert: cond nonViolators isEmpty
+	self deny: cond check
 ]
 
 { #category : 'tests' }
@@ -31,9 +42,7 @@ ReClassHasSubclassesTest >> testClassHasSubclass [
 		subclassesList: { #MyClassBeta . #MyClassBetaSibling }.
 
 	" MyClassBeta and MyClassBetaSibling ares subclasses of MyClassAlpha "
-	self assert: cond check.
-	self assert: cond violators isEmpty.
-	self assert: cond nonViolators equals: { myClassAlpha }
+	self assert: cond check
 ]
 
 { #category : 'tests' }

src/Refactoring-Core-Tests/ReClassesAreAbstractTest.class.st

@@ -2,15 +2,22 @@
 A ReClassesAreNotMetaClassConditionTest is a test class for testing the behavior of ReClassesAreNotMetaClassCondition
 "
 Class {
-	#name : 'ReClassesAreNotMetaClassTest',
-	#superclass : 'ReClassesConditionTest',
+	#name : 'ReClassesAreNotMetaClassConditionTest',
+	#superclass : 'TestCase',
 	#category : 'Refactoring-Core-Tests-Conditions',
 	#package : 'Refactoring-Core-Tests',
 	#tag : 'Conditions'
 }
 
-{ #category : 'tests' }
-ReClassesAreNotMetaClassTest >> testClassIsAMetaclass [
+{ #category : 'accessing' }
+ReClassesAreNotMetaClassConditionTest >> model [
+
+	^ RBNamespace onEnvironment:
+		  (RBClassEnvironment classes: {MyClassARoot . MySubAccessingSuperclassState} )
+]
+
+{ #category : 'accessing' }
+ReClassesAreNotMetaClassConditionTest >> testClassIsAMetaclass [
 
 	| myClassARoot cond |
 	myClassARoot := self model classNamed: #MyClassARoot.
@@ -20,12 +27,11 @@ ReClassesAreNotMetaClassTest >> testClassIsAMetaclass [
 
 	self deny: cond check. 
 	self deny: cond violators isEmpty.
-	self assert: cond nonViolators isEmpty
 
 ]
 
-{ #category : 'tests' }
-ReClassesAreNotMetaClassTest >> testClassIsAMetaclassWithMessages [
+{ #category : 'accessing' }
+ReClassesAreNotMetaClassConditionTest >> testClassIsAMetaclassWithMessages [
 
 	| myClassARoot cond |
 	myClassARoot := self model classNamed: #MyClassARoot.
@@ -39,8 +45,8 @@ ReClassesAreNotMetaClassTest >> testClassIsAMetaclassWithMessages [
 
 ]
 
-{ #category : 'tests' }
-ReClassesAreNotMetaClassTest >> testClassIsAMetaclassWithoutMessages [
+{ #category : 'accessing' }
+ReClassesAreNotMetaClassConditionTest >> testClassIsAMetaclassWithoutMessages [
 
 	| myClassARoot cond |
 	myClassARoot := self model classNamed: #MyClassARoot.
@@ -54,8 +60,8 @@ ReClassesAreNotMetaClassTest >> testClassIsAMetaclassWithoutMessages [
 
 ]
 
-{ #category : 'tests' }
-ReClassesAreNotMetaClassTest >> testClassIsNotAMetaclass [
+{ #category : 'accessing' }
+ReClassesAreNotMetaClassConditionTest >> testClassIsNotAMetaclass [
 
 	| myClassARoot cond |
 	myClassARoot := self model classNamed: #MyClassARoot.
@@ -65,6 +71,5 @@ ReClassesAreNotMetaClassTest >> testClassIsNotAMetaclass [
 
 	self assert: cond check. 
 	self assert: cond violators isEmpty.
-	self assert: cond nonViolators equals: { myClassARoot }
 
 ]