Merge branch 'master' of

https://git.yorkdc.net:8888/joseph.jackson1/programming-01.git

Conflicts:
	.project

src/AssessmentPartOne.java

+
+public class AssessmentPartOne {
+
+	public int biggestOfThree(int num1, int num2, int num3)
+	{
+		// 01 - A Gentle Start
+		// Debug this method so it passes the unit test.
+		// Add comments beside any changes you make
+		
+		if (num1<num2)
+		{
+			if (num3>num1 && num3>num2)  // added a check if num3 is also bigger than num2 
+			{
+				return num3;
+			}
+			
+			else if(num2>num3)
+			{
+				return num2;
+			} // added an else if checking if num2 is bigger than num3
+			// no need to check if bigger than num1 as won't enter if statement if not
+			
+			else
+			{
+				return num1;
+			}
+		}
+		else 
+		{
+			if (num3>num2 && num3>num1) // added a check if num3 is also bigger than num1
+			{
+				return num3;						
+			}
+			else if( num2>num3) 
+			{
+				return num2; // added a semicolon
+			} // added an else if to check if num2 is bigger than  num3
+			else
+			{
+				return num1;
+			}
+		}
+	}
+	
+	public int sumNumbersBetween(int start, int end)
+	{
+		// 02 - Adding Across A Range
+		// Complete this method so that it adds together all
+		// the integers between start and end, but not including 
+		// start or end
+		// This method should only deal with 0 and positive integers
+		// This method should return -1 if it cannot calculate the result
+		
+		// You should comment your code explaining what each part does
+		
+		int sumOfSquares = 0;
+		if ((start <end) && (start+1 <end)) { // checks if the starting number is smaller than the ending number, and if there are numbers between the start and end number
+		for ( int i=start+1;i<end;i++) { // goes through each number between, but not including, the start and end numbers
+			if(sumOfSquares>=0) { // check that the sum isn't smaller than 0 currently
+			sumOfSquares = sumOfSquares + i; // adds the current number to the sum
+			
+		}
+			else {
+				sumOfSquares = -1; // sets the sum to -1 if the sum is smaller than 0
+			}
+			}
+		
+		
+		}
+		else {
+			sumOfSquares = -1;// sets the sum to -1 if it cannot calculate the result
+	}
+		return sumOfSquares;
+	}
+}

src/AssessmentPartOneTest.java

+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+
+class AssessmentPartOneTest {
+
+	public static AssessmentPartOne test;
+	
+	@BeforeAll
+	static void setUpBeforeClass() throws Exception {
+		test = new AssessmentPartOne();
+	}
+
+	@ParameterizedTest
+	@DisplayName("Testing biggestOfThree")
+	@CsvSource({
+					"1,2,3,3",
+					"4,2,3,4",
+					"1,5,3,5",
+					"8,7,7,8",
+					"1,5,7,7"
+	})
+	void testCountVowels(int num1, int num2, int num3, int biggest) {
+		assertEquals(biggest, test.biggestOfThree(num1, num2, num3));
+	}
+
+	@ParameterizedTest
+	@DisplayName("Testing sumNumbersBetween")
+	@CsvSource({
+					"1,4,5",
+					"1,6,14",
+					"1,2,-1",
+					"-5,8,-1",
+					"5,3,-1",
+					"3,-1,-1"
+	})
+	void testSumNumbersBetween(int num1, int num2, int sum) {
+		assertEquals(sum, test.sumNumbersBetween(num1, num2));
+	}
+}

src/Hub.java

+
+public class Hub {
+
+	public static void main(String[] args) {
+		// TODO Auto-generated method stub
+
+	}
+
+}