add harmony unittest

Author: sunnylqm

.claude/settings.local.json

@@ -0,0 +1,8 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(./scripts/test-patch-core.sh:*)",
+      "Bash(bun test:*)"
+    ]
+  }
+}

Example/harmony_use_pushy/harmony/entry/src/ohosTest/ets/test/Ability.test.ets

@@ -1,35 +1,36 @@
+import { describe, beforeAll, it, expect } from '@ohos/hypium';
 import { hilog } from '@kit.PerformanceAnalysisKit';
-import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium';
+import { abilityDelegatorRegistry } from '@kit.TestKit';
+
+const TAG = 'AbilityTest';
+const delegator = abilityDelegatorRegistry.getAbilityDelegator();
 
 export default function abilityTest() {
-  describe('ActsAbilityTest', () => {
-    // Defines a test suite. Two parameters are supported: test suite name and test suite function.
-    beforeAll(() => {
-      // Presets an action, which is performed only once before all test cases of the test suite start.
-      // This API supports only one parameter: preset action function.
-    })
-    beforeEach(() => {
-      // Presets an action, which is performed before each unit test case starts.
-      // The number of execution times is the same as the number of test cases defined by **it**.
-      // This API supports only one parameter: preset action function.
-    })
-    afterEach(() => {
-      // Presets a clear action, which is performed after each unit test case ends.
-      // The number of execution times is the same as the number of test cases defined by **it**.
-      // This API supports only one parameter: clear action function.
-    })
-    afterAll(() => {
-      // Presets a clear action, which is performed after all test cases of the test suite end.
-      // This API supports only one parameter: clear action function.
-    })
-    it('assertContain', 0, () => {
-      // Defines a test case. This API supports three parameters: test case name, filter parameter, and test case function.
-      hilog.info(0x0000, 'testTag', '%{public}s', 'it begin');
-      let a = 'abc';
-      let b = 'b';
-      // Defines a variety of assertion methods, which are used to declare expected boolean conditions.
-      expect(a).assertContain(b);
-      expect(a).assertEqual(a);
-    })
-  })
-}
+  describe('AbilityLaunchTest', () => {
+    beforeAll(async () => {
+      hilog.info(0x0000, TAG, 'AbilityLaunchTest beforeAll');
+      const want = {
+        bundleName: 'com.example.harmony_use_pushy',
+        abilityName: 'EntryAbility',
+      };
+      await delegator.startAbility(want);
+      // Allow the RN surface time to initialize
+      await new Promise<void>(resolve => setTimeout(resolve, 3000));
+    });
+
+    it('ability should launch successfully', 0, async () => {
+      hilog.info(0x0000, TAG, 'checking ability launch');
+      const currentAbility = delegator.getCurrentTopAbility();
+      expect(currentAbility).assertNotNull();
+      hilog.info(0x0000, TAG, 'ability launched: %{public}s', JSON.stringify(currentAbility.context?.abilityInfo?.name));
+    });
+
+    it('ability context should have valid filesDir', 0, async () => {
+      const currentAbility = delegator.getCurrentTopAbility();
+      const context = currentAbility.context;
+      expect(context).assertNotNull();
+      expect(context.filesDir).assertContain('/files');
+      hilog.info(0x0000, TAG, 'filesDir: %{public}s', context.filesDir);
+    });
+  });
+}

Example/harmony_use_pushy/harmony/entry/src/ohosTest/ets/test/List.test.ets

@@ -1,5 +1,7 @@
 import abilityTest from './Ability.test';
+import pushyIntegrationTest from './PushyIntegration.test';
 
 export default function testsuite() {
   abilityTest();
-}
+  pushyIntegrationTest();
+}

Example/harmony_use_pushy/harmony/entry/src/ohosTest/ets/test/PushyIntegration.test.ets

