Responsive Wrapper Test Creation #7

*Create comparator tests.

Author: rayliverified

lib/responsive_wrapper.dart

@@ -436,11 +436,11 @@ class ResponsiveWrapperData {
       scaledWidth: state.scaledWidth,
       scaledHeight: state.scaledHeight,
       breakpoints: state.breakpoints,
-      activeBreakpoint: state?.activeBreakpoint,
-      isMobile: state?.activeBreakpoint?.name == MOBILE,
-      isPhone: state?.activeBreakpoint?.name == PHONE,
-      isTablet: state?.activeBreakpoint?.name == TABLET,
-      isDesktop: state?.activeBreakpoint?.name == DESKTOP,
+      activeBreakpoint: state.activeBreakpoint,
+      isMobile: state.activeBreakpoint.name == MOBILE,
+      isPhone: state.activeBreakpoint.name == PHONE,
+      isTablet: state.activeBreakpoint.name == TABLET,
+      isDesktop: state.activeBreakpoint.name == DESKTOP,
     );
   }
 
@@ -469,24 +469,25 @@ class ResponsiveWrapperData {
       isDesktop?.toString() +
       ")";
 
+  bool equals(String breakpointName) =>
+      activeBreakpoint.name != null && activeBreakpoint.name == breakpointName;
+
   /// Is the [scaledWidth] larger than or equal to [breakpointName]?
   /// Defaults to false if the [breakpointName] cannot be found.
-  bool isLargerThan(String breakpointName) =>
-      scaledWidth >=
-      breakpoints
-          .firstWhere((element) => element.name == breakpointName,
-              orElse: () => ResponsiveBreakpoint(breakpoint: 1073741823))
-          .breakpoint;
+  bool isLargerThan(String breakpointName) {
+    for (var i = breakpoints.length - 1; i > 0; i--) {
+      if (breakpoints[i].name == breakpointName &&
+          breakpoints[i - 1].name != breakpointName &&
+          screenWidth >= breakpoints[i - 1].breakpoint) return true;
+    }
+
+    return false;
+  }
 
   /// Is the [scaledWidth] smaller than the [breakpointName]?
   /// Defaults to false if the [breakpointName] cannot be found.
-  bool isSmallerThan(String breakpointName) {
-    return scaledWidth <
-        breakpoints
-            .firstWhere((element) => element.name == breakpointName,
-                orElse: () => ResponsiveBreakpoint(breakpoint: -1073741824))
-            .breakpoint;
-  }
+  bool isSmallerThan(String breakpointName) => breakpoints.any((element) =>
+      element.name == breakpointName && scaledWidth < element.breakpoint);
 }
 
 /// Creates an immutable widget that exposes [ResponsiveWrapperData]

test/responsive_wrapper_test.dart

