Browse Source

Fix Angel Framework tests (#4537)

* create angel

* Angel project setup

* bin/main.dart

* Spawn $(N_CORES) instances

* Pass args to Angel entrypoint

* Move newline in usage print

* Created model files

* Include serializers as parts

* Connect to Mongo

* Add JSON+plaintext

* Fetch random world

* Fortunes + remaining routes

* Add mustache

* Postgres

* Run pub get instead of slower pub upgrade

* Add missing URLS

* Commit lockfile

* Update world.dart to serialize as randomNumber instead of randomnumber

* ignore .g.part

* Remove .g.part

* All tests run for Angel

* Angel postgres passes

* Remove development config

* Remove logging config

* Version information for Angel benchmarks

* Add link to Dart benchmarks

* Format Dart code

* Remove logging usage in bin/main.dart

* Remove Dart gen files, run them in Docker

* ignore

* angel

* upgrade package:build_runner

* Upgrade Dart files for new Angel version

* fix version conflicts in dependencies

* edit angel readme

* ignore generated reflectable file
Tobe Osakwe 6 years ago
parent
commit
5be9c84d10

+ 1 - 0
frameworks/Dart/angel/.gitignore

@@ -1,5 +1,6 @@
 !bin/
 .dart_tool
 .packages
+*.reflectable.dart
 *.g.part
 *.g.dart

+ 2 - 2
frameworks/Dart/angel/README.md

@@ -6,8 +6,8 @@ a full-featured framework for Dart, to the
 ## Versions
 The `pubspec.lock` file is included; so that dependencies are kept consistent between deployments.
 The tests included in this benchmark are a demonstration of:
-* [Dart SDK version 2.0.0](http://www.dartlang.org/)
-* [Angel Framework version `^2.0.0-alpha`](https://pub.dartlang.org/packages/angel_framework/versions/2.0.0-alpha.1)
+* [Dart SDK version 2.2.0](http://www.dartlang.org/)
+* [Angel Framework version `^2.0.0-alpha.22`](https://pub.dartlang.org/packages/angel_framework/versions/2.0.0-alpha.22)
 
 ## Test URLs
 ### JSON

+ 1 - 1
frameworks/Dart/angel/angel-postgres.dockerfile

@@ -1,4 +1,4 @@
-FROM google/dart:2.0
+FROM google/dart:2.2
 
 COPY ./ ./
 

+ 1 - 1
frameworks/Dart/angel/angel.dockerfile

@@ -1,4 +1,4 @@
-FROM google/dart:2.0
+FROM google/dart:2.2
 
 COPY ./ ./
 

+ 3 - 0
frameworks/Dart/angel/bin/main.dart

@@ -2,11 +2,14 @@ import 'dart:async';
 import 'dart:io';
 import 'dart:isolate';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
 import 'package:args/args.dart';
 import 'package:dart_angel_benchmark/dart_angel_benchmark.dart'
     as dart_angel_benchmark;
+import 'main.reflectable.dart';
 
 main(List<String> args) async {
+  initializeReflectable();
   var argParser = ArgParser()
     ..addOption('type',
         abbr: 't', allowed: ['mongo', 'postgres'], defaultsTo: 'mongo');

+ 1 - 2
frameworks/Dart/angel/lib/src/models/fortune.dart

@@ -1,8 +1,7 @@
 import 'package:angel_serialize/angel_serialize.dart';
 part 'fortune.g.dart';
-part 'fortune.serializer.g.dart';
 
-@Serializable(autoIdAndDateFields: false, autoSnakeCaseNames: false)
+@Serializable(autoSnakeCaseNames: false)
 abstract class _Fortune {
   num get id;
 

+ 1 - 2
frameworks/Dart/angel/lib/src/models/world.dart

@@ -1,8 +1,7 @@
 import 'package:angel_serialize/angel_serialize.dart';
 part 'world.g.dart';
-part 'world.serializer.g.dart';
 
-@Serializable(autoIdAndDateFields: false, autoSnakeCaseNames: false)
+@Serializable(autoSnakeCaseNames: false)
 abstract class _World {
   num get id;
 

+ 5 - 3
frameworks/Dart/angel/pubspec.yaml

@@ -4,13 +4,15 @@ environment:
   sdk: ">=2.0.0-dev <3.0.0"
 dependencies:
   angel_configuration: ^2.0.0
-  angel_framework: ^2.0.0-alpha
+  angel_framework: ^2.0.0-alpha.22
   angel_model: ^1.0.0
   angel_serialize: ^2.0.0
   args: ^1.0.0
-  mongo_dart: ^0.3.0
+  mongo_dart: ^0.3.4
   mustache4dart: ^3.0.0-dev.0.0
   postgres: ^1.0.0
 dev_dependencies:
   angel_serialize_generator: ^2.0.0
-  build_runner: ^0.10.0
+  build_runner: ^1.0.0
+dependency_overrides:
+  uuid: ^2.0.0-rc.1