Commit Graph

57 Commits

Author SHA1 Message Date
BrittanyBi
6ab0470fca PAN-64 Fixed bug in tests that was failing the 1st Travis build. 2019-04-15 20:49:56 -06:00
BrittanyBi
41a78babd9 Merge branches 'PAN-64' and 'master' of https://github.com/atusa17/ptp into PAN-64 2019-04-14 21:10:49 -06:00
BrittanyBi
ecd6584422 PAN-64 Refactored ParserService. 2019-04-14 20:29:11 -06:00
BrittanyBi
5de86dc498 PAN-64 Completed and refactored unit tests for ParserService. 2019-04-14 20:28:11 -06:00
12f7d7f359 PAN-11 fixed all integration tests 2019-04-07 18:00:12 -06:00
c8600b8bb4 PAN-11 Fixed integration tests 2019-04-07 17:30:34 -06:00
091215f1eb PAN-11 Fixed integration tests 2019-04-07 17:22:08 -06:00
67f77d6c9e PAN-11 Fixed integration tests 2019-04-07 17:06:43 -06:00
c75b243df8 PAN-11 Fixed integration tests 2019-04-07 16:51:36 -06:00
7802e25310 Merge branches 'PAN-11' and 'master' of https://github.com/atusa17/ptp into PAN-11
# Conflicts:
#	services/src/integrationTest/resources/test.properties
#	services/src/main/java/edu/msudenver/tsp/services/dto/Account.java
2019-04-07 16:03:36 -06:00
36036b710d PAN-15 Finished Unit Tests 2019-04-07 15:18:19 -06:00
dantanxiaotian
adbcd786f0 PAN-15 fix the request changes 2019-04-02 16:38:54 -06:00
dantanxiaotian
b1d4ed9719 PAN-15 fix the request changes 2019-03-27 12:18:12 -06:00
765d8283d9 PAN-11 wrote unit tests for deleteDefinition 2019-03-24 22:36:10 -06:00
8724d6c2f8 PAN-11 created the deleteDefinition method 2019-03-24 22:27:27 -06:00
5a44b5b793 PAN-11 wrote unit tests for the updateDefinition method 2019-03-24 22:12:34 -06:00
6d1db048c8 PAN-11 created the updateDefinition method 2019-03-24 21:51:36 -06:00
69726a46a4 PAN-11 created the updateDefinition method 2019-03-24 21:51:10 -06:00
ae88fd356d PAN-11 Wrote unit tests for the findById method 2019-03-24 21:41:16 -06:00
bc0d631e6c PAN-11 Wrote the findById method 2019-03-24 21:29:49 -06:00
92bea81ae5 PAN-11 Wrote unit tests for getAllDefinitions() 2019-03-24 21:23:03 -06:00
978b58fe2c PAN-11 wrote the GetAllDefinitions() method 2019-03-24 20:48:25 -06:00
0bc56f57e6 PAN-15 Merged with master 2019-03-24 17:49:07 -06:00
dantanxiaotian
6791f6c61f Merge branch 'master' of https://github.com/atusa17/ptp into PAN-15
# Conflicts:
#	src/main/java/edu/msudenver/tsp/website/Application.java
2019-03-24 17:31:40 -06:00
dantanxiaotian
7060f2e7e3 Merge branch 'master' of https://github.com/atusa17/ptp into PAN-15
# Conflicts:
#	src/main/java/edu/msudenver/tsp/website/Application.java
2019-03-24 15:00:20 -06:00
dantanxiaotian
89f1c55f51 PAN-15 Fixed unit tests 2019-03-24 14:54:06 -06:00
9695f5082a Merge branches 'PAN-15' and 'master' of https://github.com/atusa17/ptp into PAN-15
# Conflicts:
#	services/build.gradle
2019-03-20 22:30:11 -06:00
f5f959b453 Merge branches 'PAN-15' and 'master' of https://github.com/atusa17/ptp into PAN-15
# Conflicts:
#	services/build.gradle
2019-03-20 22:28:51 -06:00
f35777b5a6 Merge remote-tracking branch 'origin/PAN-15' into PAN-15
# Conflicts:
#	services/src/main/java/edu/msudenver/tsp/services/dto/Account.java
#	services/src/main/java/edu/msudenver/tsp/services/factory/RequestFactory.java
2019-03-20 22:17:24 -06:00
748781f10f Merge branches 'PAN-15' and 'master' of https://github.com/atusa17/ptp into PAN-15
# Conflicts:
#	build.gradle
#	persistence/src/main/java/edu/msudenver/tsp/persistence/repository/AccountsRepository.java
#	persistence/src/test/java/edu/msudenver/tsp/persistence/controller/AccountControllerTest.java
#	services/src/main/java/edu/msudenver/tsp/services/RestService.java
#	services/src/main/java/edu/msudenver/tsp/services/dto/Account.java
#	services/src/main/java/edu/msudenver/tsp/services/factory/RequestFactory.java
#	services/src/main/java/edu/msudenver/tsp/services/parser/ParserService.java
#	services/src/test/java/edu/msudenver/tsp/services/parser/ParserServiceTest.java
2019-03-20 22:15:32 -06:00
Alex Tusa
083c149a73 Merge branch 'master' into PAN-15 2019-03-20 22:15:08 -06:00
dantanxiaotian
860e5379e6 PAN-15 UserService.java and completed UserSservice integration test 2019-03-20 16:06:24 -06:00
b48094ba26 PAN-11 Stuck trying to get the integration tests to be configured correctly 2019-03-17 22:02:00 -06:00
3853911b3c PAN-11 corrected build.gradle inter-project dependencies 2019-03-17 21:09:07 -06:00
a84e6c6ab7 PAN-52 Removed useless classes 2019-03-17 16:22:23 -06:00
9700eb55ab PAN-52 Removed useless classes 2019-03-17 16:21:32 -06:00
6197beb309 PAN-52 Updated the build.gradle files 2019-03-17 15:37:04 -06:00
6009720d80 PAN-52 Created RequestFactory unit tests 2019-03-17 15:07:23 -06:00
c90f5b6e09 PAN-57 Added patch method to RestService per request 2019-03-17 14:52:41 -06:00
a13ab97154 PAN-57 Refacted superfluous code 2019-03-17 14:48:43 -06:00
dantanxiaotian
ffaf020b80 PAN-15 WORKING AND WITH TRAVIS!!! 2019-03-10 17:21:32 -06:00
dantanxiaotian
5d429b2c8e PAN-15 Updated tests 2019-03-10 17:06:47 -06:00
dantanxiaotian
ced18dcc97 Merge remote-tracking branch 'origin/PAN-15' into PAN-15 2019-03-10 17:03:59 -06:00
dantanxiaotian
238908f4fa PAN-15 Updated tests 2019-03-10 17:03:50 -06:00
dantanxiaotian
10b0a09690 PAN-15 Updated the gradle dependencies 2019-03-10 16:18:19 -06:00
dantanxiaotian
ba37ffeb57 PAN-15 Created initial UserService implementation and initial integration tests 2019-03-10 15:55:43 -06:00
c826185bba PAN-60 Created an example UserService 2019-03-10 12:33:54 -06:00
22e401062a PAN-60 created the RequestFactory 2019-03-10 12:03:11 -06:00
e9661fdf78 PAN-60 created initial RestService 2019-03-10 11:48:34 -06:00
103d09bb0e PAN-10 added a null check to the recurse method 2019-03-05 11:48:18 -07:00