");
- }
-}
diff --git a/confluence/src/test/java/org.jetbrains.jet.confluence/rendering/ConfluenceRenderingTest.java b/confluence/src/test/java/org.jetbrains.jet.confluence/rendering/ConfluenceRenderingTest.java
deleted file mode 100644
index b0ae2a407a7..00000000000
--- a/confluence/src/test/java/org.jetbrains.jet.confluence/rendering/ConfluenceRenderingTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.jetbrains.jet.confluence.rendering;
-
-import com.atlassian.renderer.v2.macro.MacroException;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.jetbrains.jet.confluence.TestUtils;
-import org.jetbrains.jet.lexer.JetMacro;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * @author Natalia.Ukhorskaya
- */
-
-public class ConfluenceRenderingTest extends TestCase {
-
- public static Test suite() {
- TestSuite suite = new TestSuite();
- TestSuite ats = new TestSuite();
- suite.addTest(ats);
- File parsingSourceDir = new File("./testData/rendering");
- addFilesFromDirToSuite(parsingSourceDir, ats);
- return suite;
- }
-
- private static void addFilesFromDirToSuite(File file, TestSuite ats) {
- if (file.isDirectory()) {
- for (File sourceFile : file.listFiles()) {
- addFilesFromDirToSuite(sourceFile, ats);
- }
- } else {
- if (file.getName().endsWith(".kt")) {
- ats.addTest(new ConfluenceRenderingTest(file.getName(), file));
- }
- }
- }
-
- private final File sourceFile;
-
- public ConfluenceRenderingTest(String name, File sourceFile) {
- super(name);
- this.sourceFile = sourceFile;
- }
-
- @Override
- protected void runTest() throws Throwable {
- checkSourceFile(sourceFile);
- }
-
- private void checkSourceFile(File sourceFile) throws IOException, MacroException {
- String source = TestUtils.readFile(sourceFile);
-
- StringBuilder actualResult = new StringBuilder();
- new JetMacro().generateHtmlFromCode(source, actualResult);
-
- File expectedResultFile = new File(sourceFile.getAbsolutePath().replace(".kt", ".txt"));
- if (!expectedResultFile.exists()) {
- expectedResultFile.createNewFile();
- TestUtils.writeFile(expectedResultFile, TestUtils.divideResultForLines(actualResult.toString()));
- assertTrue("File with expected result for " + expectedResultFile.getAbsolutePath() + " is absent.", false);
- }
-
- String expectedResult = TestUtils.readFile(expectedResultFile);
-
-
- assertEquals(expectedResult,
- TestUtils.divideResultForLines(actualResult.toString()));
- }
-}
diff --git a/confluence/testData/rendering/elements/class.kt b/confluence/testData/rendering/elements/class.kt
deleted file mode 100644
index a082c511e08..00000000000
--- a/confluence/testData/rendering/elements/class.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-class Greeter1() {
-
-}
-
-class Greeter2(val name : String) {
-
-}
\ No newline at end of file
diff --git a/confluence/testData/rendering/elements/class.txt b/confluence/testData/rendering/elements/class.txt
deleted file mode 100644
index a579e219588..00000000000
--- a/confluence/testData/rendering/elements/class.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
class Greeter1() {
-
-
}
-
-
class Greeter2(val name : String) {
-
-
}
\ No newline at end of file
diff --git a/confluence/testData/rendering/elements/variable.kt b/confluence/testData/rendering/elements/variable.kt
deleted file mode 100644
index 7364e4d32c7..00000000000
--- a/confluence/testData/rendering/elements/variable.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-val a : Int = 1
-val b = 1
-val c : Int
-c = 1
-var a : String = "sss"
\ No newline at end of file
diff --git a/confluence/testData/rendering/elements/variable.txt b/confluence/testData/rendering/elements/variable.txt
deleted file mode 100644
index bdfa9adad8b..00000000000
--- a/confluence/testData/rendering/elements/variable.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
val a : Int = 1
-
val b = 1
-
val c : Int
-
c = 1
-
var a : String = "sss"
\ No newline at end of file
diff --git a/confluence/testData/rendering/elements/when.kt b/confluence/testData/rendering/elements/when.kt
deleted file mode 100644
index 6faddf20ae9..00000000000
--- a/confluence/testData/rendering/elements/when.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-val language = if (args.size == 0) "EN" else args[0]
-when (language) {
- "EN" -> "Hello!"
- "ES" -> "¡Hola!"
- "RU" -> "Привет!"
- else -> "Sorry, I can't greet you in $language yet"
-}
\ No newline at end of file
diff --git a/confluence/testData/rendering/elements/when.txt b/confluence/testData/rendering/elements/when.txt
deleted file mode 100644
index b316772466b..00000000000
--- a/confluence/testData/rendering/elements/when.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
val language = if (args.size == 0) "EN" else args[0]
-
when (language) {
-
"EN" -> "Hello!"
-
"ES" -> "¡Hola!"
-
"RU" -> "Привет!"
-
else -> "Sorry, I can't greet you in $language yet"
-
}
\ No newline at end of file
diff --git a/confluence/testData/rendering/examples/adress_book.kt b/confluence/testData/rendering/examples/adress_book.kt
deleted file mode 100644
index 9cb0446a0e9..00000000000
--- a/confluence/testData/rendering/examples/adress_book.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-namespace addressbook
-
-class Contact(
- val name : String,
- val emails : List
,
- val addresses : List,
- val phonenums : List
-)
-
-class EmailAddress(
- val user : String,
- val host : String
-)
-
-class PostalAddress(
- val streetAddress : String,
- val city : String,
- val zip : String,
- val state : USState?,
- val country : Country
-) {
- assert {(state == null) xor (country == Countries["US"]) }
-}
-
-class PhoneNumber(
- val country : Country,
- val areaCode : Int,
- val number : Long
-)
-
-object Countries {
- fun get(id : CountryID) : Country = countryTable[id]
-
- private var table : Map? = null
- private val countryTable : Map
- get() {
- if (table == null) {
- table = HashMap()
- for (line in TextFile("countries.txt").lines(stripWhiteSpace = true)) {
- table[line] = Country(line)
- }
- }
- return table
- }
-}
-
-class Country(val name : String)
\ No newline at end of file
diff --git a/confluence/testData/rendering/examples/adress_book.txt b/confluence/testData/rendering/examples/adress_book.txt
deleted file mode 100644
index a650d815f59..00000000000
--- a/confluence/testData/rendering/examples/adress_book.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
namespace addressbook
-
-
class Contact(
-
val name : String,
-
val emails : List<EmailAddress>,
-
val addresses : List<PostalAddress>,
-
val phonenums : List<PhoneNumber>
-
)
-
-
class EmailAddress(
-
val user : String,
-
val host : String
-
)
-
-
class PostalAddress(
-
val streetAddress : String,
-
val city : String,
-
val zip : String,
-
val state : USState?,
-
val country : Country
-
) {
-
assert {(state == null) xor (country == Countries["US"]) }
-
}
-
-
class PhoneNumber(
-
val country : Country,
-
val areaCode : Int,
-
val number : Long
-
)
-
-
object Countries {
-
fun get(id : CountryID) : Country = countryTable[id]
-
-
private var table : Map<String, Country>? = null
-
private val countryTable : Map<String, Country>
-
get() {
-
if (table == null) {
-
table = HashMap()
-
for (line in TextFile("countries.txt").lines(stripWhiteSpace = true)) {
-
table[line] = Country(line)
-
}
-
}
-
return table
-
}
-
}
-
-
class Country(val name : String)
-
-
fun sum(a : Int, b : Int) : Int {
-
return a + b
-
}
-
val a : Int = 1
-
val b = 1
-
val c : Int
-
c = 1
-
package multiplier
-
-
-
fun parseInt(str : String) : Int? {
-
-
}
-
-
fun main(args : Array<String>) {
-
if (args.size < 2) {
-
print("No number supplied");
-
}
-
val x = parseInt(args[0])
-
val y = parseInt(args[1])
-
-
-
-
if (x != null && y != null) {
-
print(x * y)
-
}
-
-
-
if (x == null) {
-
print("Wrong number format in '${args[0]}'")
-
return
-
}
-
if (y == null) {
-
print("Wrong number format in '${args[1]}'")
-
return
-
}
-
print(x * y)
-
}
-
fun max(a : Int, b : Int) : Int {
-
if (a > b)
-
return a
-
else
-
return b
-
}
-
fun main(args : Array<String>) {
-
val language = if (args.size == 0) "EN" else args[0]
-
println(when (language) {
-
"EN" -> "Hello!"
-
"ES" -> "¡Hola!"
-
"RU" -> "Привет!"
-
else -> "Sorry, I can't greet you in $language yet"
-
})
-
}
-
class Greeter(val name : String) {
-
fun greet() {
-
println("Hello, ${name}");
-
}
-
}
-
-
fun main(args : Array<String>) {
-
Greeter(args[0]).greet()
-
}
-
fun main(args : Array<String>) {
-
if (args.size == 0) {
-
println("Please provide a name as a command-line argument")
-
return
-
}
-
println("Hello, ${args[0]}!")
-
}
-
import html.*
-
-
fun result(args : Array<String>) =
-
html {
-
head {
-
title {+"XML encoding with Kotlin"}
-
}
-
body {
-
h1 {+"XML encoding with Kotlin"}
-
p {+"this format can be used as an alternative markup to XML"}
-
-
-
a(href = "http://jetbrains.com/kotlin") {+"Kotlin"}
-
-
-
p {
-
+"This is some"
-
b {+"mixed"}
-
+"text. For more see the"
-
a(href = "http://jetbrains.com/kotlin") {+"Kotlin"}
-
+"project"
-
}
-
p {+"some text"}
-
-
-
p {
-
for (arg in args)
-
+arg
-
}
-
}
-
}
-
-
-
fun result(args : Array<String>) =
-
-
-
title {+"XML encoding with Kotlin"}
-
}
-
-
h1 {+"XML encoding with Kotlin"}
-
p {+"this format can be used as an alternative markup to XML"}
-
-
-
a(href = "http://jetbrains.com/kotlin") {+"Kotlin"}
-
-
-
-
-
-
+"text. For more see the"
-
a(href = "http://jetbrains.com/kotlin") {+"Kotlin"}
-
-
}
-
-
-
-
-
for (arg in args)
-
-
}
-
}
-
}
-
-
-
-
-
fun create() : T
-
}
-
-
-
-
class TextElement(val text : String) : Element
-
-
abstract class Tag(val name : String) : Element {
-
val children = ArrayList<Element>()
-
val attributes = HashMap<String, String>()
-
-
protected fun initTag<T : Element>(init : T.() -> Unit) : T
-
where class object T : Factory<T> {
-
val tag = T.create()
-
tag.init()
-
-
return tag
-
}
-
}
-
-
abstract class TagWithText(name : String) : Tag(name) {
-
-
children.add(TextElement(this))
-
}
-
}
-
-
class HTML() : TagWithText("html") {
-
class object : Factory<HTML> {
-
override fun create() = HTML()
-
}
-
-
fun head(init : Head.() -> Unit) = initTag(init)
-
-
fun body(init : Body.() -> Unit) = initTag(init)
-
}
-
-
class Head() : TagWithText("head") {
-
class object : Factory<Head> {
-
override fun create() = Head()
-
}
-
-
fun title(init : Title.() -> Unit) = initTag(init)
-
}
-
-
class Title() : TagWithText("title")
-
-
abstract class BodyTag(name : String) : TagWithText(name) {
-
}
-
-
class Body() : BodyTag("body") {
-
class object : Factory<Body> {
-
override fun create() = Body()
-
}
-
-
fun b(init : B.() -> Unit) = initTag(init)
-
fun p(init : P.() -> Unit) = initTag(init)
-
fun h1(init : H1.() -> Unit) = initTag(init)
-
fun a(href : String, init : A.() -> Unit) {
-
val a = initTag(init)
-
a.href = href
-
}
-
}
-
-
class B() : BodyTag("b")
-
class P() : BodyTag("p")
-
class H1() : BodyTag("h1")
-
class A() : BodyTag("a") {
-
var href : String
-
-
-
}
-
-
fun html(init : HTML.() -> Unit) : HTML {
-
val html = HTML()
-
html.init()
-
return html
-
}
-
-
}
-
package hello
-
-
fun main(args : Array<String>) {
-
println("Hello, world!")
-
}