Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoremerks2010-09-07 20:28:56 +0000
committeremerks2010-09-07 20:28:56 +0000
commitc830866e2bd6a7761e945a8da3ed4244502844ae (patch)
treec51f9ed0b97a25b400871fde133e646a069ce696
parent41db0bfe9eafb986aae712f1e451ddc8e7a8f53f (diff)
downloadorg.eclipse.emf-R2_6_maintenance.tar.gz
org.eclipse.emf-R2_6_maintenance.tar.xz
org.eclipse.emf-R2_6_maintenance.zip
[320002] Ensure that operation test methods are uniquely named.R2_6_maintenance
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/templates/model/tests/TestCase.java3
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/templates/model.tests/TestCase.javajet2
2 files changed, 2 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/templates/model/tests/TestCase.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/templates/model/tests/TestCase.java
index 94375f20a..959514aae 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/templates/model/tests/TestCase.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/templates/model/tests/TestCase.java
@@ -446,8 +446,7 @@ public class TestCase
if (genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50) { //TestCase/genOperation.annotations.insert.javajetinc
}
stringBuffer.append(TEXT_122);
- stringBuffer.append(genModel.capName(genOperation.getName()));
- stringBuffer.append(genOperation.getGenParameters().size() == 0 ? "" : "__" + genOperation.getParameterTypes("_", false));
+ stringBuffer.append(genClass.getUniqueName(genOperation));
stringBuffer.append(TEXT_123);
stringBuffer.append(TEXT_124);
//TestCase/implementedGenOperation.todo.override.javajetinc
diff --git a/plugins/org.eclipse.emf.codegen.ecore/templates/model.tests/TestCase.javajet b/plugins/org.eclipse.emf.codegen.ecore/templates/model.tests/TestCase.javajet
index e709f112c..bcd2c461a 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/templates/model.tests/TestCase.javajet
+++ b/plugins/org.eclipse.emf.codegen.ecore/templates/model.tests/TestCase.javajet
@@ -300,7 +300,7 @@ public<%if (genClass.isAbstract()) {%> abstract<%}%> class <%=genClass.getTestCa
<%if (genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50) { //TestCase/genOperation.annotations.insert.javajetinc%>
<%@ include file="TestCase/genOperation.annotations.insert.javajetinc" fail="silent" %>
<%}%>
- public void test<%=genModel.capName(genOperation.getName())%><%=genOperation.getGenParameters().size() == 0 ? "" : "__" + genOperation.getParameterTypes("_", false)%>()
+ public void test<%=genClass.getUniqueName(genOperation)%>()
{
<%@ include file="TestCase/implementedGenOperation.TODO.override.javajetinc" fail="alternative" %>
<%@ start %>

Back to the top