4 files changed, 39 insertions, 7 deletions
diff --git a/sources/shiboken2/ApiExtractor/tests/injectedcode.txt b/sources/shiboken2/ApiExtractor/tests/injectedcode.txt
new file mode 100644
index 000000000..872898810
--- /dev/null
+++ b/sources/shiboken2/ApiExtractor/tests/injectedcode.txt
@@ -0,0 +1,5 @@
+// Bla
+// @snippet label
+code line
+// @snippet label
+// Bla
diff --git a/sources/shiboken2/ApiExtractor/tests/testcodeinjection.cpp b/sources/shiboken2/ApiExtractor/tests/testcodeinjection.cpp
index 68da25373..9f71b495a 100644
--- a/sources/shiboken2/ApiExtractor/tests/testcodeinjection.cpp
+++ b/sources/shiboken2/ApiExtractor/tests/testcodeinjection.cpp
@@ -34,17 +34,43 @@
 #include <abstractmetalang.h>
 #include <typesystem.h>
 
-void TestCodeInjections::testReadFileUtf8()
+void TestCodeInjections::testReadFile_data()
 {
+    QTest::addColumn<QString>("filePath");
+    QTest::addColumn<QString>("snippet");
+    QTest::addColumn<QString>("expected");
+
+    QTest::newRow("utf8")
+        << QString::fromLatin1(":/utf8code.txt")
+        << QString()
+        << QString::fromUtf8("\xC3\xA1\xC3\xA9\xC3\xAD\xC3\xB3\xC3\xBA");
+
+    QTest::newRow("snippet")
+        << QString::fromLatin1(":/injectedcode.txt")
+        << QString::fromLatin1("label")
+        << QString::fromLatin1("code line");
+}
+
+void TestCodeInjections::testReadFile()
+{
+    QFETCH(QString, filePath);
+    QFETCH(QString, snippet);
+    QFETCH(QString, expected);
+
     const char* cppCode ="struct A {};\n";
     int argc = 0;
     char *argv[] = {NULL};
     QCoreApplication app(argc, argv);
+
+    QString attribute = QLatin1String("file='") + filePath + QLatin1Char('\'');
+    if (!snippet.isEmpty())
+        attribute += QLatin1String(" snippet='") + snippet + QLatin1Char('\'');
+
     QString xmlCode = QLatin1String("\
     <typesystem package=\"Foo\">\n\
         <value-type name='A'>\n\
-            <conversion-rule file=':/utf8code.txt'/>\n\
-            <inject-code class='target' file=':/utf8code.txt'/>\n\
+            <conversion-rule ") + attribute + QLatin1String("/>\n\
+            <inject-code class='target' ") + attribute + QLatin1String("/>\n\
         </value-type>\n\
         <value-type name='A::B'/>\n\
     </typesystem>\n");
@@ -54,10 +80,9 @@ void TestCodeInjections::testReadFileUtf8()
     const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, QLatin1String("A"));
     QCOMPARE(classA->typeEntry()->codeSnips().count(), 1);
     QString code = classA->typeEntry()->codeSnips().first().code();
-    QString utf8Data = QString::fromUtf8("\xC3\xA1\xC3\xA9\xC3\xAD\xC3\xB3\xC3\xBA");
-    QVERIFY(code.indexOf(utf8Data) != -1);
+    QVERIFY(code.indexOf(expected) != -1);
     code = classA->typeEntry()->conversionRule();
-    QVERIFY(code.indexOf(utf8Data) != -1);
+    QVERIFY(code.indexOf(expected) != -1);
 }
 
 void TestCodeInjections::testInjectWithValidApiVersion()
diff --git a/sources/shiboken2/ApiExtractor/tests/testcodeinjection.h b/sources/shiboken2/ApiExtractor/tests/testcodeinjection.h
index bd5e7ece1..1ac873970 100644
--- a/sources/shiboken2/ApiExtractor/tests/testcodeinjection.h
+++ b/sources/shiboken2/ApiExtractor/tests/testcodeinjection.h
@@ -37,7 +37,8 @@ class TestCodeInjections : public QObject
 {
     Q_OBJECT
 private slots:
-    void testReadFileUtf8();
+    void testReadFile_data();
+    void testReadFile();
     void testInjectWithValidApiVersion();
     void testInjectWithInvalidApiVersion();
 };
diff --git a/sources/shiboken2/ApiExtractor/tests/testcodeinjection.qrc b/sources/shiboken2/ApiExtractor/tests/testcodeinjection.qrc
index 61d59567b..fd7616bd2 100644
--- a/sources/shiboken2/ApiExtractor/tests/testcodeinjection.qrc
+++ b/sources/shiboken2/ApiExtractor/tests/testcodeinjection.qrc
@@ -1,5 +1,6 @@
 <RCC>
     <qresource>
         <file>utf8code.txt</file>
+        <file>injectedcode.txt</file>
     </qresource>
 </RCC>