Merge conflict exercise - #7

Open

vcrabtree wants to merge 133 commits into

tobydragon:masterfrom

jmendezdietsch:master

Commits on Jan 22, 2020

False tests added
jmendezdietsch
committed
5e43a8c
isEmailValid built to tests
MunkyCode
committed
b06d5c7
sdding comments on equivalence cases and border cases
MunkyCode
committed
2babee9

Commits on Jan 23, 2020

One letter and true tests added
jmendezdietsch
committed
21a3248

Commits on Jan 24, 2020

now include single letter extensions
MunkyCode
committed
320e723
New test added for equvilence test and boundaries, need single extension code and withdraw tests
jmendezdietsch
committed
2016659

Commits on Jan 26, 2020

Some more tests added for assing 1-3
jmendezdietsch
committed
e6a2965
Comments to new tests
jmendezdietsch
committed
f39df93
getBalanceTest test added (need to change code for negative numbers)
jmendezdietsch
committed
bc4e081
Withdraw tests added
jmendezdietsch
committed
91a2d08
Tests update
jmendezdietsch
committed
e15f2d5
Implemntation for isEmailValid and withdraw methods
MunkyCode
committed
6ed4c13

Commits on Jan 28, 2020

More comments added to main to describe actions of is email as well as separation of isEmailValid
jmendezdietsch
committed
a8bbd87

Commits on Jan 30, 2020

isAmountValid tests added and some code; 4/5 tests pass
jmendezdietsch
committed
17cd360
decimalPoints fixed to find index
jmendezdietsch
committed
ce0a1f0

Commits on Jan 31, 2020

isAmountValid works but check with toby about exception, deposit works/needs comments, and transfer tests/need comments
jmendezdietsch
committed
5f948d1
All test do work but need to do illegalException throw
jmendezdietsch
committed
3a962b8
Exception throw messed transfer, deposit, withdraw, and get balance tests
jmendezdietsch
committed
461d1c6
All tests pass with all working code
jmendezdietsch
committed
fe21ecd

Commits on Feb 3, 2020

Toby code added, CODE LEVELS UP
jmendezdietsch
committed
bf6a900

Commits on Feb 4, 2020

Commits on Feb 5, 2020

Added withdraw branch
vcrabtree
committed
618b805
Added DepositTest class with tests for deposit
vcrabtree
committed
2dcd72b
tests
klpolley
committed
714a7c2
Updates to test
vcrabtree
committed
671c711
deposit
klpolley
committed
e91d7e3
deposit branch test
jmendezdietsch
committed
491c56e
Wrote deposit implementation
vcrabtree
committed
418c217
Deposit implementation
vcrabtree
committed
30b99aa
Resolved merge conflicts
vcrabtree
committed
990e6c7
Deposit test implementation
jmendezdietsch
committed
a149ccc
Deposit mess
jmendezdietsch
committed
f810e71
Merge branch 'master' of https://github.com/jmendezdietsch/SoftwareEngineeringPractice
vcrabtree
committed
a46551e
Merge pull request #1 from jmendezdietsch/depositConflictVera
klpolley
authored
b2d886e
merge master, clean up unnecessary stuff from assignment 2-6
klpolley
committed
343a854

Commits on Feb 6, 2020

Merge pull request #2 from jmendezdietsch/createAccount
vcrabtree
authored
91868ac
Merge branch 'master' of https://github.com/jmendezdietsch/SoftwareEngineeringPractice
vcrabtree
committed
4e66566
Added withdraw tests
vcrabtree
committed
b5d224a
Implemented withdraw method
vcrabtree
committed
7812d47
Updated deposit implementation
vcrabtree
committed
8d50a58
Update AdvancedAPI.java
klpolley
authored
376ae0e
Merge pull request #3 from jmendezdietsch/withdraw
klpolley
authored
6f0afe3
close account tests
klpolley
committed
e80d05d
account removed on close
klpolley
committed
dd7283c
tests
klpolley
committed
0966b74
updated tests - amounts too large for bank
klpolley
committed
924d4f0
implementation - tests pass
klpolley
committed
1480987

Commits on Feb 7, 2020

Added tests for deposit
vcrabtree
committed
655d153
Implemented deposit
vcrabtree
committed
72aab98
Merge pull request #4 from jmendezdietsch/deposit
klpolley
authored
a196543
merged master
klpolley
committed
5c09f29
Merge pull request #5 from jmendezdietsch/calcTotalAssets
vcrabtree
authored
3844f96
merged master
klpolley
committed
c8efbdf
new tests - can't close account with money left
klpolley
committed
8a32399
Wrote tests for checkBalance
vcrabtree
committed
be08ee3
tests pass
klpolley
committed
b8be4dd
Implemented checkBalance
vcrabtree
committed
48e1e47
Merge pull request #6 from jmendezdietsch/closeAccount
vcrabtree
authored
fc149ab
Merge pull request #7 from jmendezdietsch/checkBalance
klpolley
authored
a4d43ec
updated bank account to include password
klpolley
committed
7db8cd7
some tests
klpolley
committed
39f631d
validate password - 8 chars
klpolley
committed
cd2d768
updated tests and merge password stuff
klpolley
committed
8c1a214
Added transfer tests
vcrabtree
committed
42bcc56
password validation implemented
klpolley
committed
214f523
Started transfer implementation
vcrabtree
committed
7336f40
Merge pull request #8 from jmendezdietsch/checkCredentials
vcrabtree
authored
add2a08
Final tranfer implementation
vcrabtree
committed
65fbb0c
Added additional tests
vcrabtree
committed
76f9277
Resolved merge conflicts
vcrabtree
committed
c239de5
Merge pull request #9 from jmendezdietsch/transfer
klpolley
authored
8f9843b

