Skip to content

Commit ca0f14c

Browse files
committed
chore:update
1 parent 262b4cf commit ca0f14c

File tree

3 files changed

+50
-23
lines changed

3 files changed

+50
-23
lines changed

lesson_02/quiz_java/app/build.gradle.kts

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,40 +4,52 @@
44
* This generated file contains a sample Java application project to get you started.
55
* For more details on building Java & JVM projects, please refer to https://docs.gradle.org/9.0.0/userguide/building_java_projects.html in the Gradle documentation.
66
*/
7+
78
plugins {
89
java
910
id("org.springframework.boot") version "3.1.0"
1011
id("io.spring.dependency-management") version "1.1.0"
1112
application
1213
}
13-
14-
15-
java {
16-
toolchain {
17-
languageVersion.set(JavaLanguageVersion.of(21))
18-
}
19-
}
20-
2114
repositories {
15+
// Use Maven Central for resolving dependencies.
2216
mavenCentral()
17+
flatDir {
18+
dirs("../../../lib/java/codedifferently-instructional")
19+
}
2320
}
2421

25-
dependencies {
22+
23+
// Instead of this (which doesn't work):
24+
// implementation("com.codedifferently.instructional:instructional-lib")
25+
26+
// Use direct file reference:
27+
dependencies {
2628
implementation("org.apache.commons:commons-text:1.10.0")
2729
implementation(project(":instructional-lib"))
2830
implementation("org.springframework.boot:spring-boot-starter")
2931
testImplementation("org.springframework.boot:spring-boot-starter-test")
3032

31-
}
3233

34+
}
3335

36+
// Apply a specific Java toolchain to ease working on different environments.
37+
java {
38+
toolchain {
39+
languageVersion = JavaLanguageVersion.of(21)
40+
}
41+
}
3442

3543
application {
36-
// Define the main class for the application.
37-
mainClass.set("org.example.Lesson2")
44+
// Define the main class for the application.
45+
mainClass.set("org.example.Lesson2")
3846
}
3947

4048
tasks.named<Test>("test") {
4149
// Use JUnit Platform for unit tests.
4250
useJUnitPlatform()
51+
}
52+
53+
tasks.withType<JavaCompile> {
54+
options.encoding = "UTF-8"
4355
}

lesson_02/quiz_java/app/src/main/java/org/example/lesson2.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
1+
package org.example;
2+
3+
14
import java.util.ArrayList;
2-
import java.util.HashMap;
35
import java.util.Map;
46

7+
import org.springframework.boot.autoconfigure.SpringBootApplication;
8+
59
import com.codedifferently.instructional.quiz.AnswerChoice;
610
import com.codedifferently.instructional.quiz.MultipleChoiceQuizQuestion;
711
import com.codedifferently.instructional.quiz.QuizPrinter;
812
import com.codedifferently.instructional.quiz.QuizQuestion;
913

14+
@SpringBootApplication
1015
public class lesson2 {
1116

1217
public static ArrayList<QuizQuestion> makeQuizQuestions() {

lesson_02/quiz_java/app/src/test/java/org/example/lesson2test.java

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,24 @@
1-
import static org.junit.jupiter.api.Assertions.*;
2-
import org.junit.jupiter.api.BeforeEach;
3-
import org.junit.jupiter.api.Test;
1+
package org.example;
2+
43

5-
import java.nio.file.Path;
6-
import java.nio.file.Paths;
7-
import java.util.*;
8-
import java.util.stream.Collectors;
4+
import java.util.Arrays;
5+
import java.util.HashSet;
6+
import java.util.Set;
7+
8+
import static org.junit.jupiter.api.Assertions.assertEquals;
9+
import static org.junit.jupiter.api.Assertions.assertNotEquals;
10+
import static org.junit.jupiter.api.Assertions.assertTrue;
11+
import org.junit.jupiter.api.BeforeEach;
12+
import org.springframework.beans.factory.annotation.Autowired;
13+
import org.springframework.boot.test.context.SpringBootTest;
14+
import org.springframework.context.annotation.Bean;
915

16+
import com.codedifferently.instructional.quiz.AnswerChoice;
17+
import com.codedifferently.instructional.quiz.QuizConfig;
18+
import com.codedifferently.instructional.quiz.QuizQuestion;
1019

1120

21+
@SpringBootTest
1222
public class lesson2test {
1323

1424
private static final int EXPECTED_NUMBER_OF_QUESTIONS = 11;
@@ -30,7 +40,7 @@ private void getQuestions() {
3040
quizQuestions.sort(Comparator.comparingInt(QuizQuestion::getQuestionNumber));
3141
}
3242

33-
@Test
43+
@Bean
3444
public void checkQuizQuestions_areAssembledCorrectly() {
3545
// Expect the right number of questions
3646
assertEquals(EXPECTED_NUMBER_OF_QUESTIONS, quizQuestions.size());
@@ -41,7 +51,7 @@ public void checkQuizQuestions_areAssembledCorrectly() {
4151
}
4252
}
4353

44-
@Test
54+
@Bean
4555
public void checkQuizQuestions_promptsAreUnique() {
4656
Set<String> questionPrompts = quizQuestions.stream()
4757
.map(QuizQuestion::getQuestionPrompt)
@@ -50,7 +60,7 @@ public void checkQuizQuestions_promptsAreUnique() {
5060
assertEquals(EXPECTED_NUMBER_OF_QUESTIONS, questionPrompts.size());
5161
}
5262

53-
@Test
63+
@Bean
5464
public void checkQuestions_answeredCorrectly() throws Exception {
5565
assertEquals(quizConfig.size("default"), quizQuestions.size());
5666

0 commit comments

Comments
 (0)