Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't depend on annotation processors XmlWriter." am: e6d84c0d97 am: f4eddd99c1

Browse Source 
Change-Id: I5ecbf03a48eb9b50cfc06bfdbf86b20d7024e9aa
This commit is contained in:
Automerger Merge Worker
2019-12-18 08:37:18 +00:00
parent 57f0391e52 f4eddd99c1
commit 7b49bf18e5
2 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/tests/servicestests/Android.bp
View File

@@ -40,7 +40,6 @@ android_test {
"platformprotosnano",
"hamcrest-library",
"servicestests-utils",
"xml-writer-device-lib",
],
aidl: {

51
services/tests/servicestests/src/com/android/server/compat/CompatConfigTest.java
View File

@@ -22,15 +22,13 @@ import android.content.pm.ApplicationInfo;
import androidx.test.runner.AndroidJUnit4;
import com.android.compat.annotation.Change;
import com.android.compat.annotation.XmlWriter;
import org.junit.Test;
import org.junit.runner.RunWith;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.util.UUID;
@RunWith(AndroidJUnit4.class)
@@ -50,18 +48,10 @@ public class CompatConfigTest {
return dir;
}
private void writeChangesToFile(Change[] changes, File f) {
XmlWriter writer = new XmlWriter();
for (Change change: changes) {
writer.addChange(change);
}
try {
f.createNewFile();
writer.write(new FileOutputStream(f));
} catch (IOException e) {
throw new RuntimeException(
"Encountered an error while writing compat config file", e);
}
private void writeToFile(File dir, String filename, String content) throws IOException {
OutputStream os = new FileOutputStream(new File(dir, filename));
os.write(content.getBytes());
os.close();
}
@Test
@@ -173,13 +163,15 @@ public class CompatConfigTest {
}
@Test
public void testReadConfig() {
Change[] changes = {new Change(1234L, "MY_CHANGE1", false, 2, null), new Change(1235L,
"MY_CHANGE2", true, null, "description"), new Change(1236L, "MY_CHANGE3", false,
null, "")};
public void testReadConfig() throws IOException {
String configXml = "<config>"
+ "<compat-change id=\"1234\" name=\"MY_CHANGE1\" enableAfterTargetSdk=\"2\" />"
+ "<compat-change id=\"1235\" name=\"MY_CHANGE2\" disabled=\"true\" />"
+ "<compat-change id=\"1236\" name=\"MY_CHANGE3\" />"
+ "</config>";
File dir = createTempDir();
writeChangesToFile(changes, new File(dir.getPath() + "/platform_compat_config.xml"));
writeToFile(dir, "platform_compat_config.xml", configXml);
CompatConfig pc = new CompatConfig();
pc.initConfigFromLib(dir);
@@ -191,17 +183,18 @@ public class CompatConfigTest {
}
@Test
public void testReadConfigMultipleFiles() {
Change[] changes1 = {new Change(1234L, "MY_CHANGE1", false, 2, null)};
Change[] changes2 = {new Change(1235L, "MY_CHANGE2", true, null, ""), new Change(1236L,
"MY_CHANGE3", false, null, null)};
public void testReadConfigMultipleFiles() throws IOException {
String configXml1 = "<config>"
+ "<compat-change id=\"1234\" name=\"MY_CHANGE1\" enableAfterTargetSdk=\"2\" />"
+ "</config>";
String configXml2 = "<config>"
+ "<compat-change id=\"1235\" name=\"MY_CHANGE2\" disabled=\"true\" />"
+ "<compat-change id=\"1236\" name=\"MY_CHANGE3\" />"
+ "</config>";
File dir = createTempDir();
writeChangesToFile(changes1,
new File(dir.getPath() + "/libcore_platform_compat_config.xml"));
writeChangesToFile(changes2,
new File(dir.getPath() + "/frameworks_platform_compat_config.xml"));
writeToFile(dir, "libcore_platform_compat_config.xml", configXml1);
writeToFile(dir, "frameworks_platform_compat_config.xml", configXml2);
CompatConfig pc = new CompatConfig();
pc.initConfigFromLib(dir);