--- a/CustomCodeGeneratorTestCase.st Fri Jul 11 20:04:20 2014 +0200
+++ b/CustomCodeGeneratorTestCase.st Fri Jul 11 20:43:00 2014 +0200
@@ -27,14 +27,7 @@
"Created: / 15-06-2014 / 16:42:19 / Jakub Nesveda <nesvejak@fit.cvut.cz>"
!
-assertClassNotExists: aClassName
-
- self assert: (Smalltalk classNamed: aClassName asString) isNil
-
- "Created: / 15-06-2014 / 16:42:37 / Jakub Nesveda <nesvejak@fit.cvut.cz>"
-!
-
-assertMetaclassMethodSource: aSourceCode atSelector: aSelector
+assertClassMethodSource: aSourceCode atSelector: aSelector
"Assert that source code is same at given selector for first generated class"
| className class |
@@ -42,12 +35,12 @@
className := classes first classNameBuilded.
class := Smalltalk classNamed: className.
- ^ self assertMetaclassMethodSource: aSourceCode atSelector: aSelector forClass: class
+ ^ self assertClassMethodSource: aSourceCode atSelector: aSelector forClass: class
- "Created: / 30-06-2014 / 13:29:25 / Jakub Nesveda <nesvejak@fit.cvut.cz>"
+ "Created: / 11-07-2014 / 20:11:01 / Jakub Nesveda <nesvejak@fit.cvut.cz>"
!
-assertMetaclassMethodSource: expectedSource atSelector: aSelector forClass: aClass
+assertClassMethodSource: expectedSource atSelector: aSelector forClass: aClass
"Assert that source code is same at given selector for given class"
| actualSource |
@@ -56,7 +49,14 @@
^ self assertSource: expectedSource sameAs: actualSource
- "Created: / 30-06-2014 / 13:12:49 / Jakub Nesveda <nesvejak@fit.cvut.cz>"
+ "Created: / 11-07-2014 / 20:09:59 / Jakub Nesveda <nesvejak@fit.cvut.cz>"
+!
+
+assertClassNotExists: aClassName
+
+ self assert: (Smalltalk classNamed: aClassName asString) isNil
+
+ "Created: / 15-06-2014 / 16:42:37 / Jakub Nesveda <nesvejak@fit.cvut.cz>"
!
assertMethodSource: aSourceCode atSelector: aSelector
--- a/CustomDefaultGetterMethodsCodeGeneratorTests.st Fri Jul 11 20:04:20 2014 +0200
+++ b/CustomDefaultGetterMethodsCodeGeneratorTests.st Fri Jul 11 20:43:00 2014 +0200
@@ -27,10 +27,10 @@
^ nil'.
self executeGeneratorInContext: #classWithInstanceVariable.
- self assertMetaclassMethodSource: expectedSource atSelector: #defaultInstanceVariable
+ self assertClassMethodSource: expectedSource atSelector: #defaultInstanceVariable
"Created: / 30-06-2014 / 13:31:59 / Jakub Nesveda <nesvejak@fit.cvut.cz>"
- "Modified: / 30-06-2014 / 15:30:03 / Jakub Nesveda <nesvejak@fit.cvut.cz>"
+ "Modified: / 11-07-2014 / 20:11:22 / Jakub Nesveda <nesvejak@fit.cvut.cz>"
!
test_default_getter_method_generated_without_comments
@@ -43,9 +43,9 @@
^ nil'.
self executeGeneratorInContext: #classWithInstanceVariable.
- self assertMetaclassMethodSource: expectedSource atSelector: #defaultInstanceVariable
+ self assertClassMethodSource: expectedSource atSelector: #defaultInstanceVariable
"Created: / 30-06-2014 / 11:31:06 / Jakub Nesveda <nesvejak@fit.cvut.cz>"
- "Modified: / 30-06-2014 / 13:31:34 / Jakub Nesveda <nesvejak@fit.cvut.cz>"
+ "Modified: / 11-07-2014 / 20:11:31 / Jakub Nesveda <nesvejak@fit.cvut.cz>"
! !
--- a/CustomLazyInitializationAccessMethodsCodeGeneratorTests.st Fri Jul 11 20:04:20 2014 +0200
+++ b/CustomLazyInitializationAccessMethodsCodeGeneratorTests.st Fri Jul 11 20:43:00 2014 +0200
@@ -48,10 +48,10 @@
self executeGeneratorInContext: #classWithInstanceVariable.
self assertMethodSource: expectedGetterSource atSelector: #instanceVariable.
self assertMethodSource: expectedSetterSource atSelector: #instanceVariable:.
- self assertMetaclassMethodSource: expectedDefaultSource atSelector: #defaultInstanceVariable
+ self assertClassMethodSource: expectedDefaultSource atSelector: #defaultInstanceVariable
"Created: / 08-07-2014 / 18:43:29 / Jakub Nesveda <nesvejak@fit.cvut.cz>"
- "Modified: / 11-07-2014 / 19:51:59 / Jakub Nesveda <nesvejak@fit.cvut.cz>"
+ "Modified: / 11-07-2014 / 20:11:40 / Jakub Nesveda <nesvejak@fit.cvut.cz>"
!
test_lazy_initialization_access_methods_generated_without_comments
@@ -81,9 +81,9 @@
self executeGeneratorInContext: #classWithInstanceVariable.
self assertMethodSource: expectedGetterSource atSelector: #instanceVariable.
self assertMethodSource: expectedSetterSource atSelector: #instanceVariable:.
- self assertMetaclassMethodSource: expectedDefaultSource atSelector: #defaultInstanceVariable
+ self assertClassMethodSource: expectedDefaultSource atSelector: #defaultInstanceVariable
"Created: / 08-07-2014 / 19:37:40 / Jakub Nesveda <nesvejak@fit.cvut.cz>"
- "Modified: / 11-07-2014 / 19:54:20 / Jakub Nesveda <nesvejak@fit.cvut.cz>"
+ "Modified: / 11-07-2014 / 20:11:48 / Jakub Nesveda <nesvejak@fit.cvut.cz>"
! !
--- a/CustomLazyInitializationGetterMethodsCodeGeneratorTests.st Fri Jul 11 20:04:20 2014 +0200
+++ b/CustomLazyInitializationGetterMethodsCodeGeneratorTests.st Fri Jul 11 20:43:00 2014 +0200
@@ -51,9 +51,10 @@
self executeGeneratorInContext: #classWithInstanceVariable.
self assertMethodSource: expectedGetterSource atSelector: #instanceVariable.
- self assertMetaclassMethodSource: expectedDefaultSource atSelector: #defaultInstanceVariable
+ self assertClassMethodSource: expectedDefaultSource atSelector: #defaultInstanceVariable
"Created: / 30-06-2014 / 18:06:56 / Jakub Nesveda <nesvejak@fit.cvut.cz>"
+ "Modified: / 11-07-2014 / 20:11:56 / Jakub Nesveda <nesvejak@fit.cvut.cz>"
!
test_lazy_initialization_getter_method_generated_without_comments
--- a/refactoring_custom.rc Fri Jul 11 20:04:20 2014 +0200
+++ b/refactoring_custom.rc Fri Jul 11 20:43:00 2014 +0200
@@ -25,7 +25,7 @@
VALUE "LegalCopyright", "My CopyRight or CopyLeft\0"
VALUE "ProductName", "ProductName\0"
VALUE "ProductVersion", "6.2.4.1259\0"
- VALUE "ProductDate", "Fri, 11 Jul 2014 17:57:01 GMT\0"
+ VALUE "ProductDate", "Fri, 11 Jul 2014 18:41:40 GMT\0"
END
END