Issue #136: cherry pick code from gemstone2.4 branch

dalehenrich · Jan 31, 2015 · ecfa46e · ecfa46e
1 parent a3b517f
commit ecfa46e
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 10 deletions.
diff --git a/...MCFileTreeStCypressReader.class/instance/validateExtensionMethodCategory.for.selector..st b/...MCFileTreeStCypressReader.class/instance/validateExtensionMethodCategory.for.selector..st
@@ -7,6 +7,10 @@ validateExtensionMethodCategory: categoryName for: className selector: selector
   "extracted from PackageInfo>>isForeignClassExtension:"
 
   | prefix prefixSize catSize |
+  true
+    ifTrue: [ 
+      "https://github.com/GsDevKit/gsDevKitHome/issues/53: faulty filetree package validation logic"
+      ^ self ].
   prefix := '*' , self packageNameFromPackageDirectory asLowercase.
   categoryName
     ifNotNil: [ 

diff --git a/...ory/MonticelloFileTree-Core.package/MCFileTreeStCypressReader.class/methodProperties.json b/...ory/MonticelloFileTree-Core.package/MCFileTreeStCypressReader.class/methodProperties.json
@@ -18,5 +18,5 @@
 		"methodSelectorFor:" : "ChristopheDemarey 5/31/2013 23:28",
 		"packageNameFromPackageDirectory" : "dkh 8/10/2012 14:55",
 		"validateClassCategory:for:" : "dkh 01/31/2015 12:20",
-		"validateExtensionMethodCategory:for:selector:" : "dkh 01/31/2015 12:44",
+		"validateExtensionMethodCategory:for:selector:" : "dkh 01/31/2015 13:41",
 		"verifyCategory:matches:" : "dkh 01/31/2015 07:05" } }
diff --git a/repository/MonticelloFileTree-Core.package/monticello.meta/version b/repository/MonticelloFileTree-Core.package/monticello.meta/version
diff --git a/...onticelloFileTree-Tests.package/MCFileTreeIssue136Test.class/instance/expectedFailures.st b/...onticelloFileTree-Tests.package/MCFileTreeIssue136Test.class/instance/expectedFailures.st
@@ -2,4 +2,4 @@ tests
 expectedFailures
   "https://github.com/GsDevKit/gsDevKitHome/issues/53: faulty filetree package validation logic"
 
-  ^ #(#'testClassError')
+  ^ #(#'testClassError' #'testExtensionMethodError')
diff --git a/...sitory/MonticelloFileTree-Tests.package/MCFileTreeIssue136Test.class/instance/tearDown.st b/...sitory/MonticelloFileTree-Tests.package/MCFileTreeIssue136Test.class/instance/tearDown.st
@@ -1,4 +1,6 @@
 running
 tearDown
   super tearDown.
-  Smalltalk at: #'CypressMockIssue97' ifPresent: [ :cl | cl removeFromSystem ]
+  Smalltalk at: #'CypressMockIssue97' ifPresent: [ :cl | cl removeFromSystem ].
+  (Object selectors includes: #'isCypressMockIssue97')
+    ifTrue: [ Object removeSelector: #'isCypressMockIssue97' ]
diff --git a/...celloFileTree-Tests.package/MCFileTreeIssue136Test.class/instance/tearDownPackagesList.st b/...celloFileTree-Tests.package/MCFileTreeIssue136Test.class/instance/tearDownPackagesList.st
@@ -1,3 +1,3 @@
 running
 tearDownPackagesList
-  ^ #('Issue136-1' 'Issue136-2')
+  ^ #('Issue136-1' 'Issue136-2' 'Issue97')
diff --git a/...itory/MonticelloFileTree-Tests.package/MCFileTreeIssue136Test.class/methodProperties.json b/...itory/MonticelloFileTree-Tests.package/MCFileTreeIssue136Test.class/methodProperties.json
@@ -2,8 +2,8 @@
 	"class" : {
 		 },
 	"instance" : {
-		"expectedFailures" : "dkh 01/31/2015 12:21",
-		"tearDown" : "dkh 01/31/2015 12:29",
-		"tearDownPackagesList" : "dkh 01/31/2015 07:31",
+		"expectedFailures" : "dkh 01/31/2015 12:48",
+		"tearDown" : "dkh 01/31/2015 12:59",
+		"tearDownPackagesList" : "dkh 01/31/2015 13:28",
 		"testClassError" : "dkh 01/31/2015 12:43",
 		"testExtensionMethodError" : "dkh 01/31/2015 12:43" } }
diff --git a/repository/MonticelloFileTree-Tests.package/MCFileTreeIssue97Test.class/instance/setUp.st b/repository/MonticelloFileTree-Tests.package/MCFileTreeIssue97Test.class/instance/setUp.st
@@ -0,0 +1,6 @@
+running
+setUp
+  super setUp.
+  Smalltalk at: #'CypressMockIssue97' ifPresent: [ :cl | cl removeFromSystem ].
+  (Object selectors includes: #'isCypressMockIssue97')
+    ifTrue: [ Object removeSelector: #'isCypressMockIssue97' ]
diff --git a/repository/MonticelloFileTree-Tests.package/MCFileTreeIssue97Test.class/instance/testLoad.st b/repository/MonticelloFileTree-Tests.package/MCFileTreeIssue97Test.class/instance/testLoad.st
@@ -1,5 +1,7 @@
 tests
 testLoad
+  ""
+
   | packageName |
   packageName := 'Issue97'.
   {packageName} do: [ :pn | self deny: (self hasPackage: pn) ].

diff --git a/...sitory/MonticelloFileTree-Tests.package/MCFileTreeIssue97Test.class/methodProperties.json b/...sitory/MonticelloFileTree-Tests.package/MCFileTreeIssue97Test.class/methodProperties.json
@@ -2,5 +2,6 @@
 	"class" : {
 		 },
 	"instance" : {
+		"setUp" : "dkh 01/31/2015 13:15",
 		"tearDownPackagesList" : "08/01/2013 18:35",
-		"testLoad" : "08/01/2013 18:46" } }
+		"testLoad" : "dkh 01/31/2015 13:43" } }
diff --git a/repository/MonticelloFileTree-Tests.package/monticello.meta/version b/repository/MonticelloFileTree-Tests.package/monticello.meta/version