Skip to content

Commit

Permalink
Merge pull request #94 from moosetechnology/revert-91-feature-merge-m…
Browse files Browse the repository at this point in the history 
…etamodel

Revert "Merge Extended and default metamodel "
  • Loading branch information
@badetitou
badetitou authored Oct 24, 2024
2 parents d443815 + 3121286 commit 3ed5afd
Show file tree
Hide file tree
Showing 165 changed files with 3,670 additions and 3,947 deletions.
26 changes: 15 additions & 11 deletions src/BaselineOfGitLabHealth/BaselineOfGitLabHealth.class.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,17 +82,18 @@ BaselineOfGitLabHealth >> defineGroups: spec [
spec
group: 'Core'
with: #( 'GitLabHealth-Model' 'GitLabHealth-Model-Extension'
'GitLabHealth-Model-Tests' 'GitLabHealth-Model-Extension-Tests'
'GitLabHealth-Model-Extension-Tests'
'GitLabHealth-Model-Generator' 'GitLabHealth-Model-Inspector'
'GitLabHealth-Model-Visualization'
'GitLabHealth-Model-Importer' 'GitLabHealth-Model-Importer-Tests'
'GitHubHealth-Model-Importer-Tests'
'GitLabHealth-Model-Analysis' 'GitLabHealth-Model-Analysis-Tests'
'GLPHExtended-Model' 'GLPHExtended-Model-Tests'
'GLPHExtended-Model-Extension' 'GitLabHealth-Model-Analysis'
'GitLabHealth-Model-Analysis-Tests'
'GitLabHealth-Visualization' 'GitLabProjectHealth-ExtendModel-Generator'
'GitLabProjectHealth-Model-Importer'
'GitLabProjectHealth-Model-Importer-Tests'
'BitBucketHealth-Model-Importer'
'BitBucketHealth-Model-Importer-Tests' ).
'BitBucketHealth-Model-Importer' 'BitBucketHealth-Model-Importer-Tests' ).
spec group: 'default' with: #( 'Core' )
]

