forked from svenvc/zinc
-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'issue_58' into gs_master
fix Issue #60. updated REST tests from @HeSe WebSocket packages from @HeSe, but still issues with loading Cryptography package (Issue #58)
- Loading branch information
Showing
39 changed files
with
145 additions
and
123 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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,4 +2,4 @@ | |
| "class" : { | ||
| }, | ||
| "instance" : { | ||
| "baseline:" : "dkh 10/15/2014 11:47" } } | ||
| "baseline:" : "dkh 11/17/2014 18:15" } } | ||
2 changes: 1 addition & 1 deletion
2
repository/BaselineOfZincHTTPComponents.package/monticello.meta/version
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
3 changes: 0 additions & 3 deletions
3
repository/Zinc-HTTP.package/ZnHTTPSocketFacade.class/class/httpGif..st
This file was deleted.
Oops, something went wrong.
3 changes: 0 additions & 3 deletions
3
repository/Zinc-HTTP.package/ZnHTTPSocketFacade.class/class/httpPng..st
This file was deleted.
Oops, something went wrong.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,4 @@ | ||
| system startup | ||
| startUp: resuming | ||
| "Our system startUp hook: start all servers we manage. | ||
| We do this using deferred startup actions to allow normal error handling." | ||
| "noop for gemstone ... always explicitly start server on startup for GemStone" | ||
|
|
||
| (resuming or: [ self alwaysRestart ]) | ||
| ifTrue: [ | ||
| Smalltalk addDeferredStartupAction: [ | ||
| self managedServers do: [ :each | each start ] ] ] |
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
Large diffs are not rendered by default.
Oops, something went wrong.
3 changes: 3 additions & 0 deletions
3
...nc-REST.package/ZnExampleStorageRestServerDelegateTest.class/instance/expectedFailures.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,3 @@ | ||
| testing | ||
| expectedFailures | ||
| ^ #(#'testQuery') |
47 changes: 23 additions & 24 deletions
47
...ory/Zinc-REST.package/ZnExampleStorageRestServerDelegateTest.class/instance/testCreate.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,28 +1,27 @@ | ||
| testing | ||
| testCreate | ||
| "You create a new entry by posting a JSON map representation to /storage/objects | ||
| "You create a new entry by posting a JSON map representation to /storage/objects | ||
| The result is a 201 Created response with the URI of the new object both | ||
| returned as a JSON string and as the Location header" | ||
|
|
||
| | data objectUri | | ||
| data := Dictionary with: #x -> 'foo' with: #y -> 'bar'. | ||
| client | ||
| addPathSegment: 'objects'; | ||
| contents: data; | ||
| post. | ||
| self assert: client isSuccess. | ||
| self assert: client isCreated. | ||
| objectUri := client response location. | ||
| self assert: objectUri isString & objectUri isEmpty not. | ||
| self assert: client contents equals: objectUri. | ||
| client resetEntity. | ||
| client get. | ||
| self assert: client isSuccess. | ||
| self assert: (client contents includes: objectUri). | ||
| client | ||
| url: objectUri; | ||
| get. | ||
| self assert: client isSuccess. | ||
| data keysAndValuesDo: [ :key :value | | ||
| (client contents at: key) = value ]. | ||
| self assert: (client contents at: #'object-uri') equals: objectUri | ||
|
|
||
| | data objectUri | | ||
| data := Dictionary with: 'x' -> 'foo' with: 'y' -> 'bar'. | ||
| client | ||
| addPathSegment: 'objects'; | ||
| contents: data; | ||
| post. | ||
| self assert: client isSuccess. | ||
| self assert: client isCreated. | ||
| objectUri := client response location. | ||
| self assert: objectUri isString & objectUri isEmpty not. | ||
| self assert: client contents equals: objectUri. | ||
| client resetEntity. | ||
| client get. | ||
| self assert: client isSuccess. | ||
| self assert: (client contents includes: objectUri). | ||
| client | ||
| url: objectUri; | ||
| get. | ||
| self assert: client isSuccess. | ||
| data keysAndValuesDo: [ :key :value | (client contents at: key) = value ]. | ||
| self assert: (client contents at: 'object-uri') equals: objectUri |
47 changes: 23 additions & 24 deletions
47
...ory/Zinc-REST.package/ZnExampleStorageRestServerDelegateTest.class/instance/testUpdate.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,26 +1,25 @@ | ||
| testing | ||
| testUpdate | ||
| "To update an existing object you PUT a new JSON map representation to an existing uri" | ||
|
|
||
| | data objectUri | | ||
| data := Dictionary with: #x -> 'foo' with: #y -> 'bar'. | ||
| client | ||
| addPathSegment: 'objects'; | ||
| contents: data; | ||
| post. | ||
| self assert: client isCreated. | ||
| objectUri := client response location. | ||
| client resetEntity. | ||
| data at: #z put: 100. | ||
| client | ||
| url: objectUri; | ||
| contents: data; | ||
| put. | ||
| self assert: client isSuccess. | ||
| client resetEntity. | ||
| client get. | ||
| self assert: client isSuccess. | ||
| data keysAndValuesDo: [ :key :value | | ||
| (client contents at: key) = value ]. | ||
| self assert: (client contents at: #'object-uri') equals: objectUri. | ||
| self assert: (client contents at: #z) equals: 100 | ||
| "To update an existing object you PUT a new JSON map representation to an existing uri" | ||
|
|
||
| | data objectUri | | ||
| data := Dictionary with: 'x' -> 'foo' with: 'y' -> 'bar'. | ||
| client | ||
| addPathSegment: 'objects'; | ||
| contents: data; | ||
| post. | ||
| self assert: client isCreated. | ||
| objectUri := client response location. | ||
| client resetEntity. | ||
| data at: 'z' put: 100. | ||
| client | ||
| url: objectUri; | ||
| contents: data; | ||
| put. | ||
| self assert: client isSuccess. | ||
| client resetEntity. | ||
| client get. | ||
| self assert: client isSuccess. | ||
| data keysAndValuesDo: [ :key :value | (client contents at: key) = value ]. | ||
| self assert: (client contents at: 'object-uri') equals: objectUri. | ||
| self assert: (client contents at: 'z') equals: 100 |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,2 @@ | ||
| SystemOrganization addCategory: #'Zinc-REST'! | ||
| SystemOrganization addCategory: #'Zinc-REST-Server'! | ||
| SystemOrganization addCategory: #'Zinc-REST-Tests'! |
Oops, something went wrong.