From 32118f6690a5677b509b08730b896304150d4d63 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Wed, 25 Apr 2018 15:19:47 -0700 Subject: Rename the dir for SystemUpdaterSample. Also replace the occurrence in README.md and PREUPLOAD.cfg. Test: mmma -j bootable/recovery Change-Id: I04c0ef00dd64f49e008ad2a4a2c1e8eaed76bf8d --- .../systemupdatersample/UpdateConfigTest.java | 79 -------------- .../systemupdatersample/ui/MainActivityTest.java | 48 --------- .../systemupdatersample/util/PayloadSpecsTest.java | 117 --------------------- .../util/UpdateConfigsTest.java | 63 ----------- 4 files changed, 307 deletions(-) delete mode 100644 sample_updater/tests/src/com/example/android/systemupdatersample/UpdateConfigTest.java delete mode 100644 sample_updater/tests/src/com/example/android/systemupdatersample/ui/MainActivityTest.java delete mode 100644 sample_updater/tests/src/com/example/android/systemupdatersample/util/PayloadSpecsTest.java delete mode 100644 sample_updater/tests/src/com/example/android/systemupdatersample/util/UpdateConfigsTest.java (limited to 'sample_updater/tests/src/com/example') diff --git a/sample_updater/tests/src/com/example/android/systemupdatersample/UpdateConfigTest.java b/sample_updater/tests/src/com/example/android/systemupdatersample/UpdateConfigTest.java deleted file mode 100644 index 87153715e..000000000 --- a/sample_updater/tests/src/com/example/android/systemupdatersample/UpdateConfigTest.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (C) 2018 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.example.android.systemupdatersample; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; - -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; - -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.junit.runner.RunWith; - -/** - * Tests for {@link UpdateConfig} - */ -@RunWith(AndroidJUnit4.class) -@SmallTest -public class UpdateConfigTest { - - private static final String JSON_NON_STREAMING = - "{\"name\": \"vip update\", \"url\": \"file:///builds/a.zip\", " - + " \"type\": \"NON_STREAMING\"}"; - - private static final String JSON_STREAMING = - "{\"name\": \"vip update 2\", \"url\": \"http://foo.bar/a.zip\", " - + "\"type\": \"STREAMING\"}"; - - @Rule - public final ExpectedException thrown = ExpectedException.none(); - - @Test - public void fromJson_parsesJsonConfigWithoutMetadata() throws Exception { - UpdateConfig config = UpdateConfig.fromJson(JSON_NON_STREAMING); - assertEquals("name is parsed", "vip update", config.getName()); - assertEquals("stores raw json", JSON_NON_STREAMING, config.getRawJson()); - assertSame("type is parsed", UpdateConfig.TYPE_NON_STREAMING, config.getInstallType()); - assertEquals("url is parsed", "file:///builds/a.zip", config.getUrl()); - } - - @Test - public void getUpdatePackageFile_throwsErrorIfStreaming() throws Exception { - UpdateConfig config = UpdateConfig.fromJson(JSON_STREAMING); - thrown.expect(RuntimeException.class); - config.getUpdatePackageFile(); - } - - @Test - public void getUpdatePackageFile_throwsErrorIfNotAFile() throws Exception { - String json = "{\"name\": \"upd\", \"url\": \"http://foo.bar\"," - + " \"type\": \"NON_STREAMING\"}"; - UpdateConfig config = UpdateConfig.fromJson(json); - thrown.expect(RuntimeException.class); - config.getUpdatePackageFile(); - } - - @Test - public void getUpdatePackageFile_works() throws Exception { - UpdateConfig c = UpdateConfig.fromJson(JSON_NON_STREAMING); - assertEquals("correct path", "/builds/a.zip", c.getUpdatePackageFile().getAbsolutePath()); - } - -} diff --git a/sample_updater/tests/src/com/example/android/systemupdatersample/ui/MainActivityTest.java b/sample_updater/tests/src/com/example/android/systemupdatersample/ui/MainActivityTest.java deleted file mode 100644 index 01014168a..000000000 --- a/sample_updater/tests/src/com/example/android/systemupdatersample/ui/MainActivityTest.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2018 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.example.android.systemupdatersample.ui; - -import static org.junit.Assert.assertNotNull; - -import android.support.test.filters.MediumTest; -import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; - -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; - -/** - * Make sure that the main launcher activity opens up properly, which will be - * verified by {@link #activityLaunches}. - */ -@RunWith(AndroidJUnit4.class) -@MediumTest -public class MainActivityTest { - - @Rule - public final ActivityTestRule mActivityRule = - new ActivityTestRule<>(MainActivity.class); - - /** - * Verifies that the activity under test can be launched. - */ - @Test - public void activityLaunches() { - assertNotNull(mActivityRule.getActivity()); - } -} diff --git a/sample_updater/tests/src/com/example/android/systemupdatersample/util/PayloadSpecsTest.java b/sample_updater/tests/src/com/example/android/systemupdatersample/util/PayloadSpecsTest.java deleted file mode 100644 index 6f06ca3e1..000000000 --- a/sample_updater/tests/src/com/example/android/systemupdatersample/util/PayloadSpecsTest.java +++ /dev/null @@ -1,117 +0,0 @@ -/* - * Copyright (C) 2018 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.example.android.systemupdatersample.util; - -import static com.example.android.systemupdatersample.util.PackagePropertyFiles.PAYLOAD_BINARY_FILE_NAME; -import static com.example.android.systemupdatersample.util.PackagePropertyFiles.PAYLOAD_PROPERTIES_FILE_NAME; - -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; - -import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; - -import com.example.android.systemupdatersample.PayloadSpec; - -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.junit.runner.RunWith; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.util.zip.CRC32; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; - -/** - * Tests if PayloadSpecs parses update package zip file correctly. - */ -@RunWith(AndroidJUnit4.class) -@SmallTest -public class PayloadSpecsTest { - - private static final String PROPERTIES_CONTENTS = "k1=val1\nkey2=val2"; - private static final String PAYLOAD_CONTENTS = "hello\nworld"; - private static final int PAYLOAD_SIZE = PAYLOAD_CONTENTS.length(); - - private File mTestDir; - - private Context mContext; - - @Rule - public final ExpectedException thrown = ExpectedException.none(); - - @Before - public void setUp() { - mContext = InstrumentationRegistry.getTargetContext(); - - mTestDir = mContext.getFilesDir(); - } - - @Test - public void forNonStreaming_works() throws Exception { - File packageFile = createMockZipFile(); - PayloadSpec spec = PayloadSpecs.forNonStreaming(packageFile); - - assertEquals("correct url", "file://" + packageFile.getAbsolutePath(), spec.getUrl()); - assertEquals("correct payload offset", - 30 + PAYLOAD_BINARY_FILE_NAME.length(), spec.getOffset()); - assertEquals("correct payload size", PAYLOAD_SIZE, spec.getSize()); - assertArrayEquals("correct properties", - new String[]{"k1=val1", "key2=val2"}, spec.getProperties().toArray(new String[0])); - } - - @Test - public void forNonStreaming_IOException() throws Exception { - thrown.expect(IOException.class); - PayloadSpecs.forNonStreaming(new File("/fake/news.zip")); - } - - /** - * Creates package zip file that contains payload.bin and payload_properties.txt - */ - private File createMockZipFile() throws IOException { - File testFile = new File(mTestDir, "test.zip"); - try (ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(testFile))) { - // Add payload.bin entry. - ZipEntry entry = new ZipEntry(PAYLOAD_BINARY_FILE_NAME); - entry.setMethod(ZipEntry.STORED); - entry.setCompressedSize(PAYLOAD_SIZE); - entry.setSize(PAYLOAD_SIZE); - CRC32 crc = new CRC32(); - crc.update(PAYLOAD_CONTENTS.getBytes(StandardCharsets.UTF_8)); - entry.setCrc(crc.getValue()); - zos.putNextEntry(entry); - zos.write(PAYLOAD_CONTENTS.getBytes(StandardCharsets.UTF_8)); - zos.closeEntry(); - - // Add payload properties entry. - ZipEntry propertiesEntry = new ZipEntry(PAYLOAD_PROPERTIES_FILE_NAME); - zos.putNextEntry(propertiesEntry); - zos.write(PROPERTIES_CONTENTS.getBytes(StandardCharsets.UTF_8)); - zos.closeEntry(); - } - return testFile; - } - -} diff --git a/sample_updater/tests/src/com/example/android/systemupdatersample/util/UpdateConfigsTest.java b/sample_updater/tests/src/com/example/android/systemupdatersample/util/UpdateConfigsTest.java deleted file mode 100644 index 4aa8c6453..000000000 --- a/sample_updater/tests/src/com/example/android/systemupdatersample/util/UpdateConfigsTest.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (C) 2018 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.example.android.systemupdatersample.util; - -import static org.junit.Assert.assertArrayEquals; - -import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; - -import com.example.android.systemupdatersample.UpdateConfig; - -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.junit.runner.RunWith; - -import java.util.Arrays; -import java.util.List; - -/** - * Tests for {@link UpdateConfigs} - */ -@RunWith(AndroidJUnit4.class) -@SmallTest -public class UpdateConfigsTest { - - private Context mContext; - - @Rule - public final ExpectedException thrown = ExpectedException.none(); - - @Before - public void setUp() { - mContext = InstrumentationRegistry.getTargetContext(); - } - - @Test - public void configsToNames_extractsNames() { - List configs = Arrays.asList( - new UpdateConfig("blah", "http://", UpdateConfig.TYPE_NON_STREAMING), - new UpdateConfig("blah 2", "http://", UpdateConfig.TYPE_STREAMING) - ); - String[] names = UpdateConfigs.configsToNames(configs); - assertArrayEquals(new String[] {"blah", "blah 2"}, names); - } -} -- cgit v1.2.3