fix: 🐛 fixed issues in test generation (#138)

* fix: 🐛 fixed issues in test generation

* fix: 🐛 fixed issues in api test generation

Author: WasiqB

package.json

@@ -50,7 +50,7 @@
     "@tsconfig/node18": "^18.2.4",
     "@types/figlet": "^1.5.8",
     "@types/gradient-string": "^1.1.6",
-    "@types/node": "^22.5.4",
+    "@types/node": "^22.5.5",
     "@types/yargs": "^17.0.33",
     "@typescript-eslint/eslint-plugin": "^8.5.0",
     "@typescript-eslint/parser": "^8.5.0",

pnpm-lock.yaml

@@ -6,8 +6,9 @@ export const BookingRequestData = {
   folder: '/api/data',
   content: `package {{ groupId }}.api.data;
 
-import java.text.SimpleDateFormat;
-import java.util.concurrent.TimeUnit;
+import static java.time.ZoneId.systemDefault;
+import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE;
+import static java.util.concurrent.TimeUnit.DAYS;
 
 import {{ groupId }}.api.pojo.BookingData;
 import {{ groupId }}.api.pojo.BookingDates;
@@ -17,7 +18,7 @@ public final class BookingRequestData {
     private static final Faker FAKER = new Faker ();
 
     public static BookingData getBookingData () {
-        final var formatter = new SimpleDateFormat ("yyyy-MM-dd");
+        final var formatter = ISO_LOCAL_DATE.withZone (systemDefault ());
         return BookingData.builder ()
             .firstname (FAKER.name ()
                 .firstName ())
@@ -27,10 +28,10 @@ public final class BookingRequestData {
                 .numberBetween (1, 2000))
             .depositpaid (true)
             .bookingdates (BookingDates.builder ()
-                .checkin (formatter.format (FAKER.date ()
-                    .past (20, TimeUnit.DAYS)))
-                .checkout (formatter.format (FAKER.date ()
-                    .future (5, TimeUnit.DAYS)))
+                .checkin (formatter.format (FAKER.timeAndDate ()
+                    .past (20, DAYS)))
+                .checkout (formatter.format (FAKER.timeAndDate ()
+                    .future (5, DAYS)))
                 .build ())
             .additionalneeds ("Breakfast")
             .build ();

src/templates/api/data/booking-request-data.ts

@@ -2,7 +2,7 @@ import { TemplateFile } from '../../../types/types.js';
 
 export const BookingDataPojo = {
   fileName: 'BookingData.java',
-  folder: '/api/data/',
+  folder: '/api/pojo/',
   test: true,
   content: `package {{ groupId }}.api.pojo;
 

src/templates/api/pojo/booking-data.ts

@@ -2,7 +2,7 @@ import { TemplateFile } from '../../../types/types.js';
 
 export const BookingRequest = {
   fileName: 'BookingRequest.java',
-  folder: '/api/request/',
+  folder: '/api/requests/',
   test: true,
   content: `package {{ groupId }}.api.requests;
 
@@ -16,11 +16,8 @@ import static io.github.boykaframework.enums.RequestMethod.POST;
 import static io.github.boykaframework.enums.RequestMethod.PUT;
 import static java.text.MessageFormat.format;
 
-import {{ groupId }}.api.data.AuthRequestData;
 import {{ groupId }}.api.pojo.BookingData;
-import io.github.boykaframework.actions.api.ApiActions;
 import io.github.boykaframework.builders.ApiRequest;
-import io.github.boykaframework.enums.RequestMethod;
 import lombok.experimental.UtilityClass;
 
 @UtilityClass

src/templates/api/pojo/booking-test-data.ts

@@ -7,7 +7,8 @@ export const DragDropPage = {
   content: `package {{ groupId }}.mobile.pages;
 
 import static io.appium.java_client.AppiumBy.accessibilityId;
-import static io.appium.java_client.AppiumBy.androidUIAutomator;
+import static {% if platform == "Android" %}io.appium.java_client.AppiumBy.androidUIAutomator;
+{% else %}io.appium.java_client.AppiumBy.iOSNsPredicateString;{% endif %}
 import static java.text.MessageFormat.format;
 
 import io.github.boykaframework.builders.Locator;
@@ -45,15 +46,15 @@ public class DragDropPage {
         .{{ platform | downcase }} (
         {% if platform == "Android" %}androidUIAutomator (
         "new UiSelector().textStartsWith(\\"You made it\\")"{% else %}iOSNsPredicateString (
-        "label BEGINSWITH \\"You made it\\""){% endif %}))
+        "label BEGINSWITH \\"You made it\\""{% endif %}))
         .parent (this.screen)
         .name ("Description")
         .build ();
     private final Locator title       = Locator.buildLocator ()
         .{{ platform | downcase }} (
         {% if platform == "Android" %}androidUIAutomator (
         "new UiSelector().text(\\"Congratulations\\")"{% else %}iOSNsPredicateString (
-        "label == \\"Congratulations\\""){% endif %}))
+        "label == \\"Congratulations\\""{% endif %}))
         .parent (this.screen)
         .name ("Title")
         .build ();
@@ -73,6 +74,10 @@ public class DragDropPage {
                 accessibilityId (format ("drop-{0}{1}", direction.getInitial (), index)))
             .build ();
     }
+
+    private DragDropPage () {
+        // Utility class.
+    }
 }
 `,
 } satisfies TemplateFile;

src/templates/api/requests/booking-request.ts

@@ -4,7 +4,6 @@ import { BookingRequestData } from './api/data/booking-request-data.js';
 import { AuthTokenPojo } from './api/pojo/auth-token.js';
 import { BookingDataPojo } from './api/pojo/booking-data.js';
 import { BookingDatesPojo } from './api/pojo/booking-dates.js';
-import { BookingTestDataPojo } from './api/pojo/booking-test-data.js';
 import { BookingRequest } from './api/requests/booking-request.js';
 import { GitIgnore } from './gitignore.js';
 import { DragDropAction } from './mobile/actions/drag-drop-action.js';
@@ -31,7 +30,6 @@ export const templates = {
       AuthTokenPojo,
       BookingDataPojo,
       BookingDatesPojo,
-      BookingTestDataPojo,
       BookingRequest,
     ],
     mobile: [DragDropPage, DragDropAction, WdioHomePage, WdioTest, MobileTestSuite],