Restructure bundle-plugin-test to allow multiple test bundles.

5 files changed, 78 insertions, 0 deletions

diff --git a/bundle-plugin-test/test-bundles/main/src/main/java/InDefaultPackage.java b/bundle-plugin-test/test-bundles/main/src/main/java/InDefaultPackage.java
new file mode 100644
index 00000000000..a650916d653
--- /dev/null
+++ b/bundle-plugin-test/test-bundles/main/src/main/java/InDefaultPackage.java
@@ -0,0 +1,3 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+public class InDefaultPackage {}
diff --git a/bundle-plugin-test/test-bundles/main/src/main/java/com/yahoo/test/SimpleSearcher.java b/bundle-plugin-test/test-bundles/main/src/main/java/com/yahoo/test/SimpleSearcher.java
new file mode 100644
index 00000000000..dddca3f4d59
--- /dev/null
+++ b/bundle-plugin-test/test-bundles/main/src/main/java/com/yahoo/test/SimpleSearcher.java
@@ -0,0 +1,37 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.test;
+
+import com.yahoo.prelude.hitfield.XMLString;
+import com.yahoo.search.Query;
+import com.yahoo.search.Result;
+import com.yahoo.search.Searcher;
+import com.yahoo.search.result.Hit;
+import com.yahoo.search.searchchain.Execution;
+import com.yahoo.text.BooleanParser;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * A searcher adding a new hit.
+ *
+ * @author  Joe Developer
+ */
+public class SimpleSearcher extends Searcher {
+
+    public Result search(Query query,Execution execution) {
+        try {
+            BooleanParser.parseBoolean("true");
+            XMLString xmlString = new XMLString("<sampleXmlString/>");
+
+            Hit hit = new Hit("Hello world!");
+            hit.setField("json", new JSONObject().put("price", 42).toString());
+
+            Result result = execution.search(query);
+            result.hits().add(hit);
+            return result;
+
+        } catch (JSONException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/bundle-plugin-test/test-bundles/main/src/main/java/com/yahoo/test/SimpleSearcher2.java b/bundle-plugin-test/test-bundles/main/src/main/java/com/yahoo/test/SimpleSearcher2.java
new file mode 100644
index 00000000000..3220171de13
--- /dev/null
+++ b/bundle-plugin-test/test-bundles/main/src/main/java/com/yahoo/test/SimpleSearcher2.java
@@ -0,0 +1,28 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.test;
+
+
+/**
+ * Test class for integration tests. Used to verify that nested classes are visited.
+ *
+ * Do not replace the fully qualified class names with imports!
+ */
+public class SimpleSearcher2 extends SimpleSearcher {
+    public void dummy() {}
+
+    private class InnerClassProcessor extends com.yahoo.processing.Processor {
+        @Override
+        public com.yahoo.processing.Response process(com.yahoo.processing.Request request,
+                                                     com.yahoo.processing.execution.Execution execution) {
+            return null;
+        }
+    }
+
+    private static class NestedStaticClass {
+        private com.yahoo.metrics.simple.Counter counter;
+
+        @com.google.inject.Inject
+        public NestedStaticClass() { }
+    }
+
+}
diff --git a/bundle-plugin-test/test-bundles/main/src/main/java/com/yahoo/test/package-info.java b/bundle-plugin-test/test-bundles/main/src/main/java/com/yahoo/test/package-info.java
new file mode 100644
index 00000000000..5774fc8d5f2
--- /dev/null
+++ b/bundle-plugin-test/test-bundles/main/src/main/java/com/yahoo/test/package-info.java
@@ -0,0 +1,6 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+@ExportPackage(version = @Version(major = 1, minor = 2, micro = 3, qualifier = "RELEASE"))
+package com.yahoo.test;
+
+import com.yahoo.osgi.annotation.ExportPackage;
+import com.yahoo.osgi.annotation.Version;
diff --git a/bundle-plugin-test/test-bundles/main/src/main/resources/configdefinitions/test.def b/bundle-plugin-test/test-bundles/main/src/main/resources/configdefinitions/test.def
new file mode 100644
index 00000000000..b4ba9ec518a
--- /dev/null
+++ b/bundle-plugin-test/test-bundles/main/src/main/resources/configdefinitions/test.def
@@ -0,0 +1,4 @@
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+namespace=example
+
+exampleKey string default="exampleValue"