Skip to content

Commit fd8880c

Browse files
committed
feix: Mresolved changes
1 parent 36dff74 commit fd8880c

File tree

5 files changed

+10
-99
lines changed

5 files changed

+10
-99
lines changed

lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Lunch/InvalidCalorieException.java

Lines changed: 0 additions & 7 deletions
This file was deleted.

lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Lunch/Lunch.java

Lines changed: 0 additions & 73 deletions
This file was deleted.

lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/movie/Movie.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ public Movie(
2121

2222
// getters and setters member functions
2323

24-
public String getTitle() {
24+
public String getTitle() {
2525
return title;
2626
}
2727

28-
public void setTitle(String title) {
29-
this.title = title;
28+
public String setTitle() {
29+
return "Creed 2";
3030
}
3131

3232
public int getReleaseYear() {
@@ -53,11 +53,11 @@ public MovieRating getMovieRating() {
5353
return movieRating;
5454
}
5555

56-
public String getMovieTitle() {
57-
return title;
58-
}
56+
//Conditional
57+
if MovieRating =< 4 {
58+
return "Title";
59+
}
60+
5961

60-
public String setMovieTitle() {
61-
return "Creed 2";
6262
}
6363
}

lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/movie/releaseYear.java

Lines changed: 0 additions & 8 deletions
This file was deleted.

lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/movie/MovieTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.codedifferently.lesson16.movie;
22

33
import static org.junit.jupiter.api.Assertions.assertEquals;
4-
54
import org.junit.jupiter.api.BeforeEach;
65
import org.junit.jupiter.api.Test;
76

@@ -16,7 +15,7 @@ public void setUp() {
1615
@Test
1716
void testGetMovieTitle() {
1817
// act
19-
String title = movie.getMovieTitle();
18+
String title = movie.getTitle();
2019
// assert
2120
assertEquals("Creed", title);
2221
}
@@ -25,7 +24,7 @@ void testGetMovieTitle() {
2524
void testSetMovieTitle() {
2625
// arrange
2726
// act
28-
String title = movie.setMovieTitle();
27+
String title = movie.setTitle();
2928
// assert
3029
assertEquals("Creed 2", title);
3130
}

0 commit comments

Comments
 (0)