-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'gemstone2.4_dev' into gemstone2.4 :: final fix for Issue …
…#136 Conflicts: repository/MonticelloFileTree-Tests.package/MCFileTreeIssue136Test.class/instance/expectedFailures.st repository/MonticelloFileTree-Tests.package/MCFileTreeIssue136Test.class/instance/tearDownPackagesList.st Conflicts: repository/MonticelloFileTree-Tests.package/MCFileTreeIssue97Test.class/instance/testLoad.st
- Loading branch information
1 parent
a108428
commit 21a1093
Showing
25 changed files
with
99 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 12 additions & 6 deletions
18
...FileTree-Core.package/MCFileTreeStCypressReader.class/instance/verifyCategory.matches..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,21 @@ | ||
| validation | ||
| verifyCategory: categoryName matches: prefix | ||
| verifyCategory: categoryName matches: basicPackageName | ||
| "https://github.com/dalehenrich/filetree/issues/136" | ||
|
|
||
| "copied from PackageInfo>>category:matches:" | ||
| "copied from PackageInfo>>category:matches: and GoferVersionReference>>parseName:" | ||
|
|
||
| | prefixSize catSize | | ||
| | prefixSize catSize packagePrefix | | ||
| categoryName ifNil: [ ^ false ]. | ||
| packagePrefix := basicPackageName. | ||
| (packagePrefix includes: $.) | ||
| ifTrue: [ | ||
| "exclude branch name" | ||
| packagePrefix := packagePrefix copyUpTo: $. ]. | ||
| catSize := categoryName size. | ||
| prefixSize := prefix size. | ||
| prefixSize := packagePrefix size. | ||
| catSize < prefixSize | ||
| ifTrue: [ ^ false ]. | ||
| (categoryName findString: prefix startingAt: 1 caseSensitive: false) = 1 | ||
| (categoryName findString: packagePrefix startingAt: 1 caseSensitive: false) | ||
| = 1 | ||
| ifFalse: [ ^ false ]. | ||
| ^ (categoryName at: prefix size + 1 ifAbsent: [ ^ true ]) = $- | ||
| ^ (categoryName at: packagePrefix size + 1 ifAbsent: [ ^ true ]) = $- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 0 additions & 5 deletions
5
...onticelloFileTree-Tests.package/MCFileTreeIssue136Test.class/instance/expectedFailures.st
This file was deleted.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
...celloFileTree-Tests.package/MCFileTreeIssue136Test.class/instance/tearDownPackagesList.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| running | ||
| tearDownPackagesList | ||
| ^ #('Issue136-1' 'Issue136-2' 'Issue97') | ||
| ^ #('Issue136-1' 'Issue136-2' 'Issue97' 'Issue136-1.v3' 'Issue136-2.v3') |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
...ory/MonticelloFileTree-Tests.package/MCFileTreeIssue136Test.class/instance/testClassV3.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| tests | ||
| testClassV3 | ||
| | packageName | | ||
| packageName := 'Issue136-1.v3'. | ||
| {packageName} do: [ :pn | self deny: (self hasPackage: pn) ]. | ||
| Gofer new | ||
| disablePackageCache; | ||
| repository: (self getTestRepository: 'issue136'); | ||
| version: 'Issue136-1.v3-cypress.1'; | ||
| load. | ||
| self deny: (Smalltalk at: #'CypressMockIssue97' ifAbsent: [ ]) == nil |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
...elloFileTree-Tests.package/MCFileTreeIssue136Test.class/instance/testExtensionMethodV3.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| tests | ||
| testExtensionMethodV3 | ||
| | packageName | | ||
| packageName := 'Issue136-2.v3'. | ||
| {packageName} do: [ :pn | self deny: (self hasPackage: pn) ]. | ||
| Gofer new | ||
| disablePackageCache; | ||
| repository: (self getTestRepository: 'issue136'); | ||
| version: 'Issue136-2.v3-cypress.1'; | ||
| load. | ||
| self assert: (Object selectors includes: #'isCypressMockIssue97') |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.