diff --git a/README.md b/README.md index 9e06d2e2..039b766c 100644 --- a/README.md +++ b/README.md @@ -24,38 +24,38 @@ can make pull requests to that repo during the Task 3 activity during the lab. During lab, you should not fork directly from https://github.com/CSC207-2023F-UofT/Lab2. If you miss the lab and work on this after, you should use this URL though. -- [ ] Make a fork of this repo and clone a local copy (as you did in Lab 1). +- [X] Make a fork of this repo and clone a local copy (as you did in Lab 1). - Important: make sure to uncheck the option to only fork the main branch, as the repo contains some branches you will use in this lab. # TASK 1: Your first branch -- [ ] Create and checkout a new branch called `task_1` using either IntelliJ or the Terminal: +- [X] Create and checkout a new branch called `task_1` using either IntelliJ or the Terminal: - IntelliJ: `Git -> New branch...` - Terminal: `git checkout -b task_1` - After, you can check `git status` or the Log tab of the Git tool window in IntelliJ to see that you are now on the `task_1` branch. -- [ ] Open the TODO tool window (`View -> Tool Windows -> TODO`) and click on the TASK 1 TODO listed. -- [ ] Complete the TASK 1 TODO and commit your changes to this file (checking off the +- [x] Open the TODO tool window (`View -> Tool Windows -> TODO`) and click on the TASK 1 TODO listed. +- [x] Complete the TASK 1 TODO and commit your changes to this file (checking off the completed items so far) and `DataTypes.java` (remove the word TODO and your bug fix). - talk to those around you or your TA, then see the hints at the bottom of the readme if you get stuck. -- [ ] Now, we'll merge the `task_1` branch back into `main`. When merging, +- [x] Now, we'll merge the `task_1` branch back into `main`. When merging, you need to be currently on the branch you are trying to merge into, so we'll first checkout the main branch: - IntelliJ: `Git -> branches... -> main -> Checkout` - Terminal: `git checkout main` Note: everything we've done has been local to our repository and have not pushed anything yet. -- [ ] We are back on `main`, so we can now do the merge and complete our work! +- [x] We are back on `main`, so we can now do the merge and complete our work! - IntelliJ: `Git -> Merge... -> task_1 -> Merge` - Terminal: `git merge task_1` You should now see the changes you had made are also in the `main` branch. -- [ ] Now, we'll want to clean up since we are done with our `task_1` branch. +- [x] Now, we'll want to clean up since we are done with our `task_1` branch. - IntelliJ: `Git -> branches... -> task_1 -> Delete` - Terminal: `git branch -d task_1` -- [ ] Last step, we'll push our changes to the remote repository to share our work! (As we did in Lab 1.) +- [x] Last step, we'll push our changes to the remote repository to share our work! (As we did in Lab 1.) - we suggest you check off this last item, commit that change (just right on main is fine; no need to branch for this little step), then push your code. Check GitHub to ensure you can see your changes. @@ -127,4 +127,4 @@ When making a pull request, there may potentially be merge conflicts to resolve, previous task. GitHub as additional information about how its interface helps facilitate resolving such conflicts: -https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github \ No newline at end of file +https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github diff --git a/src/DataTypes.java b/src/DataTypes.java index 4f807c1f..b2c183fe 100644 --- a/src/DataTypes.java +++ b/src/DataTypes.java @@ -2,13 +2,17 @@ public class DataTypes { // TODO TASK 1: fix this code so that it passes the test in DataTypesTest.java + public static void main(String[] args) { + + } public static long sum(List numbers) { - int s = 0; + long s = 0; // below is a "foreach" loop which iterates through numbers for (int x : numbers) { s += x; } return s; } + } diff --git a/test/DataTypesTest.java b/test/DataTypesTest.java index e53951fe..3cadc896 100644 --- a/test/DataTypesTest.java +++ b/test/DataTypesTest.java @@ -7,11 +7,17 @@ public class DataTypesTest { + + public static void main(String[] args) { + + } @Test(timeout = 1000) /** * Test that DataTypes.sum returns the correct value for * the sum from 1 to 1 million. */ + + public void largeSumTest() { // You put an L at the end to indicate it is a long. @@ -24,6 +30,6 @@ public void largeSumTest() { for (int i = 1; i <= 1_000_000; i++) { lst.add(i); } - assertEquals("sum form 1 to 1 million should be " + x, x, DataTypes.sum(lst)); + assertEquals("sum from 1 to 1 million should be " + x, x, DataTypes.sum(lst)); } -} \ No newline at end of file +}