Merge remote-tracking branch 'origin/master' into rmuller/submodules

aws · Mar 10, 2020 · 4cd2e17 · 4cd2e17
2 parents 814e395 + 1acbc90
commit 4cd2e17
Show file tree

Hide file tree

Showing 10 changed files with 837 additions and 2,065 deletions.
diff --git a/...es/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/ComplianceTests.cs b/...es/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/ComplianceTests.cs
@@ -3,7 +3,8 @@
 using System.Linq;
 using Amazon.JSII.Runtime.Deputy;
 using Amazon.JSII.Tests.CalculatorNamespace;
-using CompositeOperation = Amazon.JSII.Tests.CalculatorNamespace.composition.CompositeOperation;
+using Amazon.JSII.Tests.CalculatorNamespace.Compliance;
+using CompositeOperation = Amazon.JSII.Tests.CalculatorNamespace.Composition.CompositeOperation;
 using Amazon.JSII.Tests.CalculatorNamespace.LibNamespace;
 using Newtonsoft.Json.Linq;
 using Xunit;

diff --git a/.../java-runtime-test/project/src/test/java/software/amazon/jsii/testing/ComplianceTest.java b/.../java-runtime-test/project/src/test/java/software/amazon/jsii/testing/ComplianceTest.java
@@ -7,13 +7,12 @@
 import software.amazon.jsii.JsiiEngine;
 import software.amazon.jsii.JsiiException;
 import software.amazon.jsii.tests.calculator.*;
-import software.amazon.jsii.tests.calculator.composition.CompositeOperation;
-import software.amazon.jsii.tests.calculator.lib.EnumFromScopedModule;
-import software.amazon.jsii.tests.calculator.lib.IFriendly;
-import software.amazon.jsii.tests.calculator.lib.MyFirstStruct;
+import software.amazon.jsii.tests.calculator.compliance.*;
+import software.amazon.jsii.tests.calculator.composition.*;
+import software.amazon.jsii.tests.calculator.lib.*;
+// Removes ambiguity with java.lang.Number
 import software.amazon.jsii.tests.calculator.lib.Number;
-import software.amazon.jsii.tests.calculator.lib.StructWithOnlyOptionals;
-import software.amazon.jsii.tests.calculator.lib.Value;
+import software.amazon.jsii.tests.calculator.stability_annotations.*;
 
 import java.io.IOException;
 import java.time.Instant;

diff --git a/.../java-runtime-test/project/src/test/java/software/amazon/jsii/testing/JsiiClientTest.java b/.../java-runtime-test/project/src/test/java/software/amazon/jsii/testing/JsiiClientTest.java
@@ -79,7 +79,7 @@ public void initialTest() {
 
     @Test
     public void asyncMethods() {
-        JsiiObjectRef obj = client.createObject("jsii-calc.AsyncVirtualMethods", Arrays.asList(), Arrays.asList(), Arrays.asList());
+        JsiiObjectRef obj = client.createObject("jsii-calc.compliance.AsyncVirtualMethods", Arrays.asList(), Arrays.asList(), Arrays.asList());
 
         // begin will return a promise
         JsiiPromise promise = client.beginAsyncMethod(obj, "callMe", toSandboxArray());
@@ -99,7 +99,7 @@ private Collection<JsiiOverride> methodOverride(final String methodName, final S
 
     @Test
     public void asyncMethodOverrides() {
-        JsiiObjectRef obj = client.createObject("jsii-calc.AsyncVirtualMethods", Arrays.asList(), methodOverride("overrideMe", "myCookie"), Arrays.asList());
+        JsiiObjectRef obj = client.createObject("jsii-calc.compliance.AsyncVirtualMethods", Arrays.asList(), methodOverride("overrideMe", "myCookie"), Arrays.asList());
 
         // begin will return a promise
         JsiiPromise promise = client.beginAsyncMethod(obj, "callMe", toSandboxArray());
@@ -128,7 +128,7 @@ public void asyncMethodOverrides() {
 
     @Test
     public void asyncMethodOverridesThrow() {
-        JsiiObjectRef obj = client.createObject("jsii-calc.AsyncVirtualMethods", Arrays.asList(), methodOverride("overrideMe", "myCookie"), Arrays.asList());
+        JsiiObjectRef obj = client.createObject("jsii-calc.compliance.AsyncVirtualMethods", Arrays.asList(), methodOverride("overrideMe", "myCookie"), Arrays.asList());
 
         // begin will return a promise
         JsiiPromise promise = client.beginAsyncMethod(obj, "callMe", toSandboxArray());
@@ -163,7 +163,7 @@ public void asyncMethodOverridesThrow() {
 
     @Test
     public void syncVirtualMethods() {
-        JsiiObjectRef obj = client.createObject("jsii-calc.SyncVirtualMethods", Arrays.asList(), methodOverride("virtualMethod","myCookie"), Arrays.asList());
+        JsiiObjectRef obj = client.createObject("jsii-calc.compliance.SyncVirtualMethods", Arrays.asList(), methodOverride("virtualMethod","myCookie"), Arrays.asList());
 
         jsiiRuntime.setCallbackHandler(callback -> {
             assertEquals(obj.getObjId(), JsiiObjectRef.parse(callback.getInvoke().getObjref()).getObjId());
@@ -197,7 +197,7 @@ public void syncVirtualMethods() {
 
     @Test
     public void staticProperties() {
-        final String fqn = "jsii-calc.Statics";
+        final String fqn = "jsii-calc.compliance.Statics";
         assertEquals("hello", client.getStaticPropertyValue(fqn, "Foo").textValue());
 
         JsonNode defaultInstance = client.getStaticPropertyValue(fqn, "instance");
@@ -212,7 +212,7 @@ public void staticProperties() {
 
     @Test
     public void staticMethods() {
-        final String fqn = "jsii-calc.Statics";
+        final String fqn = "jsii-calc.compliance.Statics";
         JsonNode result = client.callStaticMethod(fqn, "staticMethod", JSON.arrayNode().add("Foo"));
         assertEquals("hello ,Foo!", result.textValue());
     }

diff --git a/packages/jsii-config/package.json b/packages/jsii-config/package.json
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@jsii/spec": "^1.0.0",
-    "inquirer": "^7.0.6",
+    "inquirer": "^7.1.0",
     "yargs": "^15.3.0"
   },
   "jest": {

diff --git a/packages/jsii-pacmak/package.json b/packages/jsii-pacmak/package.json
@@ -45,7 +45,7 @@
     "jsii-rosetta": "^1.0.0",
     "semver": "^7.1.3",
     "spdx-license-list": "^6.1.0",
-    "xmlbuilder": "^14.0.0",
+    "xmlbuilder": "^15.0.0",
     "yargs": "^15.3.0"
   },
   "devDependencies": {