aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/blackbox/testdata-java/java/inner-class/InnerClass.java6
-rw-r--r--tests/auto/blackbox/testdata-java/java/inner-class/inner-class.qbs5
-rw-r--r--tests/auto/blackbox/tst_blackboxjava.cpp10
-rw-r--r--tests/auto/blackbox/tst_blackboxjava.h1
4 files changed, 22 insertions, 0 deletions
diff --git a/tests/auto/blackbox/testdata-java/java/inner-class/InnerClass.java b/tests/auto/blackbox/testdata-java/java/inner-class/InnerClass.java
new file mode 100644
index 000000000..3e0333ecb
--- /dev/null
+++ b/tests/auto/blackbox/testdata-java/java/inner-class/InnerClass.java
@@ -0,0 +1,6 @@
+public class InnerClass {
+ private final InnerInnerClass clazz = new InnerInnerClass();
+
+ private class InnerInnerClass {
+ }
+}
diff --git a/tests/auto/blackbox/testdata-java/java/inner-class/inner-class.qbs b/tests/auto/blackbox/testdata-java/java/inner-class/inner-class.qbs
new file mode 100644
index 000000000..5bc861f5d
--- /dev/null
+++ b/tests/auto/blackbox/testdata-java/java/inner-class/inner-class.qbs
@@ -0,0 +1,5 @@
+import qbs
+
+JavaJarFile {
+ files: ["**/*.java"]
+}
diff --git a/tests/auto/blackbox/tst_blackboxjava.cpp b/tests/auto/blackbox/tst_blackboxjava.cpp
index ba00de997..87cb92436 100644
--- a/tests/auto/blackbox/tst_blackboxjava.cpp
+++ b/tests/auto/blackbox/tst_blackboxjava.cpp
@@ -288,4 +288,14 @@ void TestBlackboxJava::javaDependencyTracking()
QSKIP("No JDKs installed");
}
+void TestBlackboxJava::javaDependencyTrackingInnerClass()
+{
+ QDir::setCurrent(testDataDir + "/java/inner-class");
+ QbsRunParameters params;
+ params.expectFailure = true;
+ QCOMPARE(runQbs(params), 0);
+ QEXPECT_FAIL(0, "QBS-1069", Abort);
+ QVERIFY(!m_qbsStderr.contains("QBS-1069"));
+}
+
QTEST_MAIN(TestBlackboxJava)
diff --git a/tests/auto/blackbox/tst_blackboxjava.h b/tests/auto/blackbox/tst_blackboxjava.h
index 124c992a6..40f1b1636 100644
--- a/tests/auto/blackbox/tst_blackboxjava.h
+++ b/tests/auto/blackbox/tst_blackboxjava.h
@@ -43,6 +43,7 @@ private slots:
void android_data();
void java();
void javaDependencyTracking();
+ void javaDependencyTrackingInnerClass();
private:
QMap<QString, QString> findAndroid(int *status);