Expand Down Expand Up @@ -143,21 +144,24 @@ BaselineOfGitLabHealth >> definePackages: spec [
package: 'GitLabHealth-Model-Importer-Tests' with: [
spec requires:
#( 'GitLabHealth-Model-Importer' 'GitHubHealth-Model-Importer' ) ].
spec
package: 'GitLabHealth-Model-Tests'
with: [ spec requires: #( 'GitLabHealth-Model' ) ].
spec
package: 'GitHubHealth-Model-Importer-Tests'
with: [ spec requires: #( 'GitHubHealth-Model-Importer' ) ].

"bitBucket"
spec
package: 'BitBucketHealth-Model-Importer';
package: 'BitBucketHealth-Model-Importer-Tests'
with: [ spec requires: #( 'BitBucketHealth-Model-Importer' ) ].
spec package: 'BitBucketHealth-Model-Importer';
package: 'BitBucketHealth-Model-Importer-Tests' with: [ spec requires: #( 'BitBucketHealth-Model-Importer' ) ].

"model extension"
spec
package: 'GLPHExtended-Model' with: [
spec requires:
#( 'GitLabHealth-Model' 'GitLabHealth-Model-Extension' ) ];
package: 'GLPHExtended-Model-Tests'
with: [ spec requires: #( 'GLPHExtended-Model' ) ];
package: 'GLPHExtended-Model-Extension' with: [
spec requires:
#( 'GLPHExtended-Model' 'GitLabHealth-Model' 'GitLabHealth-Model-Extension' ) ];
package: 'GitLabHealth-Model-Analysis'
with: [ spec requires: #( 'Voyage' 'AWS' ) ];
package: 'GitLabHealth-Model-Analysis-Tests'
Expand Down
65 changes: 32 additions & 33 deletions src/BitBucketHealth-Model-Importer-Tests/BitBucketApiMock.class.st
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
Class {
#name : 'BitBucketApiMock',
#superclass : 'Object',
#name : #BitBucketApiMock,
#superclass : #Object,
#instVars : [
'userMock',
'commits',
'diffs',
'mergeRequests'
],
#category : 'BitBucketHealth-Model-Importer-Tests',
#package : 'BitBucketHealth-Model-Importer-Tests'
#category : #'BitBucketHealth-Model-Importer-Tests'
}

{ #category : 'api - pull-requests' }
{ #category : #'api - pull-requests' }
BitBucketApiMock >> activitiesOfPullRequest: pullRequestId inRepoProjectId: repoSlug ofProjectGroupId: projectKey [

^self pullRequestActivities
]

{ #category : 'accessing' }
{ #category : #accessing }
BitBucketApiMock >> commit2 [

| commits2 |
Expand Down Expand Up @@ -49,13 +48,13 @@ BitBucketApiMock >> commit2 [
^ commits2 := (NeoJSONReader on: commits2 readStream) next
]

{ #category : 'accessing' }
{ #category : #accessing }
BitBucketApiMock >> commits [

^ commits
]

{ #category : 'accessing' }
{ #category : #accessing }
BitBucketApiMock >> commits1 [

| commits1 |
Expand Down Expand Up @@ -87,19 +86,19 @@ BitBucketApiMock >> commits1 [
^ commits1 := (NeoJSONReader on: commits1 readStream) next
]

{ #category : 'accessing' }
{ #category : #accessing }
BitBucketApiMock >> commits: anObject [

commits := anObject
]

{ #category : 'api - pull-requests' }
{ #category : #'api - pull-requests' }
BitBucketApiMock >> commitsOfPullRequest: mergeRequestId ofRepoProjectId: repoSlug inProjectGroupId: projectKey [

^commits
]

{ #category : 'api - projects' }
{ #category : #'api - projects' }
BitBucketApiMock >> commitsOfRepoProjectId: repositorySlug inProjectGroupId: projectKey since: since until: until [

^ self commits select: [ :commit |
Expand All @@ -111,7 +110,7 @@ BitBucketApiMock >> commitsOfRepoProjectId: repositorySlug inProjectGroupId: pro
commitDate >= since asDate and: commitDate <= until asDate ]
]

{ #category : 'accessing' }
{ #category : #accessing }
BitBucketApiMock >> declinedMergeRequest [

| pullRequest |
Expand Down Expand Up @@ -307,13 +306,13 @@ BitBucketApiMock >> declinedMergeRequest [
^ pullRequest := (NeoJSONReader on: pullRequest readStream) next
]

{ #category : 'accessing' }
{ #category : #accessing }
BitBucketApiMock >> diffs [

^ diffs
]

{ #category : 'accessing' }
{ #category : #accessing }
BitBucketApiMock >> diffs1 [

| diffs1 |
Expand Down Expand Up @@ -410,18 +409,18 @@ BitBucketApiMock >> diffs1 [
^ diffs1 := (NeoJSONReader on: diffs1 readStream) next
]

{ #category : 'accessing' }
{ #category : #accessing }
BitBucketApiMock >> diffs: anObject [

diffs := anObject
]

{ #category : 'api - commits' }
{ #category : #'api - commits' }
BitBucketApiMock >> diffsOfCommit: commitID inRepoProjectId: repositorySlug inProjectGroupId: projectKey [
^diffs
]

{ #category : 'accessing' }
{ #category : #accessing }
BitBucketApiMock >> diffsWithoutAdded [

| diffsWithoutAdded |
Expand Down Expand Up @@ -519,7 +518,7 @@ BitBucketApiMock >> diffsWithoutAdded [
diffsWithoutAdded readStream) next
]

{ #category : 'accessing' }
{ #category : #accessing }
BitBucketApiMock >> diffsWithoutHunks [

| diffsWithoutHunks |
Expand Down Expand Up @@ -559,7 +558,7 @@ BitBucketApiMock >> diffsWithoutHunks [
diffsWithoutHunks readStream) next
]

{ #category : 'accessing' }
{ #category : #accessing }
BitBucketApiMock >> diffsWithoutRemoved [

| diffsWithoutRemoved |
Expand Down Expand Up @@ -645,7 +644,7 @@ BitBucketApiMock >> diffsWithoutRemoved [
diffsWithoutRemoved readStream) next
]

{ #category : 'initialization' }
{ #category : #initialization }
BitBucketApiMock >> initialize [

commits := self commits1.
Expand All @@ -654,19 +653,19 @@ BitBucketApiMock >> initialize [
mergeRequests := { self openedMergeRequest }
]

{ #category : 'accessing' }
{ #category : #accessing }
BitBucketApiMock >> mergeRequests [

^ mergeRequests
]

{ #category : 'accessing' }
{ #category : #accessing }
BitBucketApiMock >> mergeRequests: anObject [

mergeRequests := anObject
]

{ #category : 'accessing' }
{ #category : #accessing }
BitBucketApiMock >> mergedMergeRequest [

| pullRequest |
Expand Down Expand Up @@ -862,7 +861,7 @@ BitBucketApiMock >> mergedMergeRequest [
^ pullRequest := (NeoJSONReader on: pullRequest readStream) next
]

{ #category : 'accessing' }
{ #category : #accessing }
BitBucketApiMock >> openedMergeRequest [

| pullRequest |
Expand Down Expand Up @@ -1057,7 +1056,7 @@ BitBucketApiMock >> openedMergeRequest [
^pullRequest := (NeoJSONReader on: pullRequest readStream) next.
]

{ #category : 'accessing' }
{ #category : #accessing }
BitBucketApiMock >> projects [

| projects |
Expand All @@ -1081,7 +1080,7 @@ BitBucketApiMock >> projects [
^ projects
]

{ #category : 'accessing' }
{ #category : #accessing }
BitBucketApiMock >> pullRequestActivities [

| pullRequestActivities |
Expand Down Expand Up @@ -1112,13 +1111,13 @@ BitBucketApiMock >> pullRequestActivities [
pullRequestActivities readStream) next
]

{ #category : 'api - pull-requests' }
{ #category : #'api - pull-requests' }
BitBucketApiMock >> pullRequestsOfRepoProjectId: repoSlug inProjectGroupId: projectKey since: since until: until [

^ mergeRequests
]

{ #category : 'api - projects' }
{ #category : #'api - projects' }
BitBucketApiMock >> repositoryProjectsOfProjectGroupId: projectKey [

| repos |
Expand Down Expand Up @@ -1158,7 +1157,7 @@ repos := (NeoJSONReader on: repos readStream) next.
^repos
]

{ #category : 'accessing' }
{ #category : #accessing }
BitBucketApiMock >> user1 [

| user1 |
Expand Down Expand Up @@ -1190,7 +1189,7 @@ BitBucketApiMock >> user1 [
^ user1 := (NeoJSONReader on: user1 readStream) next
]

{ #category : 'accessing' }
{ #category : #accessing }
BitBucketApiMock >> user: accountId [

| user |
Expand All @@ -1205,19 +1204,19 @@ BitBucketApiMock >> user: accountId [
^ user
]

{ #category : 'accessing' }
{ #category : #accessing }
BitBucketApiMock >> userMock [

^ userMock
]

{ #category : 'accessing' }
{ #category : #accessing }
BitBucketApiMock >> userMock: anObject [

userMock := anObject
]

{ #category : 'api - user' }
{ #category : #'api - user' }
BitBucketApiMock >> usersByUsername: username [

userMock ifNil: [ ^Array new ] ifNotNil: [ ^{ userMock }]
Expand Down
Loading

0 comments on commit 3ed5afd

Please sign in to comment.