Skip to content

Commit 8ed433a

Browse files
pjcollinspjcollins
committed
additional windows fixes
1 parent f28bacd commit 8ed433a

File tree

3 files changed

+68
-62
lines changed

3 files changed

+68
-62
lines changed

‎tools/java-source-utils/src/main/resources/transform-style.xsl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</xsl:template>
1919

2020

21-
<!-- Remove carriage returns from `<javadoc/>` CDATA elements to help standardize output across Unix and Windows -->
21+
<!-- Remove extra carriage returns from `<javadoc/>` CDATA elements to help standardize output across Unix and Windows -->
2222
<xsl:template match="javadoc/text()">
2323
<xsl:call-template name="removeCarriageReturn"/>
2424
</xsl:template>

‎tools/java-source-utils/src/test/java/com/microsoft/android/JavadocXmlGeneratorTest.java‎

Lines changed: 49 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,11 @@ public void testWritePackages_noPackages() throws ParserConfigurationException,
4545
generator.writePackages(packages);
4646
generator.close();
4747

48-
final String expected =
49-
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n" +
50-
"<api api-source=\"java-source-utils\"/>\n";
48+
final String expected = String.format(
49+
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>%1$s" +
50+
"<api api-source=\"java-source-utils\"/>%1$s",
51+
System.lineSeparator()
52+
);
5153
assertEquals("no packages", expected, bytes.toString());
5254
}
5355

@@ -58,48 +60,50 @@ public void testWritePackages_demo() throws ParserConfigurationException, Transf
5860
final JavadocXmlGenerator generator = new JavadocXmlGenerator(new PrintStream(bytes));
5961
final JniPackagesInfo packages = JniPackagesInfoTest.createDemoInfo();
6062

61-
final String expected =
62-
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n" +
63-
"<api api-source=\"java-source-utils\">\n" +
64-
" <package jni-name=\"\" name=\"\">\n" +
65-
" <class jni-signature=\"LA;\" name=\"A\">\n" +
66-
" <javadoc><![CDATA[jni-sig=LA;]]></javadoc>\n" +
67-
" <constructor jni-signature=\"(ILjava/lang/String;)V\">\n" +
68-
" <parameter jni-type=\"I\" name=\"one\" type=\"int\"/>\n" +
69-
" <parameter jni-type=\"Ljava/lang/String;\" name=\"two\" type=\"java.lang.String\"/>\n" +
70-
" <javadoc><![CDATA[jni-sig=<init>.(ILjava/lang/String;)V]]></javadoc>\n" +
71-
" </constructor>\n" +
72-
" <field jni-signature=\"I\" name=\"field\">\n" +
73-
" <javadoc><![CDATA[jni-sig=field.I]]></javadoc>\n" +
74-
" </field>\n" +
75-
" <method jni-return=\"V\" jni-signature=\"(Ljava/lang/Object;J)V\" name=\"m\" return=\"void\">\n" +
76-
" <parameter jni-type=\"Ljava/lang/Object;\" name=\"value\" type=\"T\"/>\n" +
77-
" <parameter jni-type=\"J\" name=\"x\" type=\"long\"/>\n" +
78-
" <javadoc><![CDATA[jni-sig=m.(Ljava/lang/Object;J)V]]></javadoc>\n" +
79-
" </method>\n" +
80-
" </class>\n" +
81-
" <interface jni-signature=\"LI;\" name=\"I\">\n" +
82-
" <javadoc><![CDATA[jni-sig=LI;]]></javadoc>\n" +
83-
" <method jni-return=\"Ljava/lang/Object;\" jni-signature=\"(Ljava/util/List;)Ljava/lang/Object;\" name=\"m\" return=\"T\">\n" +
84-
" <parameter jni-type=\"Ljava/util/List;\" name=\"x\" type=\"java.util.List&lt;T&gt;\"/>\n" +
85-
" <javadoc><![CDATA[jni-sig=m.(Ljava/util/List;)Ljava/lang/Object;]]></javadoc>\n" +
86-
" </method>\n" +
87-
" </interface>\n" +
88-
" </package>\n" +
89-
" <package jni-name=\"before/example\" name=\"before.example\"/>\n" +
90-
" <package jni-name=\"example\" name=\"example\">\n" +
91-
" <interface jni-signature=\"Lexample/Exampleable;\" name=\"Exampleable\">\n" +
92-
" <javadoc><![CDATA[jni-sig=Lexample/Exampleable;]]></javadoc>\n" +
93-
" <method jni-return=\"V\" jni-signature=\"(Ljava/lang/String;)V\" name=\"example\" return=\"void\">\n" +
94-
" <parameter jni-type=\"Ljava/lang/String;\" name=\"e\" type=\"java.lang.String\"/>\n" +
95-
" <javadoc><![CDATA[jni-sig=example.(Ljava/lang/String;)V]]></javadoc>\n" +
96-
" </method>\n" +
97-
" <method jni-return=\"V\" jni-signature=\"()V\" name=\"noParameters\" return=\"void\">\n" +
98-
" <javadoc><![CDATA[jni-sig=noParameters.()V]]></javadoc>\n" +
99-
" </method>\n" +
100-
" </interface>\n" +
101-
" </package>\n" +
102-
"</api>\n";
63+
final String expected = String.format(
64+
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>%1$s" +
65+
"<api api-source=\"java-source-utils\">%1$s" +
66+
" <package jni-name=\"\" name=\"\">%1$s" +
67+
" <class jni-signature=\"LA;\" name=\"A\">%1$s" +
68+
" <javadoc><![CDATA[jni-sig=LA;]]></javadoc>%1$s" +
69+
" <constructor jni-signature=\"(ILjava/lang/String;)V\">%1$s" +
70+
" <parameter jni-type=\"I\" name=\"one\" type=\"int\"/>%1$s" +
71+
" <parameter jni-type=\"Ljava/lang/String;\" name=\"two\" type=\"java.lang.String\"/>%1$s" +
72+
" <javadoc><![CDATA[jni-sig=<init>.(ILjava/lang/String;)V]]></javadoc>%1$s" +
73+
" </constructor>%1$s" +
74+
" <field jni-signature=\"I\" name=\"field\">%1$s" +
75+
" <javadoc><![CDATA[jni-sig=field.I]]></javadoc>%1$s" +
76+
" </field>%1$s" +
77+
" <method jni-return=\"V\" jni-signature=\"(Ljava/lang/Object;J)V\" name=\"m\" return=\"void\">%1$s" +
78+
" <parameter jni-type=\"Ljava/lang/Object;\" name=\"value\" type=\"T\"/>%1$s" +
79+
" <parameter jni-type=\"J\" name=\"x\" type=\"long\"/>%1$s" +
80+
" <javadoc><![CDATA[jni-sig=m.(Ljava/lang/Object;J)V]]></javadoc>%1$s" +
81+
" </method>%1$s" +
82+
" </class>%1$s" +
83+
" <interface jni-signature=\"LI;\" name=\"I\">%1$s" +
84+
" <javadoc><![CDATA[jni-sig=LI;]]></javadoc>%1$s" +
85+
" <method jni-return=\"Ljava/lang/Object;\" jni-signature=\"(Ljava/util/List;)Ljava/lang/Object;\" name=\"m\" return=\"T\">%1$s" +
86+
" <parameter jni-type=\"Ljava/util/List;\" name=\"x\" type=\"java.util.List&lt;T&gt;\"/>%1$s" +
87+
" <javadoc><![CDATA[jni-sig=m.(Ljava/util/List;)Ljava/lang/Object;]]></javadoc>%1$s" +
88+
" </method>%1$s" +
89+
" </interface>%1$s" +
90+
" </package>%1$s" +
91+
" <package jni-name=\"before/example\" name=\"before.example\"/>%1$s" +
92+
" <package jni-name=\"example\" name=\"example\">%1$s" +
93+
" <interface jni-signature=\"Lexample/Exampleable;\" name=\"Exampleable\">%1$s" +
94+
" <javadoc><![CDATA[jni-sig=Lexample/Exampleable;]]></javadoc>%1$s" +
95+
" <method jni-return=\"V\" jni-signature=\"(Ljava/lang/String;)V\" name=\"example\" return=\"void\">%1$s" +
96+
" <parameter jni-type=\"Ljava/lang/String;\" name=\"e\" type=\"java.lang.String\"/>%1$s" +
97+
" <javadoc><![CDATA[jni-sig=example.(Ljava/lang/String;)V]]></javadoc>%1$s" +
98+
" </method>%1$s" +
99+
" <method jni-return=\"V\" jni-signature=\"()V\" name=\"noParameters\" return=\"void\">%1$s" +
100+
" <javadoc><![CDATA[jni-sig=noParameters.()V]]></javadoc>%1$s" +
101+
" </method>%1$s" +
102+
" </interface>%1$s" +
103+
" </package>%1$s" +
104+
"</api>%1$s",
105+
System.lineSeparator()
106+
);
103107

