Merge pull request #118 from ipa-nhg/XtextTests

add auto-components generator tests

Author: ipa-nhg

plugins/de.fraunhofer.ipa.ros.xtext.tests/resources/components/test_node.componentinterface

@@ -0,0 +1,25 @@
+ComponentInterface { name test_node
+	RosPublishers{
+		RosPublisher "scan" { RefPublisher "test_pkg.test_node.test_node.scan"}
+	}
+	RosSubscribers{
+		RosSubscriber "power_state" { RefSubscriber "test_pkg.test_node.test_node.power_state"}
+	}
+	RosSrvServers{
+		RosServiceServer "setBool" { RefServer "test_pkg.test_node.test_node.setBool"}
+	}
+	RosSrvClients{
+		RosServiceClient "init" { RefClient "test_pkg.test_node.test_node.init"}
+	}
+	
+		RosParameters{
+			RosParameter "string_test" { RefParameter "test_pkg.test_node.test_node.string_test"},
+			RosParameter "bool_tets" { RefParameter "test_pkg.test_node.test_node.bool_tets"},
+			RosParameter "array_tets" { RefParameter "test_pkg.test_node.test_node.array_tets"},
+			RosParameter "base64_test" { RefParameter "test_pkg.test_node.test_node.base64_test"},
+			RosParameter "double_test" { RefParameter "test_pkg.test_node.test_node.double_test"},
+			RosParameter "int_test" { RefParameter "test_pkg.test_node.test_node.int_test"},
+			RosParameter "list_test" { RefParameter "test_pkg.test_node.test_node.list_test"},
+			RosParameter "struc_test" { RefParameter "test_pkg.test_node.test_node.struc_test"}
+		}
+}

plugins/de.fraunhofer.ipa.ros.xtext.tests/src/de/fraunhofer/ipa/ros/tests/RosGeneratorTest.xtend

@@ -12,10 +12,11 @@ import ros.PackageSet
 import org.eclipse.xtext.generator.InMemoryFileSystemAccess
 import org.eclipse.xtext.generator.GeneratorContext
 import de.fraunhofer.ipa.roscode.generator.CustomOutputProvider
-
 import de.fraunhofer.ipa.roscode.generator.Ros2CodeGenerator
 import java.nio.file.Files
 import java.nio.file.Paths
+import de.fraunhofer.ipa.ros.generator.RosGenerator
+import de.fraunhofer.ipa.ros.generator.CICustomOutputProvider
 
 @RunWith(XtextRunner)
 @InjectWith(RosInjectorProvider)
@@ -25,6 +26,9 @@ class RosGeneratorTest {
 
 	@Inject
 	Ros2CodeGenerator ros2Generator
+	
+	@Inject
+	RosGenerator CIGenerator
 
 	@Inject
 	ParseHelper<PackageSet> parseHelper
@@ -64,5 +68,19 @@ class RosGeneratorTest {
 			new String(Files.readAllBytes(Paths.get(RESOURCES_BASE_DIR, 'ros2generator', 'test_node.cpp'))).trim,
 			fsa.textFiles.get(CustomOutputProvider::DEFAULT_OUTPUT + "test_node.cpp").toString.trim)
 	}
+	
+	@Test
+	def void testGeneratedCI() {
+		val resourceSet = rosTestingUtils.getMessagesResourceSet
+		val fileContent = new String(Files.readAllBytes(Paths.get(RESOURCES_BASE_DIR, 'test.ros')))
+		val model = parseHelper.parse(fileContent, resourceSet)
+
+		val fsa = new InMemoryFileSystemAccess
+		CIGenerator.doGenerate(model.eResource, fsa, new GeneratorContext)
+		Assert.assertTrue(fsa.textFiles.containsKey(CICustomOutputProvider::COM_OUTPUT + "test_node.componentinterface"))
+		Assert.assertEquals(
+			new String(Files.readAllBytes(Paths.get(RESOURCES_BASE_DIR, 'components', 'test_node.componentinterface'))).trim,
+			fsa.textFiles.get(CICustomOutputProvider::COM_OUTPUT + "test_node.componentinterface").toString.trim)
+	}
 
 }

plugins/de.fraunhofer.ipa.ros.xtext/src/de/fraunhofer/ipa/ros/RosRuntimeModule.xtend

@@ -4,7 +4,7 @@
 package de.fraunhofer.ipa.ros
 
 import com.google.inject.Binder
-import de.fraunhofer.ipa.ros.generator.CustomOutputProvider
+import de.fraunhofer.ipa.ros.generator.CICustomOutputProvider
 import org.eclipse.xtext.conversion.IValueConverterService
 import org.eclipse.xtext.generator.IOutputConfigurationProvider
 
@@ -15,7 +15,7 @@ class RosRuntimeModule extends AbstractRosRuntimeModule {
 
 		override void configure(Binder binder) {
 		super.configure(binder)
-		binder.bind(IOutputConfigurationProvider).to(CustomOutputProvider).asEagerSingleton()
+		binder.bind(IOutputConfigurationProvider).to(CICustomOutputProvider).asEagerSingleton()
 	}
 
 }

plugins/de.fraunhofer.ipa.ros.xtext/src/de/fraunhofer/ipa/ros/generator/RosGenerator.xtend

@@ -13,7 +13,7 @@ import org.eclipse.xtext.generator.OutputConfiguration
 import ros.Node
 import ros.Package
 
-class CustomOutputProvider implements IOutputConfigurationProvider {
+class CICustomOutputProvider implements IOutputConfigurationProvider {
 	public final static String COM_OUTPUT = "COM_OUTPUT"
 
 
@@ -57,7 +57,7 @@ class RosGenerator extends AbstractGenerator {
 			}
 		}
 		for (node : resource.allContents.toIterable.filter(Node)){
-			fsa.generateFile(node.getName()+".componentinterface",CustomOutputProvider::COM_OUTPUT,compile(node,package_name,artifact_name))
+			fsa.generateFile(node.getName()+".componentinterface",CICustomOutputProvider::COM_OUTPUT,compile(node,package_name,artifact_name))
 		}
 	}