Fix up beta and old channel tests (#1077)

* Fix up `beta` tests

* Fix up `old` channel as well

Author: domesticmouse

test/analysis_server_test.dart

@@ -104,13 +104,8 @@ void defineTests() {
       final issue = results.issues[0];
       expect(issue.line, 2);
       expect(issue.kind, 'info');
-      if (!sdk.oldChannel) {
-        expect(issue.message,
-            'An uninitialized variable should have an explicit type annotation.');
-      } else {
-        expect(
-            issue.message, 'Prefer typing uninitialized variables and fields.');
-      }
+      expect(issue.message,
+          'An uninitialized variable should have an explicit type annotation.');
     });
 
     test('repro #126 - completions polluted on second request', () async {
@@ -287,13 +282,8 @@ void defineTests() {
       final issue = results.issues[0];
       expect(issue.line, 2);
       expect(issue.kind, 'info');
-      if (!sdk.oldChannel) {
-        expect(issue.message,
-            'An uninitialized variable should have an explicit type annotation.');
-      } else {
-        expect(
-            issue.message, 'Prefer typing uninitialized variables and fields.');
-      }
+      expect(issue.message,
+          'An uninitialized variable should have an explicit type annotation.');
     });
 
     test('files={} repro #126 - completions polluted on second request',

test/common_server_api_protobuf_test.dart

@@ -377,7 +377,7 @@ main() {
       final data = json.decode(await response.transform(utf8.decoder).join());
       final reply = proto.AssistsResponse()..mergeFromProto3Json(data);
       final assists = reply.assists;
-      if (sdk.masterChannel) {
+      if (sdk.masterChannel || sdk.betaChannel) {
         expect(assists, hasLength(3));
       } else {
         expect(assists, hasLength(2));
@@ -727,7 +727,7 @@ main() {
       final data = json.decode(await response.transform(utf8.decoder).join());
       final reply = proto.AssistsResponse()..mergeFromProto3Json(data);
       final assists = reply.assists;
-      if (sdk.masterChannel) {
+      if (sdk.masterChannel || sdk.betaChannel) {
         expect(assists, hasLength(3));
       } else {
         expect(assists, hasLength(2));

test/common_server_api_test.dart

@@ -504,7 +504,7 @@ main() {
         final encoded = await response.transform(utf8.decoder).join();
         final data = json.decode(encoded) as Map<String, dynamic>;
         final assists = data['assists'] as List<dynamic>;
-        if (sdk.masterChannel) {
+        if (sdk.masterChannel || sdk.betaChannel) {
           expect(assists, hasLength(3));
         } else {
           expect(assists, hasLength(2));
@@ -1215,7 +1215,7 @@ main() {
         final encoded = await response.transform(utf8.decoder).join();
         final data = json.decode(encoded) as Map<String, dynamic>;
         final assists = data['assists'] as List<dynamic>;
-        if (sdk.masterChannel) {
+        if (sdk.masterChannel || sdk.betaChannel) {
           expect(assists, hasLength(3));
         } else {
           expect(assists, hasLength(2));

test/flutter_analysis_server_test.dart

@@ -108,13 +108,8 @@ class HelloWorld extends StatelessWidget {
       final issue = results.issues[0];
       expect(issue.line, 4);
       expect(issue.kind, 'info');
-      if (!sdk.oldChannel) {
-        expect(issue.message,
-            'An uninitialized variable should have an explicit type annotation.');
-      } else {
-        expect(
-            issue.message, 'Prefer typing uninitialized variables and fields.');
-      }
+      expect(issue.message,
+          'An uninitialized variable should have an explicit type annotation.');
     });
 
     test('analyze counter app', () async {
@@ -272,13 +267,8 @@ class HelloWorld extends StatelessWidget {
         final issue = results.issues[0];
         expect(issue.line, 4);
         expect(issue.kind, 'info');
-        if (!sdk.oldChannel) {
-          expect(issue.message,
-              'An uninitialized variable should have an explicit type annotation.');
-        } else {
-          expect(issue.message,
-              'Prefer typing uninitialized variables and fields.');
-        }
+        expect(issue.message,
+            'An uninitialized variable should have an explicit type annotation.');
       });
 
       test('analyzeFiles counter app files={}', () async {