2 files changed, 51 insertions, 0 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/apple/DottedVersionTest.java b/src/test/java/com/google/devtools/build/lib/rules/apple/DottedVersionTest.java
index dbcf87af2a..285dc2fc9d 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/apple/DottedVersionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/apple/DottedVersionTest.java
@@ -60,6 +60,33 @@ public class DottedVersionTest {
   }
 
   @Test
+  public void testToStringWithComponents() throws Exception {
+    DottedVersion dottedVersion = DottedVersion.fromString("42.8");
+    assertThat(dottedVersion.toStringWithComponents(1)).isEqualTo("42");
+    assertThat(dottedVersion.toStringWithComponents(2)).isEqualTo("42.8");
+    assertThat(dottedVersion.toStringWithComponents(3)).isEqualTo("42.8.0");
+    assertThat(dottedVersion.toStringWithComponents(4)).isEqualTo("42.8.0.0");
+  }
+
+  @Test
+  public void testToStringWithComponents_trailingZero() throws Exception {
+    DottedVersion dottedVersion = DottedVersion.fromString("4.3alpha3.0");
+    assertThat(dottedVersion.toStringWithComponents(1)).isEqualTo("4");
+    assertThat(dottedVersion.toStringWithComponents(2)).isEqualTo("4.3alpha3");
+    assertThat(dottedVersion.toStringWithComponents(3)).isEqualTo("4.3alpha3.0");
+    assertThat(dottedVersion.toStringWithComponents(4)).isEqualTo("4.3alpha3.0.0");
+    assertThat(dottedVersion.toStringWithComponents(5)).isEqualTo("4.3alpha3.0.0.0");
+  }
+
+  @Test
+  public void testToStringWithComponents_zeroComponent() throws Exception {
+    DottedVersion zeroComponent = DottedVersion.fromString("0");
+    assertThat(zeroComponent.toStringWithComponents(1)).isEqualTo("0");
+    assertThat(zeroComponent.toStringWithComponents(2)).isEqualTo("0.0");
+    assertThat(zeroComponent.toStringWithComponents(3)).isEqualTo("0.0.0");
+  }
+
+  @Test
   public void testToStringWithMinimumComponent() throws Exception {
     DottedVersion dottedVersion = DottedVersion.fromString("42.8");
     assertThat(dottedVersion.toStringWithMinimumComponents(0)).isEqualTo("42.8");
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java
index f0eb7ec5cc..ce828e5523 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java
@@ -1266,6 +1266,30 @@ public class ObjcLibraryTest extends ObjcRuleTestCase {
   }
 
   @Test
+  public void testXcodeVersionFeatureTwoComponentsTooMany() throws Exception {
+    useConfiguration("--xcode_version=7.3.1");
+
+    createLibraryTargetWriter("//objc:lib")
+        .setAndCreateFiles("srcs", "a.m")
+        .write();
+    CommandAction action = compileAction("//objc:lib", "a.o");
+
+    assertThat(action.getArguments()).contains("-DXCODE_FEATURE_FOR_TESTING=xcode_7.3");
+  }
+
+  @Test
+  public void testXcodeVersionFeatureTwoComponentsTooFew() throws Exception {
+    useConfiguration("--xcode_version=5");
+
+    createLibraryTargetWriter("//objc:lib")
+        .setAndCreateFiles("srcs", "a.m")
+        .write();
+    CommandAction action = compileAction("//objc:lib", "a.o");
+
+    assertThat(action.getArguments()).contains("-DXCODE_FEATURE_FOR_TESTING=xcode_5.0");
+  }
+
+  @Test
   public void testIosSdkVersionCannotBeDefinedButEmpty() throws Exception {
     try {
       useConfiguration("--ios_sdk_version=");