Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue 2# #15

Open
wants to merge 121 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
121 commits
Select commit Hold shift + click to select a range
4be9f21
Fixed typo in README
SQUEEEE Feb 9, 2021
cd8e957
Update README.md
gzh0528 Feb 9, 2021
457813b
Setup travis
Feb 9, 2021
a0d60b0
Update README.md
gzh0528 Feb 9, 2021
7459b35
Add maven build
CSCphilip Feb 9, 2021
8309dc3
Modify .travis file
CSCphilip Feb 9, 2021
e552e75
Update README.md
gzh0528 Feb 9, 2021
5cd30c6
Merge pull request #6 from DD2480-Group-15/travis-maven
gzh0528 Feb 9, 2021
a101aee
Update README.md
gzh0528 Feb 9, 2021
5a08b4f
Made it so that the ci-server can extract urls from webhooks and clon…
Wizkas0 Feb 9, 2021
06a24b4
Update README.md
gzh0528 Feb 10, 2021
85652b5
Fixed a bug with the ci-server 8#
Wizkas0 Feb 10, 2021
f48972d
Add rules in .gitignore related to Maven and some other.
CSCphilip Feb 10, 2021
1c14a43
Add .idea rule in .gitignore and remove .idea folder
CSCphilip Feb 10, 2021
a8de5f1
Add test skeleton
CSCphilip Feb 10, 2021
37d418c
this adds documentation to ci-server #9
Wizkas0 Feb 10, 2021
a382fc9
Add dummy test that uses server object #7
CSCphilip Feb 10, 2021
1e26f20
Update README with instructions #9
SQUEEEE Feb 10, 2021
150271a
Merge pull request #10 from DD2480-Group-15/testing
SQUEEEE Feb 10, 2021
e46aa33
Fixes ci-server to only handle push-events #11
Wizkas0 Feb 10, 2021
e8cdd83
Started code skeleton #12
SQUEEEE Feb 10, 2021
adf8fc9
A
jonte450 Feb 10, 2021
7f2fb6a
Merge branch 'master' of https://github.com/DD2480-Group-15/ci-server
jonte450 Feb 10, 2021
a7d74af
Fixes #14 by adding test.json to server-folder. Adds a function that …
Wizkas0 Feb 10, 2021
63ff905
Merge pull request #15 from DD2480-Group-15/issue/14
CSCphilip Feb 10, 2021
a2d9710
Removed unnecessary imports
SQUEEEE Feb 10, 2021
e317267
merge
jonte450 Feb 10, 2021
cdbc39f
Wrapped request handling in if statement so it only runs if github push
SQUEEEE Feb 10, 2021
2eff502
Merged with master to keep up to date
SQUEEEE Feb 10, 2021
8ff8620
Starting to break down the JSON parsing
SQUEEEE Feb 10, 2021
cd584a9
Trying to get the JSON parser to work
SQUEEEE Feb 10, 2021
18cb987
Cleaning up code
SQUEEEE Feb 11, 2021
9a5b9a1
Small update of README
SQUEEEE Feb 11, 2021
bbe6aea
Working on #12 dividing into smaller functions
SQUEEEE Feb 11, 2021
5da3d52
Merge branch 'master' of https://github.com/DD2480-Group-15/ci-server
jonte450 Feb 11, 2021
955eb55
Merge pull request #19 from DD2480-Group-15/issue/12
gzh0528 Feb 11, 2021
ca02a5a
Merge branch 'master' of https://github.com/DD2480-Group-15/ci-server
jonte450 Feb 11, 2021
1ccf2e0
Modified JSON related things, issue #21
CSCphilip Feb 12, 2021
1fe1caf
Merge pull request #25 from DD2480-Group-15/issue/21
SQUEEEE Feb 12, 2021
28462bc
Updated webhook instructions #9
SQUEEEE Feb 12, 2021
6e02d25
test
jonte450 Feb 12, 2021
720611d
Removing some line
jonte450 Feb 12, 2021
8f39a8a
Add clone repo functionality #22
CSCphilip Feb 12, 2021
a1fb8ff
Merge pull request #26 from DD2480-Group-15/issue/22
gzh0528 Feb 13, 2021
23441f2
Merge branch 'master' of https://github.com/DD2480-Group-15/ci-server
jonte450 Feb 13, 2021
0a018c7
Fixes #23 by completing getRepoUrl
Wizkas0 Feb 13, 2021
7c069a7
Clone a repo will now work when ./cloned-repo already exist #27.
CSCphilip Feb 13, 2021
51d1e3e
Merge pull request #31 from DD2480-Group-15/issue/27
gzh0528 Feb 13, 2021
3fe5a2f
Get BuildandTest functional. Done with issue #4
Feb 13, 2021
5fd8bc3
Get BuildandTest functional and Fixed bugs for cloneRepo. Done with i…
Feb 13, 2021
a29906c
Merge branch 'master' into issue/4
gzh0528 Feb 13, 2021
90a0776
Adding some tests
jonte450 Feb 14, 2021
79f4870
Merge pull request #32 from DD2480-Group-15/issue/4
CSCphilip Feb 15, 2021
bb0f8c1
Clean up in the code
CSCphilip Feb 15, 2021
0b81c47
Update ContinuousIntegrationServer.java
jonte450 Feb 15, 2021
d8000cf
Update TestServer.java
jonte450 Feb 15, 2021
0ab3ed7
Update TestServer.java
jonte450 Feb 15, 2021
9813c20
Update TestServer.java
jonte450 Feb 15, 2021
711fd08
Add javadoc to some methods #9
CSCphilip Feb 15, 2021
127dc77
Update TestServer.java
jonte450 Feb 15, 2021
d29c45c
Update TestServer.java
jonte450 Feb 15, 2021
7e720b9
Update TestServer.java
jonte450 Feb 15, 2021
d256145
Update TestServer.java
jonte450 Feb 15, 2021
2923ccb
Update TestServer.java
jonte450 Feb 15, 2021
0f37699
Merge branch 'master' into Create_Tests
jonte450 Feb 15, 2021
9178a7d
Update ContinuousIntegrationServer.java
jonte450 Feb 15, 2021
ed1f087
Update ContinuousIntegrationServer.java
jonte450 Feb 15, 2021
bf25150
Fixes #3 by completing set_commit_status()
Wizkas0 Feb 15, 2021
82dffcb
Merge pull request #35 from DD2480-Group-15/issue/3
gzh0528 Feb 16, 2021
3dd50aa
Fixes #36 by implementing a getStatusUrl-fuction
Wizkas0 Feb 16, 2021
0e66a71
Merge pull request #37 from DD2480-Group-15/issue/36
gzh0528 Feb 16, 2021
95556fa
Merge remote-tracking branch 'origin/Create_Tests'
Wizkas0 Feb 16, 2021
d2ef956
Merge pull request #34 from DD2480-Group-15/Create_Tests
Wizkas0 Feb 16, 2021
ebd0a23
Done with issue #38
Feb 16, 2021
21ac74d
Merge remote-tracking branch 'origin/master'
Wizkas0 Feb 16, 2021
84f419b
Update README with ngrok instructions #17
SQUEEEE Feb 16, 2021
d7945fa
Split the token. Done with issue #41
Feb 16, 2021
0b8ff4c
Added statement of contribution and project info #40
SQUEEEE Feb 16, 2021
102a939
Update README.md
jonte450 Feb 16, 2021
32649ff
Update README.md
jonte450 Feb 16, 2021
bac1305
Update README.md
jonte450 Feb 16, 2021
a3eb9e3
Merge pull request #42 from DD2480-Group-15/issue/41
SQUEEEE Feb 16, 2021
30e2c28
Merge remote-tracking branch 'origin/master'
Wizkas0 Feb 16, 2021
b18a304
Add set_commit_status when build fails #43
CSCphilip Feb 17, 2021
c309ba1
You can call functions from CIsever in TestServer now. Done with issu…
Feb 17, 2021
6c695c7
Merge pull request #45 from DD2480-Group-15/issue/44
jonte450 Feb 17, 2021
847531f
Merge remote-tracking branch 'origin/master'
Wizkas0 Feb 17, 2021
0486b6a
Started on the build history feature #46
CSCphilip Feb 17, 2021
0529d02
fixes #47 creates test for getJSON #7
Wizkas0 Feb 17, 2021
a960a61
Merge pull request #48 from DD2480-Group-15/issue/7
SQUEEEE Feb 17, 2021
8060b61
Update README.md
jonte450 Feb 17, 2021
1e695ad
Added helper function in TestServer for getting a JSONObject from a file
SQUEEEE Feb 17, 2021
4369355
Changed test_getJSON to use the help_getJSON function
SQUEEEE Feb 17, 2021
21c2158
Finished test_getStatusUrl and removed an uneccesary print
SQUEEEE Feb 17, 2021
8cdbe2d
Added test for getRepoURL
SQUEEEE Feb 17, 2021
9a7616f
Clean up of test code
SQUEEEE Feb 17, 2021
e5751a1
Merge pull request #50 from DD2480-Group-15/issue/7
CSCphilip Feb 17, 2021
4dc8c95
Added history html.Done with issue #46
Feb 17, 2021
829d8ba
Merge remote-tracking branch 'origin/issue/46' into issue/46
Feb 17, 2021
a26da06
Add first version of browsable javadoc
CSCphilip Feb 17, 2021
e555896
Update README
gzh0528 Feb 17, 2021
9cd1a83
Removed code that generated a test file #53
SQUEEEE Feb 17, 2021
f4e69d4
Merge pull request #51 from DD2480-Group-15/issue/46
CSCphilip Feb 17, 2021
a79dbbe
Updated javadoc comments #9
SQUEEEE Feb 17, 2021
8e48bdd
Updated documentation with javadocs #9
SQUEEEE Feb 17, 2021
ea008c2
Deleted unnecessary files #53
SQUEEEE Feb 17, 2021
0d2c773
Removed dummyTest function #53
SQUEEEE Feb 17, 2021
b58d920
Fixed typo in README #40
SQUEEEE Feb 17, 2021
641ae04
Add version 2 of browsable javadoc #9
CSCphilip Feb 17, 2021
2fc73d0
Created a folder to store build history and removed useless html. Don…
Feb 17, 2021
eba89b0
Merge pull request #55 from DD2480-Group-15/issue/54
SQUEEEE Feb 17, 2021
53fb002
Add version 3 of browsable javadoc #9
CSCphilip Feb 17, 2021
41a6512
Merge branch 'master' of github.com:DD2480-Group-15/ci-server
CSCphilip Feb 17, 2021
041d672
Updata Readme #40
gzh0528 Feb 17, 2021
42601ba
Trigger failed test second try
SQUEEEE Feb 17, 2021
b4af203
Fixed bugs in CI server. Done with issue #56
Feb 17, 2021
4c7a836
Merge branch 'master' of github.com:DD2480-Group-15/ci-server #56
Feb 17, 2021
b551dfd
Merge cleaned up. Done with issue #56
Feb 17, 2021
ef7f3f8
Update README #40
gzh0528 Feb 17, 2021
921bc61
Updated README with History instructions
SQUEEEE Feb 17, 2021
32c36a6
Update README statement of contribution #40
SQUEEEE Feb 17, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update TestServer.java
testing
  • Loading branch information
jonte450 authored Feb 15, 2021
commit 7e720b9523a1b05cc15ec4831d79dd4cbc7ab85d
3 changes: 2 additions & 1 deletion src/test/java/server/TestServer.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ public void TestGetJson(){
//Test That it correctly converts to JSON
String test_true = "[{\"test\":\"working\"}]";
Reader inputString = new StringReader(test_true);
JsonObject json_true = new JSONObject();
JSONObject json_true = new JSONObject();

BufferedReader reader = new BufferedReader(inputString);
json_true.put("test","working");
//assertEquals(getJSON(reader),json_true);
Expand Down