Commit 47a68762 authored by Martti Käärik's avatar Martti Käärik
Browse files

Clarified method names

parent 4f22d8e7

plugins/org.etsi.mts.tdl.execution.java.codegen/src/org/etsi/mts/tdl/execution/java/codegen/JUnitTestGenerator.java

+18 −25
Original line number Diff line number Diff line
@@ -275,14 +275,19 @@ public class JUnitTestGenerator extends Renderer { 
		return this.settings.unmappedData;

	}



	@Override

	protected String getElementName(Element e) {

		if (isUnmapped()) {

			if (e instanceof DataType) {

	/**

	 * The Java type corresponding to a TDL data type: in unmapped mode always

	 * ValueImpl otherwise the mapped Java class, java.util.List of the item type

	 * for collections, long for time.

	 */

	private String getJavaType(DataType type) {

		if (isUnmapped())

			return CORE_PACKAGE + ".ValueImpl";

			}

		}

		return super.getElementName(e);

		if (type instanceof CollectionDataType)

			return "java.util.List<" + getJavaType(((CollectionDataType) type).getItemType()) + ">";

		if (type instanceof Time)

			return "long";

		return getElementName(type);

	}



	private boolean hasAnnotation(Element e, String keyName) {
@@ -375,7 +380,7 @@ public class JUnitTestGenerator extends Renderer { 
	private void writeComponentType(TestConfiguration tc, ComponentType ct, String className) {



		ct.getVariable().forEach(v -> {

			append("public " + getElementName(v.getDataType()) + " " + getElementName(v));

			append("public " + getJavaType(v.getDataType()) + " " + getElementName(v));

			if (isUnmapped()) {

				append(" = new ");

				append(CORE_PACKAGE + ".ValueImpl");
@@ -1631,7 +1636,7 @@ public class JUnitTestGenerator extends Renderer { 
					Variable var = va.getVariable();

					append(COMPONENT_FIELD + "." + getElementName(var));

					append(" = ");

					append("(" + getElementName(var.getDataType()) + ")");

					append("(" + getJavaType(var.getDataType()) + ")");

					line("result.data.getValue();");

				}

			}
@@ -2105,20 +2110,8 @@ public class JUnitTestGenerator extends Renderer { 
			} else if (type instanceof Time || isTime)

				line("long " + varName + ";");



			else if (type instanceof CollectionDataType) {

				if (isUnmapped()) {

					line(CORE_PACKAGE + ".ValueImpl" + " " + varName + ";");

				} else {

					line("java.util.List<" + getElementName(((CollectionDataType) type).getItemType()) + "> " + varName

							+ ";");

				}

			} else {

				if (isUnmapped()) {

					line(CORE_PACKAGE + ".ValueImpl" + " " + varName + ";");

				} else {

					line(getElementName(type) + " " + varName + ";");

				}

			}

			else

				line(getJavaType(type) + " " + varName + ";");



			if (needsTemplate(d))

				line("TemplateImpl " + varName + TEMPLATE_VARIABLE_SUFFIX + ";");
@@ -2505,7 +2498,7 @@ public class JUnitTestGenerator extends Renderer { 
	private String javaDefaultLiteral(DataType type) {

		if (type == null || isUnmapped())

			return "null";

		String javaType = getElementName(type);

		String javaType = getJavaType(type);

		if (javaType == null)

			return "null";

		switch (javaType) {