Skip to content

Commit 43f1df5

Browse files
committed
Me and Ollama friends again
1 parent c100e3e commit 43f1df5

File tree

2 files changed

+24
-11
lines changed

2 files changed

+24
-11
lines changed

cg/CodeGenerator/CodeGenerator/src/main/java/pn/cg/util/StringUtil.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,6 @@ public static List<String> GetListOfClassNamesInSuperAppGeneration(String input)
239239
for (String className : classNamesArr) {
240240
if (!className.equals("\n")) {
241241

242-
243242
if (className.contains(" ")) {
244243

245244
className = className.trim();
@@ -251,9 +250,11 @@ public static List<String> GetListOfClassNamesInSuperAppGeneration(String input)
251250
if (Character.isDigit(className.codePointAt(0))) {
252251
className = className.
253252
replaceFirst(String.valueOf(className.codePointAt(0)), "");
253+
254254
}
255+
255256
}
256-
tmpClassNames.add(className);
257+
tmpClassNames.add(className.trim());
257258
}
258259
}
259260

cg/CodeGenerator/CodeGenerator/src/test/java/pn/cg/util/StringUtilTest.java

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ public void RemoveExtraStartDelimitersInResponseTest() {
140140
"@END_HERE\n";
141141

142142

143-
144143
//
145144
final String JAVA_CODE_WITH_EXTRA_DELIMITERS = "@START_HERE \\n" + //
146145
"\"import java.awt.*;\n" + //
@@ -318,27 +317,40 @@ public void AppendWithCorrectNumberOfBraceBucketsAtEndOfTheString() {
318317
}
319318

320319
@Test
321-
public void ConvertStringWithClassNamesIntoAListTest(){
320+
public void ConvertStringWithClassNamesIntoAListTest() {
322321

323-
final String text ="Jframe\nAccount\nMain";
324-
final int expected=3;
322+
final String text = "Jframe\nAccount\nMain";
323+
final int expected = 3;
325324
final int actual = StringUtil.GetListOfClassNamesInSuperAppGeneration(text).size();
326325

327-
Assertions.assertEquals(expected,actual);
326+
Assertions.assertEquals(expected, actual);
328327
}
329328

330329
@Test
331-
public void GetListOfClassNamesInSuperAppGenerationTest(){
330+
public void GetListOfClassNamesInSuperAppGenerationTest() {
331+
332+
final String TEST_INPUT = "Here are the class names for your application:\n\nQuestionClass\nAnswerClass\nUserClass\nQuestionServiceClass\nAnswerServiceClass\nUserServiceClass\nMainClass";
332333

333-
final String TEST_INPUT="Here are the class names for your application:\n\nQuestionClass\nAnswerClass\nUserClass\nQuestionServiceClass\nAnswerServiceClass\nUserServiceClass\nMainClass";
334+
final String PERFECT_RESPONSE_FROM_AI_MODEL = "\nQuestionClass\nAnswerClass\nUserClass\nQuestionServiceClass\nAnswerServiceClass\nUserServiceClass\nMainClass";
335+
336+
337+
final List<String> EXPECTED = Arrays.stream(PERFECT_RESPONSE_FROM_AI_MODEL.split("\n")).toList();
338+
final List<String> ACTUAL = StringUtil.GetListOfClassNamesInSuperAppGeneration(TEST_INPUT);
339+
340+
Assertions.assertEquals(EXPECTED, ACTUAL);
341+
}
342+
343+
@Test
344+
public void GetListOfClassNamesInSuperAppGenerationTest2() {
334345

335-
final String PERFECT_RESPONSE_FROM_AI_MODEL="\nQuestionClass\nAnswerClass\nUserClass\nQuestionServiceClass\nAnswerServiceClass\nUserServiceClass\nMainClass";
346+
final String TEST_INPUT = "1. PackageScanner\n2. SecurityAnalyzer\n3. VulnerabilityChecker\n4. ReportGenerator\n5. UserInterface\n6. ApplicationManager\n7. Main";
347+
final String PERFECT_RESPONSE_FROM_AI_MODEL = "PackageScanner\nSecurityAnalyzer\nVulnerabilityChecker\nReportGenerator\nUserInterface\nApplicationManager\nMain";
336348

337349

338350
final List<String> EXPECTED = Arrays.stream(PERFECT_RESPONSE_FROM_AI_MODEL.split("\n")).toList();
339351
final List<String> ACTUAL = StringUtil.GetListOfClassNamesInSuperAppGeneration(TEST_INPUT);
340352

341-
Assertions.assertEquals(EXPECTED,ACTUAL);
353+
Assertions.assertEquals(EXPECTED, ACTUAL);
342354
}
343355

344356
}

0 commit comments

Comments
 (0)