Code Refactoring

Activity 1.19.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 Scholarship {
	public static String getScholarshipEligibility(int schoolYear, double GPA, boolean hasResearchExperience) {
		if (schoolYear >= 4) {
			if (GPA >= 3.5) {
				if (hasResearchExperience == true) {
					return "Eligible";
				} 
			} 
		} 
		return "Not eligible";
	}
}

public class Scholarship {
	public static String getScholarshipEligibility(int schoolYear, double GPA, boolean hasResearchExperience) {
		if (schoolYear >= 4) {
			if (GPA >= 3.5) {
				if (hasResearchExperience == true) {
					return "Eligible";
				} 
			} 
		} 
		return "Not eligible";
	}
}
====
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("Scholarship");
      }

// Test for eligibility based on school year
      @Test
      public void testEligibleBySchoolYear() throws IOException {
          Object[] args = {4, 3.5, true};  // Arguments for the method, year and gpa
          String output = getMethodOutput("getScholarshipEligibility", args);
          String expect = "Eligible";
          
          boolean passed = getResults(expect, output, "eligibleForCampusHousing(4, 3.5, true)");
          assertTrue(passed);
      }

// Test for not eligibility based on GPA
      @Test
      public void testEligibleByGpa() throws IOException {
          Object[] args = {4, 2.5,true};  // Arguments for the method
          String output = getMethodOutput("getScholarshipEligibility", args);
          String expect = "Not eligible";
          
          boolean passed = getResults(expect, output, "getScholarshipEligibility(2, 3.5, true)");
          assertTrue(passed);
      }

// Test for not eligible based on year
      @Test
      public void testNotEligible() throws IOException {
          Object[] args = {2, 3.5, true};  // Arguments for the method
          String output = getMethodOutput("getScholarshipEligibility", args);
          String expect = "Not eligible";
          
          boolean passed = getResults(expect, output, "getScholarshipEligibility(2, 3.5, true)");
          assertTrue(passed);
      }

// Test for not eligibility based on research
      @Test
      public void testNotEligibleByGpa() throws IOException {
          Object[] args = {5, 3.5, false};  // Arguments for the method
          String output = getMethodOutput("getScholarshipEligibility", args);
          String expect = "Not eligible";
          
          boolean passed = getResults(expect, output, "getScholarshipEligibility(4, 3.5, false)");
          assertTrue(passed);
      }

// Test for not eligibility based on GPA and lower school year
      @Test
      public void testEligibleByGpaAndHighYear() throws IOException {
          Object[] args = {2, 3.2, true};  // Arguments for the method
          String output = getMethodOutput("getScholarshipEligibility", args);
          String expect = "Not eligible";
          
          boolean passed = getResults(expect, output, "getScholarshipEligibility(6, 3.2, true)");
          assertTrue(passed);
      }

}

Activity 1.19.2.

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

public class Scholarship {   
  public static String getScholarshipEligibility(int schoolYear, double GPA, boolean hasResearchExperience) {
    if (schoolYear >= 4 && GPA >= 3.5 && hasResearchExperience == true) {
      return "Eligible";
    } 
    return "Not eligible";
  }
}

This code can improve further!

public class Scholarship {   
  public static String getScholarshipEligibility(int schoolYear, double GPA, boolean hasResearchExperience) {
    if (schoolYear >= 4 || GPA >= 3.5 || hasResearchExperience == true) {
      return "Eligible";
    } 
    return "Not eligible";
  }
}

The code doesn’t have the same functionality with the original one. Copy the original code into the interactive section and try refactoring it again.

public class Scholarship {   
  public static String getScholarshipEligibility(int schoolYear, double GPA, boolean hasResearchExperience) {
    if (schoolYear >= 4 && GPA >= 3.5 && hasResearchExperience) {
      return "Eligible";
    } 
    return "Not eligible";
  }
}

You refactored correctly!

Section 1.19 Code Refactoring

Activity 1.19.1.

Activity 1.19.2.