Code Refactoring

Activity 1.35.1.

There is a copy of the following code block in an interactive mode that you can modify and compile. Your task is to improve the code’s style as an expert would view it, while ensuring its behavior remains unchanged. You may run your refactored code to verify that it still passes all test cases.

🔗

public class WithinRange {
	public static boolean isInRange(int number, int lowerBound, int upperBound) {
		if (number >= lowerBound && number <= upperBound) {
			return true;
		} else {
			return false;
		}
	}
}

public class WithinRange {
	public static boolean isInRange(int number, int lowerBound, int upperBound) {
		if (number >= lowerBound && number <= upperBound) {
			return true;
		} else {
			return false;
		}
	}
}
====
      import static org.junit.Assert.*;
import org.junit.Test;
import java.io.*;
import org.junit.Before;
import org.junit.After;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;

public class RunestoneTests extends CodeTestHelper {

public RunestoneTests() {
	  super("WithinRange");
  }

// Test for within the range
  @Test
  public void testWithin() throws IOException {
	  Object[] args = {10, 1, 20};  // Arguments for the method
	  String output = getMethodOutput("isInRange", args);
	  String expect = Boolean.toString(true);  // Convert expected boolean to String
	  
	  // No need to manually convert the result as the output is already a string
	  boolean passed = getResults(expect, output, "isInRange(10,1,20)");
	  assertTrue(passed);
  }

// Test for zero
  @Test
  public void testOutsideLower() throws IOException {
	  Object[] args = {-10, 0, 10};  // Arguments for the method
	  String output = getMethodOutput("isInRange", args);
	  String expect = Boolean.toString(false);  // Convert expected boolean to String
	  
	  boolean passed = getResults(expect, output, "isInRange(-10,0,10)");
	  assertTrue(passed);
  }

// Test for negative number
  @Test
  public void testOutsideUpper() throws IOException {
	  Object[] args = {-2, -10, -4};  // Arguments for the method
	  String output = getMethodOutput("isInRange", args);
	  String expect = Boolean.toString(false);  // Convert expected boolean to String
	  
	  boolean passed = getResults(expect, output, "isInRange(-2,-10,-4)");
	  assertTrue(passed);
  }

}

🔗

Activity 1.35.2.

Which of the following code blocks is the most similar to your final refactored code for the previous question?

🔗

public class WithinRange {
	public static boolean isInRange(int number, int lowerBound, int upperBound) {
		if (number >= lowerBound && number <= upperBound) {
			return true;
		}
		return false;
	}
}

This code can further be improved!

public class WithinRange {
	public static boolean isInRange(int number, int lowerBound, int upperBound) {
		return number >= lowerBound && number <= upperBound;
	}
}

You did it correctly!

🔗

Practice Code Structure

Section 1.35 Code Refactoring

Activity 1.35.1.

Activity 1.35.2.