Browse Source

trivial : csharp generator tests gets compilable

Johannes Dicks 9 years ago
parent
commit
696e222302

+ 12 - 5
test-plugins/org.yakindu.sct.generator.csharp.test/src/org/yakindu/sct/generator/csharp/util/AbstractCSharpGeneratorTest.java

@@ -14,10 +14,12 @@ import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.jdt.core.IJavaModelMarker;
-import org.yakindu.sct.generator.core.util.GeneratorUtils;
-import org.yakindu.sct.generator.java.JavaCodeGenerator;
+import org.yakindu.sct.generator.core.library.IOutletFeatureHelper;
+import org.yakindu.sct.generator.core.library.OutletFeatureHelperImpl;
+import org.yakindu.sct.generator.csharp.CSharpCodeGenerator;
 import org.yakindu.sct.model.sgen.FeatureConfiguration;
 import org.yakindu.sct.model.sgen.FeatureParameter;
 import org.yakindu.sct.model.sgen.FeatureParameterValue;
@@ -40,20 +42,21 @@ public abstract class AbstractCSharpGeneratorTest {
 	private static final String CONTENT_TYPE = "statechart";
 	private static final String OUTLET_FEATURE = "Outlet";
 	private static final String TARGET_FOLDER = "targetFolder";
+	private static final IOutletFeatureHelper outletFeatureConfigurationHelper = new OutletFeatureHelperImpl();
 
 	@Inject
-	protected JavaCodeGenerator generator;
+	protected CSharpCodeGenerator generator;
 
 	public IMarker[] generateAndCompile(Statechart statechart) throws Exception {
 		GeneratorEntry entry = createGeneratorEntry(statechart.getName(),
 				SRC_GEN);
 		entry.setElementRef(statechart);
-		IProject targetProject = GeneratorUtils.getTargetProject(entry);
+		IProject targetProject = getProject(entry);
 		targetProject.delete(true, new NullProgressMonitor());
 		generator.generate(entry);
 		targetProject.getWorkspace().build(
 				IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
-		targetProject = GeneratorUtils.getTargetProject(entry);
+		targetProject =getProject(entry);
 		if (!targetProject.exists()) {
 			targetProject.create(new NullProgressMonitor());
 			targetProject.open(new NullProgressMonitor());
@@ -65,6 +68,10 @@ public abstract class AbstractCSharpGeneratorTest {
 				IResource.DEPTH_INFINITE);
 		return markers;
 	}
+	
+	protected IProject getProject(GeneratorEntry entry) {
+		return ResourcesPlugin.getWorkspace().getRoot().getProject(outletFeatureConfigurationHelper.getTargetProjectValue(entry).getStringValue());
+	}
 
 	private GeneratorEntry createGeneratorEntry(String targetProject,
 			String targetFolder) {