104108
generator.writePackages(packages);
105109
generator.close();

‎tools/java-source-utils/src/test/java/com/microsoft/android/ParameterNameGeneratorTest.java‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -50,22 +50,24 @@ public void testWritePackages_demo() {
5050
ParameterNameGenerator generator = new ParameterNameGenerator(new PrintStream(bytes));
5151
JniPackagesInfo packages = JniPackagesInfoTest.createDemoInfo();
5252

53-
final String expected =
54-
";---------------------------------------\n" +
55-
" class A\n" +
56-
" #ctor(int one, java.lang.String two)\n" +
57-
" <T> m(T value, long x)\n" +
58-
" interface I<T>\n" +
59-
" m(java.util.List<T> x)\n" +
60-
"\n" +
61-
"package before.example\n" +
62-
";---------------------------------------\n" +
63-
"\n" +
64-
"package example\n" +
65-
";---------------------------------------\n" +
66-
" interface Exampleable\n" +
67-
" example(java.lang.String e)\n" +
68-
"";
53+
final String expected = String.format(
54+
";---------------------------------------%1$s" +
55+
" class A%1$s" +
56+
" #ctor(int one, java.lang.String two)%1$s" +
57+
" <T> m(T value, long x)%1$s" +
58+
" interface I<T>%1$s" +
59+
" m(java.util.List<T> x)%1$s" +
60+
"%1$s" +
61+
"package before.example%1$s" +
62+
";---------------------------------------%1$s" +
63+
"%1$s" +
64+
"package example%1$s" +
65+
";---------------------------------------%1$s" +
66+
" interface Exampleable%1$s" +
67+
" example(java.lang.String e)%1$s" +
68+
"",
69+
System.lineSeparator()
70+
);
6971

7072
generator.writePackages(packages);
7173
assertEquals("global package + example packages", expected, bytes.toString());

0 commit comments

Comments
 (0)