/*
 * Copyright 2016 the original author or authors.
 *
 * 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 org.gradle.testing;

import org.gradle.api.tasks.Input;
import org.gradle.api.tasks.testing.Test;

/**
 * Base class for all tests that check the end-to-end behavior of a Gradle distribution.
 */
public class DistributionTest extends Test {
    @Input
    String getOperatingSystem() {
        return String.format("%s / %s / %s", System.getProperty("os.name"), System.getProperty("os.version"), System.getProperty("os.arch"));
    }
}

@@ -715,16 +715,63 @@
 ng.Test;
+%0Aimport org.gradle.internal.os.OperatingSystem;
 %0A%0A/**%0A *
@@ -970,132 +970,43 @@
 urn 
-String.format(%22%25s / %25s / %25s%22, System.getProperty(%22os.name%22), System.getProperty(%22os.version%22), System.getProperty(%22os.arch%22)
+OperatingSystem.current().toString(
 );%0A 

Use OperatingSystem.current() for DistributionTest