@@ -0,0 +1,106 @@
+import { describe, beforeAll, it, expect } from '@ohos/hypium';
+import { hilog } from '@kit.PerformanceAnalysisKit';
+import { abilityDelegatorRegistry } from '@kit.TestKit';
+import preferences from '@ohos.data.preferences';
+
+const TAG = 'PushyIntegrationTest';
+const delegator = abilityDelegatorRegistry.getAbilityDelegator();
+
+export default function pushyIntegrationTest() {
+  describe('PushyIntegrationTest', () => {
+    let context: Context;
+
+    beforeAll(async () => {
+      hilog.info(0x0000, TAG, 'PushyIntegrationTest beforeAll');
+      const want = {
+        bundleName: 'com.example.harmony_use_pushy',
+        abilityName: 'EntryAbility',
+      };
+      await delegator.startAbility(want);
+      await new Promise<void>(resolve => setTimeout(resolve, 3000));
+      const ability = delegator.getCurrentTopAbility();
+      context = ability.context;
+    });
+
+    it('update preferences should be writable and readable', 0, async () => {
+      hilog.info(0x0000, TAG, 'testing preferences read/write');
+      const prefs = preferences.getPreferencesSync(context, {
+        name: 'pushy_integration_test',
+      });
+
+      prefs.putSync('testKey', 'testValue');
+      prefs.flush();
+
+      const value = prefs.getSync('testKey', '') as string;
+      expect(value).assertEqual('testValue');
+
+      // Clean up
+      prefs.deleteSync('testKey');
+      prefs.flush();
+      hilog.info(0x0000, TAG, 'preferences test passed');
+    });
+
+    it('update root directory should be creatable', 0, async () => {
+      hilog.info(0x0000, TAG, 'testing update root directory');
+      const updateRoot = context.filesDir + '/_update_test';
+      const fileIo = await import('@ohos.file.fs');
+
+      // Ensure clean state
+      try {
+        if (fileIo.default.accessSync(updateRoot)) {
+          fileIo.default.rmdirSync(updateRoot);
+        }
+      } catch {}
+
+      fileIo.default.mkdirSync(updateRoot);
+      const exists = fileIo.default.accessSync(updateRoot);
+      expect(exists).assertTrue();
+
+      // Clean up
+      fileIo.default.rmdirSync(updateRoot);
+      hilog.info(0x0000, TAG, 'update root directory test passed');
+    });
+
+    it('hash info round-trip through preferences', 0, async () => {
+      hilog.info(0x0000, TAG, 'testing hash info round-trip');
+      const prefs = preferences.getPreferencesSync(context, {
+        name: 'pushy_integration_test',
+      });
+
+      const hashInfo = JSON.stringify({ name: 'v1', description: 'test version' });
+      const key = 'hash_test123';
+
+      prefs.putSync(key, hashInfo);
+      prefs.flush();
+
+      const retrieved = prefs.getSync(key, '') as string;
+      expect(retrieved).assertEqual(hashInfo);
+
+      const parsed = JSON.parse(retrieved);
+      expect(parsed.name).assertEqual('v1');
+      expect(parsed.description).assertEqual('test version');
+
+      // Clean up
+      prefs.deleteSync(key);
+      prefs.flush();
+      hilog.info(0x0000, TAG, 'hash info round-trip test passed');
+    });
+
+    it('initial state should have no current version', 0, async () => {
+      hilog.info(0x0000, TAG, 'testing initial state');
+      const prefs = preferences.getPreferencesSync(context, {
+        name: 'pushy_initial_state_test',
+      });
+
+      const currentVersion = prefs.getSync('currentVersion', '') as string;
+      expect(currentVersion).assertEqual('');
+
+      const firstTime = prefs.getSync('firstTime', false) as boolean;
+      expect(firstTime).assertEqual(false);
+
+      // Clean up
+      preferences.deletePreferences(context, { name: 'pushy_initial_state_test' });
+      hilog.info(0x0000, TAG, 'initial state test passed');
+    });
+  });
+}

Example/harmony_use_pushy/harmony/entry/src/test/LocalUnit.test.ets