@@ -514,5 +514,153 @@ void main() {
     testWidgets('Screen Size Infinite', (WidgetTester tester) async {
       // Infinite screen width or height is not allowed.
     }, skip: true);
+
+    // Test convenience comparators.
+    testWidgets('Breakpoint Comparators', (WidgetTester tester) async {
+      // Verify comparator at named breakpoint returns correct values.
+      setScreenSize(tester, Size(600, 1200));
+      Key key = UniqueKey();
+      Widget widget = MaterialApp(
+        home: ResponsiveWrapper(
+          key: key,
+          breakpoints: [
+            ResponsiveBreakpoint(breakpoint: 450, name: MOBILE),
+            ResponsiveBreakpoint(breakpoint: 500, name: MOBILE),
+            ResponsiveBreakpoint(breakpoint: 550),
+            ResponsiveBreakpoint(breakpoint: 600, name: TABLET),
+            ResponsiveBreakpoint(breakpoint: 650, name: TABLET),
+            ResponsiveBreakpoint(breakpoint: 700),
+            ResponsiveBreakpoint(breakpoint: 800, name: DESKTOP),
+          ],
+          child: Container(),
+        ),
+      );
+      await tester.pumpWidget(widget);
+      await tester.pump();
+      dynamic state = tester.state(find.byKey(key));
+      expect(ResponsiveWrapperData.fromResponsiveWrapper(state).equals(MOBILE),
+          false);
+      expect(ResponsiveWrapperData.fromResponsiveWrapper(state).equals(TABLET),
+          true);
+      expect(ResponsiveWrapperData.fromResponsiveWrapper(state).equals(DESKTOP),
+          false);
+      expect(
+          ResponsiveWrapperData.fromResponsiveWrapper(state)
+              .isLargerThan(MOBILE),
+          true);
+      expect(
+          ResponsiveWrapperData.fromResponsiveWrapper(state)
+              .isLargerThan(TABLET),
+          false);
+      expect(
+          ResponsiveWrapperData.fromResponsiveWrapper(state)
+              .isLargerThan(DESKTOP),
+          false);
+      expect(
+          ResponsiveWrapperData.fromResponsiveWrapper(state)
+              .isSmallerThan(MOBILE),
+          false);
+      expect(
+          ResponsiveWrapperData.fromResponsiveWrapper(state)
+              .isSmallerThan(TABLET),
+          true);
+      expect(
+          ResponsiveWrapperData.fromResponsiveWrapper(state)
+              .isSmallerThan(DESKTOP),
+          true);
+
+      // Verify comparator at unnamed breakpoint works correctly.
+      key = UniqueKey();
+      widget = MaterialApp(
+        home: ResponsiveWrapper(
+          key: key,
+          breakpoints: [
+            ResponsiveBreakpoint(breakpoint: 450, name: MOBILE),
+            ResponsiveBreakpoint(breakpoint: 500, name: TABLET),
+            ResponsiveBreakpoint(breakpoint: 550, name: MOBILE),
+            ResponsiveBreakpoint(breakpoint: 600),
+            ResponsiveBreakpoint(breakpoint: 650, name: TABLET),
+            ResponsiveBreakpoint(breakpoint: 700, name: DESKTOP),
+            ResponsiveBreakpoint(breakpoint: 800, name: DESKTOP),
+          ],
+          child: Container(),
+        ),
+      );
+      await tester.pumpWidget(widget);
+      await tester.pump();
+      state = tester.state(find.byKey(key));
+      expect(ResponsiveWrapperData.fromResponsiveWrapper(state).equals(MOBILE),
+          false);
+      expect(ResponsiveWrapperData.fromResponsiveWrapper(state).equals(TABLET),
+          false);
+      expect(ResponsiveWrapperData.fromResponsiveWrapper(state).equals(DESKTOP),
+          false);
+      expect(
+          ResponsiveWrapperData.fromResponsiveWrapper(state)
+              .isLargerThan(MOBILE),
+          true);
+      expect(
+          ResponsiveWrapperData.fromResponsiveWrapper(state)
+              .isLargerThan(TABLET),
+          true);
+      expect(
+          ResponsiveWrapperData.fromResponsiveWrapper(state)
+              .isLargerThan(DESKTOP),
+          false);
+      expect(
+          ResponsiveWrapperData.fromResponsiveWrapper(state)
+              .isSmallerThan(MOBILE),
+          false);
+      expect(
+          ResponsiveWrapperData.fromResponsiveWrapper(state)
+              .isSmallerThan(TABLET),
+          true);
+      expect(
+          ResponsiveWrapperData.fromResponsiveWrapper(state)
+              .isSmallerThan(DESKTOP),
+          true);
+
+      // Test largerThan upper bound.
+      key = UniqueKey();
+      widget = MaterialApp(
+        home: ResponsiveWrapper(
+          key: key,
+          breakpoints: [
+            ResponsiveBreakpoint(breakpoint: 450, name: MOBILE),
+            ResponsiveBreakpoint(breakpoint: 500, name: TABLET),
+            ResponsiveBreakpoint(breakpoint: 550, name: DESKTOP),
+            ResponsiveBreakpoint(breakpoint: 600),
+          ],
+          child: Container(),
+        ),
+      );
+      await tester.pumpWidget(widget);
+      await tester.pump();
+      state = tester.state(find.byKey(key));
+      expect(
+          ResponsiveWrapperData.fromResponsiveWrapper(state)
+              .isLargerThan(MOBILE),
+          true);
+      expect(
+          ResponsiveWrapperData.fromResponsiveWrapper(state)
+              .isLargerThan(TABLET),
+          true);
+      expect(
+          ResponsiveWrapperData.fromResponsiveWrapper(state)
+              .isLargerThan(DESKTOP),
+          true);
+      expect(
+          ResponsiveWrapperData.fromResponsiveWrapper(state)
+              .isSmallerThan(MOBILE),
+          false);
+      expect(
+          ResponsiveWrapperData.fromResponsiveWrapper(state)
+              .isSmallerThan(TABLET),
+          false);
+      expect(
+          ResponsiveWrapperData.fromResponsiveWrapper(state)
+              .isSmallerThan(DESKTOP),
+          false);
+    });
   });
 }