fix: stabilize Kotlin, Scala, and Rust runtime tests (#2415)

Author: Varadraj75

Dockerfile

@@ -17,8 +17,6 @@ ENV PATH="${PATH}:/usr/local/go/bin"
 
 # Install dotnet SDK
 RUN apt install apt-transport-https dirmngr gnupg ca-certificates -yq  \
-    && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF \
-    && echo "deb https://download.mono-project.com/repo/ubuntu stable-jammy main"| tee /etc/apt/sources.list.d/mono-official-stable.list \
     && apt update -yq  \
     && apt install mono-devel -yq
 

src/generators/rust/RustRenderer.ts

@@ -5,7 +5,6 @@ import { FormatHelpers } from '../../helpers/FormatHelpers';
 import {
   deriveCopy,
   deriveHash,
-  derivePartialEq,
   deriveEq,
   derivePartialOrd,
   deriveOrd
@@ -37,16 +36,20 @@ export abstract class RustRenderer<
   }
 
   renderMacro(model: ConstrainedMetaModel): string {
-    const derive: string[] = ['Serialize', 'Deserialize', 'Clone', 'Debug'];
+    const derive: string[] = [
+      'Serialize',
+      'Deserialize',
+      'Clone',
+      'Debug',
+      'PartialEq'
+    ];
+
     if (deriveHash(model)) {
       derive.push('Hash');
     }
     if (deriveCopy(model)) {
       derive.push('Copy');
     }
-    if (derivePartialEq(model)) {
-      derive.push('PartialEq');
-    }
     if (deriveEq(model)) {
       derive.push('Eq');
     }
@@ -56,6 +59,7 @@ export abstract class RustRenderer<
     if (deriveOrd(model)) {
       derive.push('Ord');
     }
+
     derive.sort();
     return `#[derive(${derive.join(', ')})]`;
   }

src/generators/scala/ScalaConstrainer.ts

@@ -1,5 +1,5 @@
 import { Constraints } from '../../helpers';
-import { ConstrainedEnumValueModel } from '../../models';
+import { ConstrainedEnumValueModel, ConstrainedEnumModel } from '../../models';
 import {
   defaultEnumKeyConstraints,
   defaultEnumValueConstraints
@@ -78,6 +78,9 @@ export const ScalaDefaultTypeMapping: ScalaTypeMapping = {
     return constrainedModel.name;
   },
   Reference({ constrainedModel }): string {
+    if (constrainedModel.ref instanceof ConstrainedEnumModel) {
+      return `${constrainedModel.name}.Value`;
+    }
     return constrainedModel.name;
   },
   Any(): string {

test/generators/rust/RustRenderer.spec.ts

@@ -550,13 +550,13 @@ describe('RustRenderer', () => {
       );
 
       expect(renderer.renderMacro(arrayModel)).toEqual(
-        '#[derive(Clone, Debug, Deserialize, Serialize)]'
+        '#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]'
       );
       expect(renderer.renderMacro(enumModel)).toEqual(
-        '#[derive(Clone, Debug, Deserialize, Serialize)]'
+        '#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]'
       );
       expect(renderer.renderMacro(objectModel)).toEqual(
-        '#[derive(Clone, Debug, Deserialize, Serialize)]'
+        '#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]'
       );
     });
   });

test/generators/rust/presets/__snapshots__/CommonPreset.spec.ts.snap

@@ -194,7 +194,7 @@ impl Default for CustomEnum {
 
 exports[`RUST_COMMON_PRESET Enum should render reserved union for dict array 1`] = `
 "// Class represents a Class model.
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
 pub struct Class {
     #[serde(rename=\\"students\\")]
     pub students: Vec<crate::Student>,
@@ -215,7 +215,7 @@ impl Class {
 
 exports[`RUST_COMMON_PRESET Enum should render reserved union for dict array 2`] = `
 "// Student represents a Student model.
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
 pub struct Student {
     #[serde(rename=\\"name\\")]
     pub name: String,

test/runtime/runtime-kotlin.spec.ts

@@ -1,19 +1,21 @@
 import { execCommand } from '../TestUtils/GeneralUtils';
 import path from 'path';
 
-jest.setTimeout(50000);
+jest.setTimeout(500000);
 
 test('Kotlin runtime testing', async () => {
+  const generateCommand = 'npm run generate:runtime:kotlin';
+  await execCommand(generateCommand, true);
   //The 'build' command here
   const buildCommand = `cd ${path.resolve(
     __dirname,
     './runtime-kotlin'
   )} && ./gradlew build`;
-  await execCommand(buildCommand);
+  await execCommand(buildCommand, true);
   //The 'test' command here
   const testCommand = `cd ${path.resolve(
     __dirname,
     './runtime-kotlin'
   )} && ./gradlew test`;
-  await execCommand(testCommand);
+  await execCommand(testCommand, true);
 });

test/runtime/runtime-kotlin.ts

@@ -1,4 +1,4 @@
-import { KOTLIN_DEFAULT_PRESET, KotlinFileGenerator } from '../../';
+import { KOTLIN_DEFAULT_PRESET, KotlinFileGenerator } from '../../src';
 import path from 'path';
 import input from './generic-input.json';
 

test/runtime/runtime-kotlin/build.gradle

@@ -10,4 +10,6 @@ dependencies {
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
     testImplementation("org.junit.jupiter:junit-jupiter-engine:5.9.1")
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
+    implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.14.2'
+    testImplementation 'org.hamcrest:hamcrest:2.2'
 }

test/runtime/runtime-kotlin/gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists

test/runtime/runtime-kotlin/src/test/kotlin/com/mycompany/app/generic/AddressTest.kt

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import org.hamcrest.CoreMatchers.containsString
 import org.hamcrest.CoreMatchers.not
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.BeforeEach
@@ -18,11 +19,11 @@ class AddressTest {
     fun setup() {
         address = Address(
             streetName = "Test address 2",
-            houseNumber = 2,
+            houseNumber = 2.0,
             marriage = true,
             members = 2,
             arrayType = listOf(2, "test"),
-            nestedObject = Address.NestedObject(test = "test")
+            nestedObject = NestedObject(test = "test")
         )
     }