diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 9c61106e..5058f900 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -240,7 +240,7 @@ jobs: uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:protobuf;commands:test_0" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:protobuf;commands:test" restore-keys: | os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:protobuf os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0 @@ -277,7 +277,7 @@ jobs: uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:protoc_plugin;commands:command_0-command_3-test_0" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:protoc_plugin;commands:command_0-command_3-test" restore-keys: | os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:protoc_plugin os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0 @@ -322,7 +322,7 @@ jobs: uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:protobuf;commands:test_0" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:protobuf;commands:test" restore-keys: | os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:protobuf os:ubuntu-latest;pub-cache-hosted;sdk:dev @@ -359,7 +359,7 @@ jobs: uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:protoc_plugin;commands:command_0-command_3-test_0" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:protoc_plugin;commands:command_0-command_3-test" restore-keys: | os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:protoc_plugin os:ubuntu-latest;pub-cache-hosted;sdk:dev @@ -404,7 +404,7 @@ jobs: uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 with: path: "~/.pub-cache/hosted" - key: "os:macos-latest;pub-cache-hosted;sdk:3.3.0;packages:protobuf;commands:test_0" + key: "os:macos-latest;pub-cache-hosted;sdk:3.3.0;packages:protobuf;commands:test" restore-keys: | os:macos-latest;pub-cache-hosted;sdk:3.3.0;packages:protobuf os:macos-latest;pub-cache-hosted;sdk:3.3.0 @@ -441,7 +441,7 @@ jobs: uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 with: path: "~/.pub-cache/hosted" - key: "os:macos-latest;pub-cache-hosted;sdk:dev;packages:protobuf;commands:test_0" + key: "os:macos-latest;pub-cache-hosted;sdk:dev;packages:protobuf;commands:test" restore-keys: | os:macos-latest;pub-cache-hosted;sdk:dev;packages:protobuf os:macos-latest;pub-cache-hosted;sdk:dev @@ -524,56 +524,3 @@ jobs: - job_004 - job_005 - job_006 - job_015: - name: "run_legacy_tests; linux; Dart 3.3.0; PKG: protoc_plugin; `./../tool/setup.sh`, `make protos`, `dart test legacy_tests/generated_message_test.dart`" - runs-on: ubuntu-latest - steps: - - name: Cache Pub hosted dependencies - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 - with: - path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:protoc_plugin;commands:command_0-command_3-test_1" - restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:protoc_plugin - os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0 - os:ubuntu-latest;pub-cache-hosted - os:ubuntu-latest - - name: Setup Dart SDK - uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 - with: - sdk: "3.3.0" - - id: checkout - name: Checkout repository - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 - - id: protoc_plugin_pub_upgrade - name: protoc_plugin; dart pub upgrade - run: dart pub upgrade - if: "always() && steps.checkout.conclusion == 'success'" - working-directory: protoc_plugin - - name: protoc_plugin; ./../tool/setup.sh - run: ./../tool/setup.sh - if: "always() && steps.protoc_plugin_pub_upgrade.conclusion == 'success'" - working-directory: protoc_plugin - - name: protoc_plugin; make protos - run: make protos - if: "always() && steps.protoc_plugin_pub_upgrade.conclusion == 'success'" - working-directory: protoc_plugin - - name: protoc_plugin; dart test legacy_tests/generated_message_test.dart - run: dart test legacy_tests/generated_message_test.dart - if: "always() && steps.protoc_plugin_pub_upgrade.conclusion == 'success'" - working-directory: protoc_plugin - needs: - - job_001 - - job_002 - - job_003 - - job_004 - - job_005 - - job_006 - - job_007 - - job_008 - - job_009 - - job_010 - - job_011 - - job_012 - - job_013 - - job_014 diff --git a/protoc_plugin/legacy_tests/generated_message_test.dart b/protoc_plugin/legacy_tests/generated_message_test.dart deleted file mode 100644 index 77dc36d7..00000000 --- a/protoc_plugin/legacy_tests/generated_message_test.dart +++ /dev/null @@ -1,101 +0,0 @@ -// Copyright (c) 2023, the Dart project authors. Please see the AUTHORS file -// for details. All rights reserved. Use of this source code is governed by a -// BSD-style license that can be found in the LICENSE file. - -// @dart=2.11 - -import 'package:test/test.dart'; - -import '../out/protos/google/protobuf/unittest.pb.dart'; -import '../out/protos/toplevel.pb.dart'; -import '../out/protos/toplevel_import.pb.dart' as t; - -void main() { - test('testSettersRejectNull', () { - final message = TestAllTypes(); - expect(() { - message.optionalString = null; - }, throwsArgumentError); - expect(() { - message.optionalBytes = null; - }, throwsArgumentError); - expect(() { - message.optionalNestedMessage = null; - }, throwsArgumentError); - expect(() { - message.optionalNestedMessage = null; - }, throwsArgumentError); - expect(() { - message.optionalNestedEnum = null; - }, throwsArgumentError); - expect(() { - message.repeatedString.add(null); - }, throwsArgumentError); - expect(() { - message.repeatedBytes.add(null); - }, throwsArgumentError); - expect(() { - message.repeatedNestedMessage.add(null); - }, throwsArgumentError); - expect(() { - message.repeatedNestedMessage.add(null); - }, throwsArgumentError); - expect(() { - message.repeatedNestedEnum.add(null); - }, throwsArgumentError); - }); - - test('testRepeatedSettersRejectNull', () { - final message = TestAllTypes(); - - message.repeatedString.addAll(['one', 'two']); - expect(() { - message.repeatedString[1] = null; - }, throwsArgumentError); - - message.repeatedBytes.addAll(['one'.codeUnits, 'two'.codeUnits]); - expect(() { - message.repeatedBytes[1] = null; - }, throwsArgumentError); - - message.repeatedNestedMessage.addAll([ - TestAllTypes_NestedMessage()..bb = 318, - TestAllTypes_NestedMessage()..bb = 456 - ]); - expect(() { - message.repeatedNestedMessage[1] = null; - }, throwsArgumentError); - - message.repeatedNestedEnum - .addAll([TestAllTypes_NestedEnum.FOO, TestAllTypes_NestedEnum.BAR]); - expect(() { - message.repeatedNestedEnum[1] = null; - }, throwsArgumentError); - }); - - test('testRepeatedAppendRejectsNull', () { - final message = TestAllTypes(); - - expect(() { - message.repeatedForeignMessage.addAll([ForeignMessage()..c = 12, null]); - }, throwsArgumentError); - - expect(() { - message.repeatedForeignEnum.addAll([ForeignEnum.FOREIGN_BAZ, null]); - }, throwsArgumentError); - - expect(() { - message.repeatedString.addAll(['one', null]); - }, throwsArgumentError); - - expect(() { - message.repeatedBytes.addAll(['one'.codeUnits, null]); - }, throwsArgumentError); - }); - - test('testToplevel', () { - final message = t.M(); - message.t = T(); - t.SApi(null); - }); -} diff --git a/protoc_plugin/mono_pkg.yaml b/protoc_plugin/mono_pkg.yaml index f7cefe59..345113da 100644 --- a/protoc_plugin/mono_pkg.yaml +++ b/protoc_plugin/mono_pkg.yaml @@ -14,9 +14,3 @@ stages: - command: make protos - test sdk: [pubspec, dev] - - run_legacy_tests: - - group: - - command: ./../tool/setup.sh - - command: make protos - - test: legacy_tests/generated_message_test.dart - sdk: [pubspec] diff --git a/tool/ci.sh b/tool/ci.sh index bf376f72..0b23b056 100755 --- a/tool/ci.sh +++ b/tool/ci.sh @@ -99,14 +99,10 @@ for PKG in ${PKGS}; do echo 'dart format --output=none --set-exit-if-changed .' dart format --output=none --set-exit-if-changed . || EXIT_CODE=$? ;; - test_0) + test) echo 'dart test' dart test || EXIT_CODE=$? ;; - test_1) - echo 'dart test legacy_tests/generated_message_test.dart' - dart test legacy_tests/generated_message_test.dart || EXIT_CODE=$? - ;; *) echo -e "\033[31mUnknown TASK '${TASK}' - TERMINATING JOB\033[0m" exit 64