Commits on Feb 8, 2020

Commits on Feb 9, 2020

Transaction history tests
jmendezdietsch
committed
58fb49d
Tests and starts added to freeze, unfreez, and sus actions
jmendezdietsch
committed
cbd9875
Start to freezeAccount and unfreeze
jmendezdietsch
committed
912899e
Freeze object take out of unfreeze method
jmendezdietsch
committed
9305bfb
Comments on what to do/idea for frozen and unfrozen
jmendezdietsch
committed
34ccf07

Commits on Feb 10, 2020

some suggestions and fixes for all the transaction stuff
klpolley
committed
32d7c4b
added diagram links
klpolley
authored
d992e9c
Added deposit sequence diagram
vcrabtree
authored
a06b518
Changes to savingtests, checkingtests, and methods to implement frozen boolean
jmendezdietsch
committed
afeea84
teller system test
klpolley
committed
b93dead
Transaction additions and frozen added to more methods
jmendezdietsch
committed
30d96e6
Suspicious Acts start
jmendezdietsch
committed
05de6f7
Merge branch 'master' of https://github.com/jmendezdietsch/SoftwareEngineeringPractice
jmendezdietsch
committed
f436a16
Transaction history still in working progress
jmendezdietsch
committed
e35d0d8
Updates to transaction add to history in each method
jmendezdietsch
committed
d654073
Error updates after merge
jmendezdietsch
committed
0570fce
Fixed/added to suspicious acctounts
jmendezdietsch
committed
462225e
Test updated to add freeze/unfreeze and isFrozen
jmendezdietsch
committed
c7719aa

Commits on Feb 11, 2020

Merge branch 'transaction'
jmendezdietsch
committed
ddcd8c1
All tests work except for HistoryTest, numbers shift to different accounts
jmendezdietsch
committed
80a6c22
Integration test
vcrabtree
committed
629fe2d
fixing withdraw real quick
klpolley
committed
ab32bfb
System test
vcrabtree
committed
5cc4979
Fixed merge conflicts
vcrabtree
committed
ae47deb
Merge pull request #11 from jmendezdietsch/veraTests
jmendezdietsch
authored
d8c932c
ReadMe.md and some transactionTest work
jmendezdietsch
committed
88b6c78
fixing all of the things!!!!
klpolley
committed
7d41182
Merge branch 'advancedAPITest' and ALL THE TESTS PASS WOOOOOOO
klpolley
committed
1299f90
Updated Vera system Test
vcrabtree
committed
2aad42d
Update README.md
klpolley
authored
2119026
equals change
jmendezdietsch
committed
53494b0

Commits on Feb 12, 2020

What to do (Josue) in read me
jmendezdietsch
committed
277b472
Update README.md
klpolley
authored
b20cc42
some tests to determine what is suspicious and what is not
klpolley
committed
26574fb

Commits on Feb 13, 2020

updated tests for actual suspicion criteria
klpolley
committed
2ce62de
find suspicious accounts code
klpolley
committed
4d0d400
testing below s.d.
klpolley
committed
cdb8212
Merge pull request #12 from jmendezdietsch/suspiciousUpdate
vcrabtree
authored
220a09f
Added account frozen exception tests to withdraw, deposit, and transfer
vcrabtree
committed
b87f7f6
Added additional test to transfer
vcrabtree
committed
c1e7e83
Updated transfer method
vcrabtree
committed
9e5c36b
Merge pull request #13 from jmendezdietsch/accoutFrozenTests
klpolley
authored
c3d09a9

Commits on Feb 14, 2020

The print of the question but scanner doesnt accept any input
jmendezdietsch
committed
74477c2
confirmActivity method created to print values/clear suspicious activity but Scanner not allowing to input
jmendezdietsch
committed
f6b9421
just a thought
klpolley
committed
550acee

Commits on Feb 15, 2020

state diagram
klpolley
authored
8f001bd

Commits on Feb 16, 2020

setup classes and initial testing script
klpolley
committed
1bab108
Merge pull request #14 from jmendezdietsch/setupUI
vcrabtree
authored
50db9dc

Commits on Feb 17, 2020

user interface
klpolley
committed
e15eeb7

Commits on Feb 18, 2020

Added accountDoesNotExist to methods as well as small errors on sides of script, mainly in transfer and account checking parts
jmendezdietsch
committed
429b0c0
Final updates to UI
vcrabtree
committed
efe56b8
one tiny exception thing
klpolley
committed
a2299b0
Merge pull request #15 from jmendezdietsch/setupUI
klpolley
authored
a741939