AutoScaleDown Tests Update

*Update AutoScaleDown tests to support simplified behavior.

Author: rayliverified

lib/responsive_wrapper.dart

@@ -867,6 +867,10 @@ List<ResponsiveBreakpointSegment> getBreakpointSegments(
                   ? ResponsiveBreakpointBehavior.AUTOSCALE
                   : defaultBreakpoint.behavior)));
 
+  // A counter to keep track of the actual number of added breakpoints.
+  // Needed because breakpoints are merged so not every
+  // for-loop iteration adds a breakpoint segment.
+  int breakpointCounter = 0;
   // Calculate segments from breakpoints.
   for (int i = 0; i < breakpointsHolder.length; i++) {
     // Convenience variable.
@@ -886,7 +890,7 @@ List<ResponsiveBreakpointSegment> getBreakpointSegments(
         // AutoScaleDown needs to override the breakpoint
         // interval because responsive calculations are
         // performed from 0 - ∞.
-        int overrideBreakpointIndex = i;
+        int overrideBreakpointIndex = breakpointCounter;
         ResponsiveBreakpointSegment overrideBreakpointSegment =
             breakpointSegments[overrideBreakpointIndex];
         overrideBreakpointSegment = overrideBreakpointSegment.copyWith(
@@ -921,6 +925,7 @@ List<ResponsiveBreakpointSegment> getBreakpointSegments(
       continue;
     }
     breakpointSegments.add(breakpointSegmentHolder);
+    breakpointCounter += 1;
   }
 
   // Add tags to segments.

pubspec.yaml

@@ -1,6 +1,6 @@
 name: responsive_framework
 description: Easily make Flutter apps responsive. Automatically adapt UI to different screen sizes. Responsiveness made simple.
-version: 0.0.8
+version: 0.0.9
 homepage: https://codelessly.com
 repository: https://github.com/Codelessly/ResponsiveFramework
 issue_tracker: https://github.com/Codelessly/ResponsiveFramework/issues

test/responsive_breakpoint_test.dart

@@ -386,24 +386,16 @@ void main() {
               breakpoint: 0,
               segmentType: ResponsiveBreakpointBehavior.AUTOSCALE,
               responsiveBreakpoint: ResponsiveBreakpoint.autoScale(450)));
-      // Split the width between AutoScale and AutoScaleDown
-      // into two segments.
+      // Override AutoScale with AutoScaleDown breakpoint value.
       expect(
           responsiveBreakpointSegments[1],
           ResponsiveBreakpointSegment(
               breakpoint: 450,
               segmentType: ResponsiveBreakpointBehavior.AUTOSCALE,
-              responsiveBreakpoint: ResponsiveBreakpoint.autoScale(450)));
-      // Constructed midway breakpoint.
-      expect(
-          responsiveBreakpointSegments[2],
-          ResponsiveBreakpointSegment(
-              breakpoint: 525,
-              segmentType: ResponsiveBreakpointBehavior.AUTOSCALEDOWN,
               responsiveBreakpoint: ResponsiveBreakpoint.autoScale(600)));
       // AutoScale behavior from 600 -  ∞.
       expect(
-          responsiveBreakpointSegments[3],
+          responsiveBreakpointSegments[2],
           ResponsiveBreakpointSegment(
               breakpoint: 600,
               segmentType: ResponsiveBreakpointBehavior.AUTOSCALEDOWN,
@@ -455,34 +447,31 @@ void main() {
               breakpoint: 0,
               segmentType: ResponsiveBreakpointBehavior.AUTOSCALE,
               responsiveBreakpoint: ResponsiveBreakpoint.autoScale(320)));
+      // AutoScaleDown breakpoint.
       expect(
           responsiveBreakpointSegments[1],
           ResponsiveBreakpointSegment(
               breakpoint: 320,
               segmentType: ResponsiveBreakpointBehavior.AUTOSCALEDOWN,
               responsiveBreakpoint: ResponsiveBreakpoint.autoScale(320)));
+      // AutoScaleDown from 600.
       expect(
           responsiveBreakpointSegments[2],
           ResponsiveBreakpointSegment(
               breakpoint: 450,
               segmentType: ResponsiveBreakpointBehavior.AUTOSCALE,
-              responsiveBreakpoint: ResponsiveBreakpoint.autoScale(450)));
-      // Constructed midway segment between 450 and 600.
-      // AutoScaleDown from 600.
-      expect(
-          responsiveBreakpointSegments[3],
-          ResponsiveBreakpointSegment(
-              breakpoint: 525,
-              segmentType: ResponsiveBreakpointBehavior.AUTOSCALEDOWN,
               responsiveBreakpoint: ResponsiveBreakpoint.autoScale(600)));
+      // AutoScale from 600 - ∞.
       expect(
-          responsiveBreakpointSegments[4],
+          responsiveBreakpointSegments[3],
           ResponsiveBreakpointSegment(
               breakpoint: 600,
               segmentType: ResponsiveBreakpointBehavior.AUTOSCALEDOWN,
               responsiveBreakpoint: ResponsiveBreakpoint.autoScale(600)));
     });
     test('AutoScaleDown AutoScale Override', () {
+      // This test also test correct merge count because the
+      // first breakpoint is merged with the default breakpoint.
       ResponsiveBreakpoint defaultBreakpoint =
           ResponsiveBreakpoint.autoScale(450);
       List<ResponsiveBreakpoint> responsiveBreakpoints = [
@@ -549,33 +538,28 @@ void main() {
           ResponsiveBreakpointSegment(
               breakpoint: 420,
               segmentType: ResponsiveBreakpointBehavior.AUTOSCALE,
-              responsiveBreakpoint: ResponsiveBreakpoint.autoScale(420)));
+              responsiveBreakpoint: ResponsiveBreakpoint.autoScale(450)));
       expect(
           responsiveBreakpointSegments[5],
           ResponsiveBreakpointSegment(
-              breakpoint: 430.0,
+              breakpoint: 430,
               segmentType: ResponsiveBreakpointBehavior.TAG,
               responsiveBreakpoint:
-                  ResponsiveBreakpoint.autoScale(420.0, name: 'DEFAULT')));
+                  ResponsiveBreakpoint.autoScale(450, name: 'DEFAULT')));
       expect(
           responsiveBreakpointSegments[6],
-          ResponsiveBreakpointSegment(
-              breakpoint: 435,
-              segmentType: ResponsiveBreakpointBehavior.AUTOSCALEDOWN,
-              responsiveBreakpoint: ResponsiveBreakpoint.autoScale(450)));
-      expect(
-          responsiveBreakpointSegments[7],
           ResponsiveBreakpointSegment(
               breakpoint: 440.0,
               segmentType: ResponsiveBreakpointBehavior.TAG,
               responsiveBreakpoint:
-                  ResponsiveBreakpoint.autoScale(450.0, name: 'PHONE')));
+                  ResponsiveBreakpoint.autoScale(450, name: 'PHONE')));
       expect(
-          responsiveBreakpointSegments[8],
+          responsiveBreakpointSegments[7],
           ResponsiveBreakpointSegment(
               breakpoint: 450,
               segmentType: ResponsiveBreakpointBehavior.AUTOSCALEDOWN,
               responsiveBreakpoint: ResponsiveBreakpoint.autoScale(450)));
+      expect(responsiveBreakpointSegments.length, 8);
     });
     test('AutoScaleDown AutoScaleDown', () {
       ResponsiveBreakpoint defaultBreakpoint = ResponsiveBreakpoint.resize(600);