@@ -1,33 +1,31 @@
-import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium';
+import { describe, it, expect } from '@ohos/hypium';
 
 export default function localUnitTest() {
   describe('localUnitTest', () => {
-    // Defines a test suite. Two parameters are supported: test suite name and test suite function.
-    beforeAll(() => {
-      // Presets an action, which is performed only once before all test cases of the test suite start.
-      // This API supports only one parameter: preset action function.
+    it('JSON parse round-trip for update manifest', 0, () => {
+      const manifest = {
+        copies: { 'assets/icon.png': 'assets/original.png' },
+        deletes: ['assets/old.png'],
+      };
+      const serialized = JSON.stringify(manifest);
+      const parsed = JSON.parse(serialized);
+      expect(parsed.copies['assets/icon.png']).assertEqual('assets/original.png');
+      expect(parsed.deletes[0]).assertEqual('assets/old.png');
     });
-    beforeEach(() => {
-      // Presets an action, which is performed before each unit test case starts.
-      // The number of execution times is the same as the number of test cases defined by **it**.
-      // This API supports only one parameter: preset action function.
-    });
-    afterEach(() => {
-      // Presets a clear action, which is performed after each unit test case ends.
-      // The number of execution times is the same as the number of test cases defined by **it**.
-      // This API supports only one parameter: clear action function.
-    });
-    afterAll(() => {
-      // Presets a clear action, which is performed after all test cases of the test suite end.
-      // This API supports only one parameter: clear action function.
+
+    it('version string comparison works correctly', 0, () => {
+      const v1 = '1.0.0';
+      const v2 = '1.0.0';
+      const v3 = '2.0.0';
+      expect(v1 === v2).assertEqual(true);
+      expect(v1 === v3).assertEqual(false);
     });
-    it('assertContain', 0, () => {
-      // Defines a test case. This API supports three parameters: test case name, filter parameter, and test case function.
-      let a = 'abc';
-      let b = 'b';
-      // Defines a variety of assertion methods, which are used to declare expected boolean conditions.
-      expect(a).assertContain(b);
-      expect(a).assertEqual(a);
+
+    it('hash string concatenation for kv keys', 0, () => {
+      const hash = 'abc123';
+      const key = `hash_${hash}`;
+      expect(key).assertEqual('hash_abc123');
+      expect(key).assertContain('hash_');
     });
   });
-}
+}

cpp/patch_core/tests/patch_core_test.cpp

@@ -442,6 +442,74 @@ void TestArchivePatchCoreSupportsCustomBundlePatchEntry() {
   ExpectEq(plan.merge_source_subdir, "", "custom bundle patch merge subdir mismatch");
 }
 
+void TestArchivePatchCoreHarmonyBundlePatchFromPackage() {
+  PatchManifest manifest;
+  manifest.copies.push_back(CopyOperation{"assets/a.png", "assets/b.png"});
+
+  pushy::archive_patch::ArchivePatchPlan plan;
+  Status status = pushy::archive_patch::BuildArchivePatchPlan(
+      pushy::archive_patch::ArchivePatchType::kPatchFromPackage,
+      manifest,
+      {"__diff.json", "bundle.harmony.js.patch", "assets/new.png"},
+      &plan,
+      "bundle.harmony.js.patch");
+  Expect(status.ok, status.message);
+  Expect(plan.enable_merge, "harmony package plan should enable merge");
+  ExpectEq(plan.merge_source_subdir, "assets", "harmony package merge subdir should be assets");
+
+  // ppk variant uses empty merge subdir
+  pushy::archive_patch::ArchivePatchPlan ppk_plan;
+  status = pushy::archive_patch::BuildArchivePatchPlan(
+      pushy::archive_patch::ArchivePatchType::kPatchFromPpk,
+      manifest,
+      {"__diff.json", "bundle.harmony.js.patch", "assets/new.png"},
+      &ppk_plan,
+      "bundle.harmony.js.patch");
+  Expect(status.ok, status.message);
+  Expect(ppk_plan.enable_merge, "harmony ppk plan should enable merge");
+  ExpectEq(ppk_plan.merge_source_subdir, "", "harmony ppk merge subdir should be empty");
+}
+
+void TestStateCoreRollbackToEmptyVersion() {
+  State state;
+  state.current_version = "current";
+  state.last_version = "";
+  state.first_time = false;
+  state.first_time_ok = true;
+
+  State rolled = pushy::state::Rollback(state);
+  Expect(rolled.current_version.empty(), "rollback with empty last should clear current");
+  Expect(rolled.last_version.empty(), "last_version should remain empty");
+  ExpectEq(rolled.rolled_back_version, "current", "rolled_back_version should record original");
+  Expect(!rolled.first_time, "first_time should be false after rollback");
+  Expect(rolled.first_time_ok, "first_time_ok should be true after rollback");
+}
+
+void TestStateCoreResolveLaunchNoCurrentVersion() {
+  State state;
+  state.current_version = "";
+  state.first_time = false;
+  state.first_time_ok = true;
+
+  LaunchDecision decision = pushy::state::ResolveLaunchState(state, false, true);
+  Expect(decision.load_version.empty(), "empty current should yield empty load_version");
+  Expect(!decision.did_rollback, "should not rollback when no current version");
+  Expect(!decision.consumed_first_time, "should not consume first_time when no current version");
+}
+
+void TestStateCoreSwitchToSameVersion() {
+  State state;
+  state.package_version = "1.0.0";
+  state.current_version = "same_hash";
+  state.last_version = "old_hash";
+
+  State switched = pushy::state::SwitchVersion(state, "same_hash");
+  ExpectEq(switched.current_version, "same_hash", "current should remain same_hash");
+  ExpectEq(switched.last_version, "old_hash", "last_version should not change when switching to same");
+  Expect(switched.first_time, "first_time should be set even when switching to same");
+  Expect(!switched.first_time_ok, "first_time_ok should be false");
+}
+
 }  // namespace
 
 int main() {
@@ -457,6 +525,10 @@ int main() {
       {"ArchivePatchCoreBuildPlanAndCopyGroups", TestArchivePatchCoreBuildPlanAndCopyGroups},
       {"ArchivePatchCoreRejectsMissingEntries", TestArchivePatchCoreRejectsMissingEntries},
       {"ArchivePatchCoreSupportsCustomBundlePatchEntry", TestArchivePatchCoreSupportsCustomBundlePatchEntry},
+      {"ArchivePatchCoreHarmonyBundlePatchFromPackage", TestArchivePatchCoreHarmonyBundlePatchFromPackage},
+      {"StateCoreRollbackToEmptyVersion", TestStateCoreRollbackToEmptyVersion},
+      {"StateCoreResolveLaunchNoCurrentVersion", TestStateCoreResolveLaunchNoCurrentVersion},
+      {"StateCoreSwitchToSameVersion", TestStateCoreSwitchToSameVersion},
   };
 
   for (const auto& test : tests) {

harmony/pushy/build-profile.json5

@@ -10,6 +10,9 @@
   "targets": [
     {
       "name": "default",
+    },
+    {
+      "name": "ohosTest",
     }
   ]
 }

harmony/pushy/oh-package.json5

@@ -1,7 +1,9 @@
 {
   license: 'MIT',
   types: '',
-  devDependencies: {},
+  devDependencies: {
+    '@ohos/hypium': '1.0.19',
+  },
   name: 'pushy',
   description: '',
   main: 'index.ets',

harmony/pushy/src/main/ets/PushyTurboModule.ts

@@ -185,7 +185,7 @@ export class PushyTurboModule extends UITurboModule {
       this.context.markSuccess();
       return true;
     } catch (error) {
-      logger.error(TAG, `markSuccess failed: ${this.getErrorMessage(error)}`);
+      logger.error(TAG, `markSuccess failed: ${getErrorMessage(error)}`);
       throw error;
     }
   }