Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52a56a8a authored by James Mattis's avatar James Mattis
Browse files

Added flag and tests for SubscriptionPlan changes 

Adding a flag and supporting tests for changes to SubscriptionPlan to
provide a subscription status and the plan's end date if available.

Flag: com.android.internal.telephony.flags.subscription_plan_allow_status_and_end_date

Test: atest phone FrameworksTelephonyTests:SubscriptionPlanTest
Bug: 357272015
Change-Id: I25b70907eda6b3bcbf34f786ed86d64432c7331f
parent c813e78c

flags/subscription.aconfig

+8 −0
Original line number Original line Diff line number Diff line
@@ -72,3 +72,11 @@ flag { 
    purpose: PURPOSE_BUGFIX

    purpose: PURPOSE_BUGFIX

  }

  }

}

}



# OWNER=jmattis TARGET=25Q2

flag {

  name: "subscription_plan_allow_status_and_end_date"

  namespace: "telephony"

  description: "Provide APIs to retrieve the status and recurrence rule info on a subscription plan"

  bug: "357272015"

}

tests/telephonytests/src/com/android/internal/telephony/subscription/SubscriptionPlanTest.java

0 → 100644
+97 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.internal.telephony.subscription;



import static android.telephony.SubscriptionPlan.SUBSCRIPTION_STATUS_ACTIVE;



import static com.google.common.truth.Truth.assertThat;



import static org.junit.Assert.assertNull;

import static org.junit.Assert.assertThrows;



import android.platform.test.annotations.RequiresFlagsEnabled;

import android.telephony.SubscriptionPlan;

import android.testing.AndroidTestingRunner;



import com.android.internal.telephony.flags.Flags;



import org.junit.Test;

import org.junit.runner.RunWith;



import java.time.Period;

import java.time.ZonedDateTime;



@RunWith(AndroidTestingRunner.class)

public class SubscriptionPlanTest {

    private static final ZonedDateTime ZONED_DATE_TIME_START =

            ZonedDateTime.parse("2007-03-14T00:00:00.000Z");



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_SUBSCRIPTION_PLAN_ALLOW_STATUS_AND_END_DATE)

    public void testBuilderExpirationDateSetsCorrectly() {

        ZonedDateTime endDate = ZonedDateTime.parse("2024-11-07T00:00:00.000Z");



        SubscriptionPlan planNonRecurring = SubscriptionPlan.Builder

                .createNonrecurring(ZONED_DATE_TIME_START, endDate)

                .setTitle("unit test")

                .build();

        SubscriptionPlan planRecurring = SubscriptionPlan.Builder

                .createRecurring(ZONED_DATE_TIME_START, Period.ofMonths(1))

                .setTitle("unit test")

                .build();



        assertThat(planNonRecurring.getPlanEndDate()).isEqualTo(endDate);

        assertNull(planRecurring.getPlanEndDate());

    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_SUBSCRIPTION_PLAN_ALLOW_STATUS_AND_END_DATE)

    public void testBuilderValidSubscriptionStatusSetsCorrectly() {

        @SubscriptionPlan.SubscriptionStatus int status = SUBSCRIPTION_STATUS_ACTIVE;



        SubscriptionPlan plan = SubscriptionPlan.Builder

                .createRecurring(ZONED_DATE_TIME_START, Period.ofMonths(1))

                .setSubscriptionStatus(status)

                .setTitle("unit test")

                .build();



        assertThat(plan.getSubscriptionStatus()).isEqualTo(status);

    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_SUBSCRIPTION_PLAN_ALLOW_STATUS_AND_END_DATE)

    public void testBuilderInvalidSubscriptionStatusThrowsError() {

        int minInvalid = -1;

        int maxInvalid = 5;



        assertThrows(IllegalArgumentException.class, () -> {

            SubscriptionPlan.Builder

                    .createRecurring(ZONED_DATE_TIME_START, Period.ofMonths(1))

                    .setSubscriptionStatus(minInvalid)

                    .setTitle("unit test")

                    .build();

        });



        assertThrows(IllegalArgumentException.class, () -> {

            SubscriptionPlan.Builder

                    .createRecurring(ZONED_DATE_TIME_START, Period.ofMonths(1))

                    .setSubscriptionStatus(maxInvalid)

                    .setTitle("unit test")

                    .build();

        });

    }

}