From 82f81a75883f1b337c2e45288916d2aec441bc5f Mon Sep 17 00:00:00 2001 From: Gerolf Seitz Date: Wed, 29 May 2019 13:30:38 +0200 Subject: [PATCH] Test codegen against the latest DAML-LF version (#1446) I'm refurbishing the DAML-LF 1.3 specific tests to run against the latest DAML-LF version (by removing the explicit target version in the daml_compile target). Going forward we only "reify" specific DAML LF versions when breaking changes or new features are introduced, and we need to test the old behavior specifically (just like we did for DAML LF 1.0 and 1.1). --- language-support/java/codegen/BUILD.bazel | 9 ++++----- .../{lf1_0 => lf_1_0}/AllTests.java | 2 +- .../{lf1_0 => lf_1_0}/OptionalTest.java | 18 +++++++++--------- .../{lf1_1 => lf_1_1}/AllTests.java | 2 +- .../{lf1_1 => lf_1_1}/OptionalTest.java | 8 ++++---- .../com/digitalasset/lf_latest}/AllTests.java | 2 +- .../com/digitalasset/lf_latest}/MapTest.java | 2 +- 7 files changed, 21 insertions(+), 22 deletions(-) rename language-support/java/codegen/src/it/java-1.0/com/digitalasset/{lf1_0 => lf_1_0}/AllTests.java (91%) rename language-support/java/codegen/src/it/java-1.0/com/digitalasset/{lf1_0 => lf_1_0}/OptionalTest.java (87%) rename language-support/java/codegen/src/it/java-1.1/com/digitalasset/{lf1_1 => lf_1_1}/AllTests.java (91%) rename language-support/java/codegen/src/it/java-1.1/com/digitalasset/{lf1_1 => lf_1_1}/OptionalTest.java (96%) rename language-support/java/codegen/src/it/{java-1.3/com.digitalasset.lf1_3 => java-latest/com/digitalasset/lf_latest}/AllTests.java (91%) rename language-support/java/codegen/src/it/{java-1.3/com.digitalasset.lf1_3 => java-latest/com/digitalasset/lf_latest}/MapTest.java (99%) diff --git a/language-support/java/codegen/BUILD.bazel b/language-support/java/codegen/BUILD.bazel index 891057db8f..9cb3b7fa8f 100644 --- a/language-support/java/codegen/BUILD.bazel +++ b/language-support/java/codegen/BUILD.bazel @@ -108,7 +108,7 @@ pom_file( daml_lf_target_versions = [ "1.0", "1.1", - "1.3", + "latest", ] ######################################################## @@ -130,10 +130,9 @@ alias( ) daml_compile( - name = "integration-tests-model-1.3", + name = "integration-tests-model-latest", srcs = glob(["src/it/daml/**/*.daml"]), main_src = "src/it/daml/Lib.daml", - target = "1.3", ) [ @@ -152,7 +151,7 @@ daml_compile( dar_to_java( name = "integration-tests-model-%s" % target, src = ":integration-tests-model-%s.dar" % target, - package_prefix = "lf%s" % mangle_for_java(target), + package_prefix = "lf_%s" % mangle_for_java(target), ), ] for target in daml_lf_target_versions @@ -165,7 +164,7 @@ daml_compile( "src/it/java-%s/**/*.java" % target, "src/it/java/**/*.java", ]), - test_class = "com.digitalasset.lf%s.AllTests" % mangle_for_java(target), + test_class = "com.digitalasset.lf_%s.AllTests" % mangle_for_java(target), deps = [ ":integration-tests-model-%s.jar" % target, ":integration-tests-model-noprefix-%s.jar" % target, diff --git a/language-support/java/codegen/src/it/java-1.0/com/digitalasset/lf1_0/AllTests.java b/language-support/java/codegen/src/it/java-1.0/com/digitalasset/lf_1_0/AllTests.java similarity index 91% rename from language-support/java/codegen/src/it/java-1.0/com/digitalasset/lf1_0/AllTests.java rename to language-support/java/codegen/src/it/java-1.0/com/digitalasset/lf_1_0/AllTests.java index 0401f8a84c..cb075f2766 100644 --- a/language-support/java/codegen/src/it/java-1.0/com/digitalasset/lf1_0/AllTests.java +++ b/language-support/java/codegen/src/it/java-1.0/com/digitalasset/lf_1_0/AllTests.java @@ -1,7 +1,7 @@ // Copyright (c) 2019 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package com.digitalasset.lf1_0; +package com.digitalasset.lf_1_0; import com.digitalasset.AllGenericTests; import org.junit.runner.RunWith; diff --git a/language-support/java/codegen/src/it/java-1.0/com/digitalasset/lf1_0/OptionalTest.java b/language-support/java/codegen/src/it/java-1.0/com/digitalasset/lf_1_0/OptionalTest.java similarity index 87% rename from language-support/java/codegen/src/it/java-1.0/com/digitalasset/lf1_0/OptionalTest.java rename to language-support/java/codegen/src/it/java-1.0/com/digitalasset/lf_1_0/OptionalTest.java index c708190218..7275bad1c6 100644 --- a/language-support/java/codegen/src/it/java-1.0/com/digitalasset/lf1_0/OptionalTest.java +++ b/language-support/java/codegen/src/it/java-1.0/com/digitalasset/lf_1_0/OptionalTest.java @@ -1,21 +1,21 @@ // Copyright (c) 2019 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package com.digitalasset.lf1_0; +package com.digitalasset.lf_1_0; import com.daml.ledger.javaapi.data.*; -import lf1_0.da.internal.prelude.optional.Some; -import lf1_0.da.internal.prelude.Optional; +import lf_1_0.da.internal.prelude.optional.Some; +import lf_1_0.da.internal.prelude.Optional; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.platform.runner.JUnitPlatform; import org.junit.runner.RunWith; -import lf1_0.tests.optionaltest.MyListOfOptionalsRecord; -import lf1_0.tests.optionaltest.MyOptionalListRecord; -import lf1_0.tests.optionaltest.MyOptionalRecord; -import lf1_0.tests.optionaltest.NestedOptionalRecord; -import lf1_0.tests.optionaltest.optionalvariant.OptionalParametricVariant; -import lf1_0.tests.optionaltest.optionalvariant.OptionalPrimVariant; +import lf_1_0.tests.optionaltest.MyListOfOptionalsRecord; +import lf_1_0.tests.optionaltest.MyOptionalListRecord; +import lf_1_0.tests.optionaltest.MyOptionalRecord; +import lf_1_0.tests.optionaltest.NestedOptionalRecord; +import lf_1_0.tests.optionaltest.optionalvariant.OptionalParametricVariant; +import lf_1_0.tests.optionaltest.optionalvariant.OptionalPrimVariant; import java.util.Arrays; import java.util.List; diff --git a/language-support/java/codegen/src/it/java-1.1/com/digitalasset/lf1_1/AllTests.java b/language-support/java/codegen/src/it/java-1.1/com/digitalasset/lf_1_1/AllTests.java similarity index 91% rename from language-support/java/codegen/src/it/java-1.1/com/digitalasset/lf1_1/AllTests.java rename to language-support/java/codegen/src/it/java-1.1/com/digitalasset/lf_1_1/AllTests.java index c3646e62e6..a582dbb8ff 100644 --- a/language-support/java/codegen/src/it/java-1.1/com/digitalasset/lf1_1/AllTests.java +++ b/language-support/java/codegen/src/it/java-1.1/com/digitalasset/lf_1_1/AllTests.java @@ -1,7 +1,7 @@ // Copyright (c) 2019 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package com.digitalasset.lf1_1; +package com.digitalasset.lf_1_1; import com.digitalasset.AllGenericTests; import org.junit.runner.RunWith; diff --git a/language-support/java/codegen/src/it/java-1.1/com/digitalasset/lf1_1/OptionalTest.java b/language-support/java/codegen/src/it/java-1.1/com/digitalasset/lf_1_1/OptionalTest.java similarity index 96% rename from language-support/java/codegen/src/it/java-1.1/com/digitalasset/lf1_1/OptionalTest.java rename to language-support/java/codegen/src/it/java-1.1/com/digitalasset/lf_1_1/OptionalTest.java index b6ad6c83cb..259d48c622 100644 --- a/language-support/java/codegen/src/it/java-1.1/com/digitalasset/lf1_1/OptionalTest.java +++ b/language-support/java/codegen/src/it/java-1.1/com/digitalasset/lf_1_1/OptionalTest.java @@ -1,7 +1,7 @@ // Copyright (c) 2019 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package com.digitalasset.lf1_1; +package com.digitalasset.lf_1_1; import com.daml.ledger.javaapi.data.*; import com.digitalasset.ledger.api.v1.ValueOuterClass; @@ -9,9 +9,9 @@ import com.google.protobuf.Empty; import org.junit.jupiter.api.Test; import org.junit.platform.runner.JUnitPlatform; import org.junit.runner.RunWith; -import lf1_1.tests.optionaltest.*; -import lf1_1.tests.optionaltest.optionalvariant.OptionalParametricVariant; -import lf1_1.tests.optionaltest.optionalvariant.OptionalPrimVariant; +import lf_1_1.tests.optionaltest.*; +import lf_1_1.tests.optionaltest.optionalvariant.OptionalParametricVariant; +import lf_1_1.tests.optionaltest.optionalvariant.OptionalPrimVariant; import java.util.Arrays; import java.util.Optional; diff --git a/language-support/java/codegen/src/it/java-1.3/com.digitalasset.lf1_3/AllTests.java b/language-support/java/codegen/src/it/java-latest/com/digitalasset/lf_latest/AllTests.java similarity index 91% rename from language-support/java/codegen/src/it/java-1.3/com.digitalasset.lf1_3/AllTests.java rename to language-support/java/codegen/src/it/java-latest/com/digitalasset/lf_latest/AllTests.java index fdc0fffa89..03536b7309 100644 --- a/language-support/java/codegen/src/it/java-1.3/com.digitalasset.lf1_3/AllTests.java +++ b/language-support/java/codegen/src/it/java-latest/com/digitalasset/lf_latest/AllTests.java @@ -1,7 +1,7 @@ // Copyright (c) 2019 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package com.digitalasset.lf1_3; +package com.digitalasset.lf_latest; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/language-support/java/codegen/src/it/java-1.3/com.digitalasset.lf1_3/MapTest.java b/language-support/java/codegen/src/it/java-latest/com/digitalasset/lf_latest/MapTest.java similarity index 99% rename from language-support/java/codegen/src/it/java-1.3/com.digitalasset.lf1_3/MapTest.java rename to language-support/java/codegen/src/it/java-latest/com/digitalasset/lf_latest/MapTest.java index fa19a86cb5..82c3f50619 100644 --- a/language-support/java/codegen/src/it/java-1.3/com.digitalasset.lf1_3/MapTest.java +++ b/language-support/java/codegen/src/it/java-latest/com/digitalasset/lf_latest/MapTest.java @@ -1,7 +1,7 @@ // Copyright (c) 2019 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package com.digitalasset.lf1_3; +package com.digitalasset.lf_latest; import com.daml.ledger.javaapi.data.Int64; import com.daml.ledger.javaapi.data.Record;