Code Refactoring

Activity 1.18.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 CampusHousing {
	public static String getCampusHousingEligibility(int schoolYear, double GPA) {
    	if (schoolYear <= 3) { 
        	return "Not eligible";
    	} 
    	if (GPA > 3.4){
          	return "Eligible";
      	} else {
         	return "Not eligible";
        }
    }
}

public class CampusHousing {
	public static String getCampusHousingEligibility(int schoolYear, double GPA) {
    	if (schoolYear <= 3) { 
        	return "Not eligible";
    	}
    	if (GPA > 3.4){
          	return "Eligible";
      	} else {
         	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("CampusHousing");
      }

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

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

// Test for eligibility based on school year but GPA doesn't qualify
      @Test
      public void testNotEligibleByGpa() throws IOException {
          Object[] args = {4, 3.0};  // Arguments for the method
          String output = getMethodOutput("getCampusHousingEligibility", args);
          String expect = "Not eligible";
          
          boolean passed = getResults(expect, output, "getCampusHousingEligibility(4, 3.0)");
          assertTrue(passed);
      }

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

@Test
      public void testEligibleByGpaAndLowYear() throws IOException {
          Object[] args = {6, 3.6};  // Arguments for the method
          String output = getMethodOutput("getCampusHousingEligibility", args);
          String expect = "Eligible";
          
          boolean passed = getResults(expect, output, "getCampusHousingEligibility(6, 3.6)");
          assertTrue(passed);
      }
    }

Activity 1.18.2.

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

public class CampusHousing {
	public static String getCampusHousingEligibility(int schoolYear, double GPA) {
		if (schoolYear > 3 && GPA > 3.4) {
			return "Eligible";
		} else {
			return "Not eligible";
		}
	}
}

You refactored correctly!

public class CampusHousing {
	public static String getCampusHousingEligibility(int schoolYear, double GPA) {
		if (schoolYear > 3 || GPA > 3.4) {
			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 CampusHousing {
   public static String getCampusHousingEligibility(int schoolYear, double GPA)  {
      if (schoolYear <= 3 || GPA <= 3.4) {
            return "Not eligible";	
      }  
      return "Eligible";
   }
}

You refactored correctly!

public class CampusHousing {
   public static String getCampusHousingEligibility(int schoolYear, double GPA)  {
      if (schoolYear <= 3 && GPA <= 3.4) {
            return "Not eligible";	
      } else {  
            return "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.

Section 1.18 Code Refactoring

Activity 1.18.1.

Activity 1.18.2.