Merge pull request #101 from SokaDance/mockvalue

[gen][ts] object mock values defines eClass and eStaticClass methods

Author: SokaDance

Dockerfile-ts

@@ -6,12 +6,12 @@ INCLUDE+ Dockerfile-base
 FROM openjdk:16-alpine AS jvm
 COPY --from=build /home/soft.gen/out/soft.generator.ts/*.jar /soft.generator.ts/
 WORKDIR /soft.generator.ts
-RUN jdeps --print-module-deps --multi-release 16 --ignore-missing-deps --class-path '*' -recursive soft.generator.ts-1.5.2.jar > java.modules \
+RUN jdeps --print-module-deps --multi-release 16 --ignore-missing-deps --class-path '*' -recursive soft.generator.ts-1.5.3.jar > java.modules \
  && jlink --strip-java-debug-attributes --add-modules $(cat java.modules) --output /java-generator
 
 # Build result stage
 FROM alpine
 COPY --from=build /home/soft.gen/out/soft.generator.ts/*.jar /usr/share/soft.generator.ts/
 COPY --from=jvm /java-generator /usr/lib/jvm/java-generator
 
-ENTRYPOINT ["/usr/lib/jvm/java-generator/bin/java","-jar","/usr/share/soft.generator.ts/soft.generator.ts-1.5.2.jar"]
+ENTRYPOINT ["/usr/lib/jvm/java-generator/bin/java","-jar","/usr/share/soft.generator.ts/soft.generator.ts-1.5.3.jar"]

Makefile

@@ -4,7 +4,7 @@ soft.generators.version := 1.6.0
 soft.generator.common.version := 1.4.1
 soft.generator.cpp.version := 1.2.4
 soft.generator.go.version := 1.9.2
-soft.generator.ts.version := 1.5.2
+soft.generator.ts.version := 1.5.3
 
 export DOCKER_BUILDKIT=1
 

soft.generators/soft.generator.ts/META-INF/MANIFEST.MF

@@ -4,7 +4,7 @@ Created-By: 13.0.2+8 (Oracle Corporation)
 Bundle-ManifestVersion: 2
 Bundle-Name: Soft Generator TypeScript
 Bundle-SymbolicName: soft.generator.ts
-Bundle-Version: 1.5.2
+Bundle-Version: 1.5.3
 Export-Package: soft.generator.ts,
  soft.generator.ts.lib,
  soft.generator.ts.lib.factory,

soft.generators/soft.generator.ts/pom.xml

@@ -8,7 +8,7 @@
       <version>1.6.0</version>
    </parent>
    <artifactId>soft.generator.ts</artifactId>
-   <version>1.5.2</version>
+   <version>1.5.3</version>
    <dependencies>
       <dependency>
          <groupId>soft.generators</groupId>

soft.generators/soft.generator.ts/src/soft/generator/ts/tests/generateImplementationTests.mtl

@@ -265,6 +265,8 @@ test("set[aStructuralFeature.name.toUpperFirst()/]", () => {
 	o.eAdapters().add(adapter)
 
 	// set value
+	when(mockValue.eClass()).thenReturn(null)
+	when(mockValue.eStaticClass()).thenReturn(null)
 	when(mockValue.eInverseAdd(o,[reverseClass.getImportedIDName(reverseFeature,modules)/],null)).thenReturn(null)
 	when(mockValue.eResource()).thenReturn(resource)
 	o.[aStructuralFeature.generateSetCall('value')/]
@@ -288,6 +290,10 @@ test("set[aStructuralFeature.name.toUpperFirst()/]", () => {
 	reset(mockAdapter)
 	reset(mockValue)
 	reset(mockResource)	
+	when(mockValue.eClass()).thenReturn(null)
+	when(mockValue.eStaticClass()).thenReturn(null)
+	when(mockOther.eClass()).thenReturn(null)
+	when(mockOther.eStaticClass()).thenReturn(null)
 	when(mockValue.eInverseRemove(o,[reverseClass.getImportedIDName(reverseFeature,modules)/],null)).thenReturn(null)
 	when(mockValue.eResource()).thenReturn(resource)
 	when(mockOther.eInverseAdd(o,[reverseClass.getImportedIDName(reverseFeature,modules)/],null)).thenReturn(null)
@@ -323,6 +329,8 @@ test("set[aStructuralFeature.name.toUpperFirst()/]", () => {
 
 	// first value
 	[aStructuralFeature.eType.generateTestValue('value',modules)/]
+	when(mockValue.eClass()).thenReturn(null)
+	when(mockValue.eStaticClass()).thenReturn(null)
 	when(mockValue.eInverseAdd(o,[reverseClass.getImportedIDName(reverseFeature,modules)/],null)).thenReturn(null)
 	o.[aStructuralFeature.generateSetCall('value')/]
 	verify(mockAdapter.notifyChanged(anything())).once() 
@@ -337,6 +345,10 @@ test("set[aStructuralFeature.name.toUpperFirst()/]", () => {
 	[aStructuralFeature.eType.generateTestValue('other',modules)/]
 	reset(mockAdapter)
 	reset(mockValue)
+	when(mockOther.eClass()).thenReturn(null)
+	when(mockOther.eStaticClass()).thenReturn(null)
+	when(mockValue.eClass()).thenReturn(null)
+	when(mockValue.eStaticClass()).thenReturn(null)
 	when(mockValue.eInverseRemove(o,[reverseClass.getImportedIDName(reverseFeature,modules)/],null)).thenReturn(null)
 	when(mockOther.eInverseAdd(o,[reverseClass.getImportedIDName(reverseFeature,modules)/],null)).thenReturn(null)
 	o.[aStructuralFeature.generateSetCall('other')/]
@@ -583,6 +595,8 @@ expect(() => o.eSetFromID([aClass.getImportedIDName(anStructuralFeature,modules)
 [let reverseFeature : EStructuralFeature = anStructuralFeature.oclAsType(EReference).eOpposite]
 [let reverseClass : EClass = reverseFeature.eContainingClass]
 	[anStructuralFeature.eType.generateTestValue('value',modules)/]
+ 	when(mockValue.eClass()).thenReturn(null)
+    when(mockValue.eStaticClass()).thenReturn(null)
 	when(mockValue.eIsProxy()).thenReturn(false)
 	when(mockValue.eResource()).thenReturn(null)
 	when(mockValue.eInverseAdd(o,[reverseClass.getImportedIDName(reverseFeature,modules)/],null)).thenReturn(null)
@@ -652,6 +666,8 @@ expect(() => o.eSetFromID([aClass.getImportedIDName(anStructuralFeature,modules)
 [/template]
 
 [template private generateFeatureMockAddedExpectations(anStructuralFeature : EStructuralFeature , mockName : String , aClass : EClass, modules : OclAny)]
+when([mockName/].eClass()).thenReturn(null)
+when([mockName/].eStaticClass()).thenReturn(null)
 [if anStructuralFeature.isContains()]
 	[let anEReference : EReference = anStructuralFeature.oclAsType(EReference)]
 	[if anEReference.eOpposite.oclIsUndefined()]
@@ -680,6 +696,8 @@ when([mockName/].eInverseAdd(o,[reverseClass.getImportedIDName(reverseFeature,mo
 
 
 [template private generateFeatureMockAddedVerifications(anStructuralFeature : EStructuralFeature , mockName : String , aClass : EClass, modules : OclAny)]
+when([mockName/].eClass()).thenReturn(null)
+when([mockName/].eStaticClass()).thenReturn(null)
 [if anStructuralFeature.isContains()]
 	[let anEReference : EReference = anStructuralFeature.oclAsType(EReference)]
 	[if anEReference.eOpposite.oclIsUndefined()]
@@ -722,6 +740,8 @@ verify([mockName/].eInverseAdd(o,[reverseClass.getImportedIDName(reverseFeature,
 [let reverseFeature : EStructuralFeature = anStructuralFeature.oclAsType(EReference).eOpposite]
 [let reverseClass : EClass = reverseFeature.eContainingClass]
 	[anStructuralFeature.eType.generateTestValue('value',modules)/]
+	when(mockValue.eClass()).thenReturn(null)
+    when(mockValue.eStaticClass()).thenReturn(null)
 	when(mockValue.eInverseAdd(o,[reverseClass.getImportedIDName(reverseFeature,modules)/],null)).thenReturn(null)	
 	o.eSetFromID([aClass.getImportedIDName(anStructuralFeature,modules)/], value)
 	expect(o.eGetFromID([aClass.getImportedIDName(anStructuralFeature,modules)/], false)).toBe(value)
@@ -735,6 +755,8 @@ verify([mockName/].eInverseAdd(o,[reverseClass.getImportedIDName(reverseFeature,
 [template private generateFeatureESetFromIDTestImplementation(anStructuralFeature : EStructuralFeature ,aClass : EClass, modules : OclAny) ? (isContains())]
 {
 	[anStructuralFeature.eType.generateTestValue('value',modules)/]
+	when(mockValue.eClass()).thenReturn(null)
+    when(mockValue.eStaticClass()).thenReturn(null)
 	when(mockValue.eInverseAdd(o,[if not aClass.ePackage.isEcorePackage()]ecore.[/if]EOPPOSITE_FEATURE_BASE - [aClass.getImportedIDName(anStructuralFeature,modules)/],anything())).thenReturn(null)
 	o.eSetFromID([aClass.getImportedIDName(anStructuralFeature,modules)/], value)
 	expect(o.eGetFromID([aClass.getImportedIDName(anStructuralFeature,modules)/], false)).toBe(value)
@@ -862,6 +884,8 @@ test("eBasicInverseAdd", () => {
 [template private generateFeatureEInverseAddTestImplementation( aStructuralFeature : EStructuralFeature, aClass : EClass , modules : OclAny) ?(isContainer())]
 {
 	[aStructuralFeature.eType.generateTestValue('value',modules)/]
+	when(mockValue.eClass()).thenReturn(null)
+	when(mockValue.eStaticClass()).thenReturn(null)
 	when(mockValue.eResource()).thenReturn(null)
 	when(mockValue.eIsProxy()).thenReturn(false)
 	o.eBasicInverseAdd(value,[aClass.getImportedIDName(aStructuralFeature,modules)/],null)
@@ -888,6 +912,8 @@ test("eBasicInverseAdd", () => {
 [template private generateFeatureEInverseAddTestImplementation( aStructuralFeature : EStructuralFeature, aClass : EClass , modules : OclAny)]
 {
 	[aStructuralFeature.eType.generateTestValue('value',modules)/]
+	when(mockValue.eClass()).thenReturn(null)
+	when(mockValue.eStaticClass()).thenReturn(null)
 [if aStructuralFeature.isProxy()]
 	when(mockValue.eIsProxy()).thenReturn(false)
 [/if]