digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-09-20 09:17:43 +03:00
Code Issues Projects Releases Wiki Activity

Test codegen against the latest DAML-LF version (#1446)

Browse Source 
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).
This commit is contained in:
Gerolf Seitz 2019-05-29 13:30:38 +02:00 committed by mergify[bot]
parent 8202df8201
commit 82f81a7588
7 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
language-support/java/codegen/BUILD.bazel
View File

@ -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,

2
language-support/java/codegen/src/it/java-1.0/com/digitalasset/lf1_0/AllTests.java → language-support/java/codegen/src/it/java-1.0/com/digitalasset/lf_1_0/AllTests.java
View File

@ -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;

18
language-support/java/codegen/src/it/java-1.0/com/digitalasset/lf1_0/OptionalTest.java → language-support/java/codegen/src/it/java-1.0/com/digitalasset/lf_1_0/OptionalTest.java
View File

@ -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;

2
language-support/java/codegen/src/it/java-1.1/com/digitalasset/lf1_1/AllTests.java → language-support/java/codegen/src/it/java-1.1/com/digitalasset/lf_1_1/AllTests.java
View File

@ -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;

8
language-support/java/codegen/src/it/java-1.1/com/digitalasset/lf1_1/OptionalTest.java → language-support/java/codegen/src/it/java-1.1/com/digitalasset/lf_1_1/OptionalTest.java
View File

@ -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;

2
language-support/java/codegen/src/it/java-1.3/com.digitalasset.lf1_3/AllTests.java → language-support/java/codegen/src/it/java-latest/com/digitalasset/lf_latest/AllTests.java
View File

@ -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;

2
language-support/java/codegen/src/it/java-1.3/com.digitalasset.lf1_3/MapTest.java → language-support/java/codegen/src/it/java-latest/com/digitalasset/lf_latest/MapTest.java
View File

@ -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;