SummerCourseSession created (Lesson 6 in progress)

app/src/main/java/com/example/paktalin/agilejava/CourseSession.java

@@ -12,7 +12,7 @@ import java.util.List;
  * Created by Paktalin on 16/05/2018.
  * Created by Paktalin on 16/05/2018.
  */
  */
 
 
-class CourseSession implements Comparable<CourseSession>{
+public class CourseSession implements Comparable<CourseSession>{
     private String department;
     private String department;
     private String number;
     private String number;
     private List<Student> students = new ArrayList<>();
     private List<Student> students = new ArrayList<>();
@@ -20,7 +20,7 @@ class CourseSession implements Comparable<CourseSession>{
     private static int count = 0;
     private static int count = 0;
     private int numberOfCredits;
     private int numberOfCredits;
 
 
-    private CourseSession(String department, String number, Date startDate) {
+    protected CourseSession(String department, String number, Date startDate) {
         this.department = department;
         this.department = department;
         this.number = number;
         this.number = number;
         this.startDate = startDate;
         this.startDate = startDate;
@@ -55,22 +55,24 @@ class CourseSession implements Comparable<CourseSession>{
         return students.size();
         return students.size();
     }
     }
 
 
-    Date getEndDate() {
+    public Date getEndDate() {
         GregorianCalendar calendar = new GregorianCalendar();
         GregorianCalendar calendar = new GregorianCalendar();
-        calendar.setTime(startDate);
-        calendar.add(Calendar.DAY_OF_YEAR, getNumberOfDays());
+        calendar.setTime(getStartDate());
+        calendar.add(Calendar.DAY_OF_YEAR, getNumberOfDaysInSession());
         return calendar.getTime();
         return calendar.getTime();
     }
     }
 
 
-    Date getStartDate() {
+    protected Date getStartDate() {
         return startDate;
         return startDate;
     }
     }
+    protected int getSessionLength() {
+        return 16;
+    }
 
 
-    private  int getNumberOfDays() {
-        final int sessionLength = 16;
+    protected int getNumberOfDaysInSession() {
         final int daysInWeek = 7;
         final int daysInWeek = 7;
         final int daysFromFridayToMonday = 3;
         final int daysFromFridayToMonday = 3;
-        return sessionLength * daysInWeek - daysFromFridayToMonday;
+        return getSessionLength() * daysInWeek - daysFromFridayToMonday;
     }
     }
 
 
     List<Student> getAllStudents() {
     List<Student> getAllStudents() {

app/src/main/java/com/example/paktalin/agilejava/DateUtil.java

@@ -8,7 +8,7 @@ import java.util.GregorianCalendar;
  * Created by Paktalin on 17/05/2018.
  * Created by Paktalin on 17/05/2018.
  */
  */
 
 
-class DateUtil {
+public class DateUtil {
 
 
     //That's how static initialization block works
     //That's how static initialization block works
     static {
     static {
@@ -20,7 +20,7 @@ class DateUtil {
 
 
     private DateUtil() {}
     private DateUtil() {}
 
 
-    static Date createDate(int year, int month, int date) {
+    public static Date createDate(int year, int month, int date) {
         GregorianCalendar calendar = new GregorianCalendar();
         GregorianCalendar calendar = new GregorianCalendar();
         calendar.clear();
         calendar.clear();
         calendar.set(Calendar.YEAR, year);
         calendar.set(Calendar.YEAR, year);

app/src/main/java/com/example/paktalin/agilejava/summer/SummerCourseSession.java

+package com.example.paktalin.agilejava.summer;
+
+import com.example.paktalin.agilejava.CourseSession;
+
+import java.util.Date;
+
+/**
+ * Created by Paktalin on 28/05/2018.
+ */
+
+public class SummerCourseSession extends CourseSession {
+
+    static SummerCourseSession create(String department, String number, Date startDate) {
+        return new SummerCourseSession(department, number, startDate);
+    }
+
+    private SummerCourseSession(String department, String number, Date startDate) {
+        super(department, number, startDate);
+    }
+
+    @Override
+    protected int getSessionLength() {
+        return 8;
+    }
+}

app/src/test/java/com/example/paktalin/agilejava/AllTests.java

 package com.example.paktalin.agilejava;
 package com.example.paktalin.agilejava;
 
 
+import com.example.paktalin.agilejava.language_tests.LanguageTests;
+import com.example.paktalin.agilejava.language_tests.SuperClassTest;
+
 import junit.framework.TestSuite;
 import junit.framework.TestSuite;
 
 
 /**
 /**
@@ -19,6 +22,7 @@ public class AllTests extends TestSuite {
         suite.addTestSuite(ReportCardTest.class);
         suite.addTestSuite(ReportCardTest.class);
         suite.addTestSuite(BasicGradingStrategyTest.class);
         suite.addTestSuite(BasicGradingStrategyTest.class);
         suite.addTestSuite(HonorsGradingStrategyTest.class);
         suite.addTestSuite(HonorsGradingStrategyTest.class);
+        suite.addTestSuite(SuperClassTest.class);
         return suite;
         return suite;
     }
     }
 }
 }

app/src/test/java/com/example/paktalin/agilejava/LanguageTests.java → app/src/test/java/com/example/paktalin/agilejava/language_tests/LanguageTests.java

-package com.example.paktalin.agilejava;
+package com.example.paktalin.agilejava.language_tests;
 
 
 import junit.framework.TestCase;
 import junit.framework.TestCase;
 
 

app/src/test/java/com/example/paktalin/agilejava/language_tests/SuperClassTest.java

+package com.example.paktalin.agilejava.language_tests;
+
+import junit.framework.TestCase;
+
+/**
+ * Created by Paktalin on 28/05/2018.
+ */
+
+public class SuperClassTest extends TestCase {
+    public void testConstructorCalls() {
+        SuperClass superClass = new SubClass("parm");
+        assertTrue(superClass.constructorWasCalled);
+    }
+
+    class SuperClass {
+        boolean constructorWasCalled = false;
+
+        SuperClass(String parm) {
+            constructorWasCalled = true;
+        }
+    }
+
+    class SubClass extends SuperClass {
+        SubClass(String parm) {
+            super(parm);
+        }
+    }
+}

app/src/test/java/com/example/paktalin/agilejava/summer/SummerCourseSessionTest.java

+package com.example.paktalin.agilejava.summer;
+
+import com.example.paktalin.agilejava.CourseSession;
+import com.example.paktalin.agilejava.DateUtil;
+
+import junit.framework.TestCase;
+
+import java.util.Date;
+
+/**
+ * Created by Paktalin on 28/05/2018.
+ */
+
+public class SummerCourseSessionTest extends TestCase {
+
+    public void testEndDate() {
+        Date startDate = DateUtil.createDate(2003, 6, 9);
+        CourseSession session = SummerCourseSession.create("ENGL", "200", startDate);
+        Date eightWeeksOut = DateUtil.createDate(2003, 8, 1);
+        assertEquals(eightWeeksOut, session.getEndDate());
+    }
+
+}