Start doing Behavior Test Driven Design for Version 2

CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.10.4] - 2019-07-17
+
+Fix issed where occurences of XML elements containing text weren't being validated (https://github.com/ShopRunner/baleen/pull/51)
+
+## [1.10.3] - 2019-07-16
+
+Fix line aware handler for xml of occurrences (https://github.com/ShopRunner/baleen/pull/50)
+
 ## [1.10.2] - 2019-06-13
 
 Add JCenter to the gradle repositories to fix Dokka dependency.
@@ -62,4 +70,3 @@ Dependencies bump
 ## [1.0] - 2018-06-12
 
 * Initial Release
-

baleen-avro-generator/src/main/kotlin/com/shoprunner/baleen/avro/AvroGenerator.kt

@@ -18,11 +18,11 @@ import com.shoprunner.baleen.types.StringConstantType
 import com.shoprunner.baleen.types.StringType
 import com.shoprunner.baleen.types.TimestampMillisType
 import com.shoprunner.baleen.types.UnionType
+import java.io.File
+import java.nio.file.Path
 import org.apache.avro.JsonProperties
 import org.apache.avro.LogicalTypes
 import org.apache.avro.Schema
-import java.io.File
-import java.nio.file.Path
 
 object AvroGenerator {
 
@@ -111,4 +111,4 @@ object AvroGenerator {
         out.append(this.toString(true))
         return out
     }
-}
+}

baleen-avro-generator/src/main/kotlin/com/shoprunner/baleen/avro/BaleenGenerator.kt

@@ -197,4 +197,4 @@ object BaleenGenerator {
                 .addType(processSchema(schema))
                 .build()
     }
-}
+}

baleen-avro-generator/src/test/kotlin/com/shoprunner/baleen/avro/AvroGeneratorTest.kt

@@ -17,12 +17,15 @@ import com.shoprunner.baleen.types.LongType
 import com.shoprunner.baleen.types.MapType
 import com.shoprunner.baleen.types.OccurrencesType
 import com.shoprunner.baleen.types.StringCoercibleToFloat
-import com.shoprunner.baleen.types.StringCoercibleToLong
 import com.shoprunner.baleen.types.StringCoercibleToInstant
+import com.shoprunner.baleen.types.StringCoercibleToLong
 import com.shoprunner.baleen.types.StringConstantType
 import com.shoprunner.baleen.types.StringType
 import com.shoprunner.baleen.types.TimestampMillisType
 import com.shoprunner.baleen.types.UnionType
+import java.io.ByteArrayOutputStream
+import java.io.File
+import java.io.PrintStream
 import org.apache.avro.LogicalTypes
 import org.apache.avro.Schema
 import org.assertj.core.api.Assertions
@@ -31,9 +34,6 @@ import org.junit.jupiter.api.Assertions.assertThrows
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
-import java.io.ByteArrayOutputStream
-import java.io.File
-import java.io.PrintStream
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class AvroGeneratorTest {
@@ -724,4 +724,4 @@ class AvroGeneratorTest {
             assertThat(outputStream.toString()).isEqualToIgnoringWhitespace(schemaWithDefaultStr)
         }
     }
-}
+}

baleen-avro-generator/src/test/kotlin/com/shoprunner/baleen/avro/BaleenGeneratorTest.kt

@@ -6,6 +6,9 @@ import com.shoprunner.baleen.avro.BaleenGenerator.encode
 import com.squareup.kotlinpoet.CodeBlock
 import com.squareup.kotlinpoet.FileSpec
 import com.squareup.kotlinpoet.PropertySpec
+import java.io.File
+import java.net.URLClassLoader
+import java.util.logging.Logger
 import org.apache.avro.JsonProperties
 import org.apache.avro.LogicalType
 import org.apache.avro.Schema
@@ -19,9 +22,6 @@ import org.jetbrains.kotlin.config.Services
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
-import java.io.File
-import java.net.URLClassLoader
-import java.util.logging.Logger
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class BaleenGeneratorTest {
@@ -324,4 +324,4 @@ internal class BaleenGeneratorTest {
             Assertions.assertThat(packDescription).isEqualTo(DataDescription::class.java)
         }
     }
-}
+}

baleen-csv/build.gradle

@@ -1,6 +1,6 @@
 dependencies {
     api project(':baleen')
-    api 'io.reactivex.rxjava2:rxjava:2.2.9'
+    api 'io.reactivex.rxjava2:rxjava:2.2.10'
     implementation 'io.reactivex.rxjava2:rxkotlin:2.3.0'
     implementation 'com.opencsv:opencsv:4.6'
 }

baleen-csv/src/main/kotlin/com/shoprunner/baleen/csv/FlowableUtil.kt

@@ -69,4 +69,4 @@ object FlowableUtil {
                     .tag("line", lineNumber.toString()))
         }
     }
-}
+}

baleen-csv/src/test/kotlin/com/shoprunner/baleen/csv/Example.kt

@@ -55,4 +55,4 @@ fun main(args: Array<String>) {
 
     val duration = System.nanoTime() - startTime
     println("Took ${duration / 1000_000} ms")
-}
+}

baleen-csv/src/test/kotlin/com/shoprunner/baleen/csv/FlowableUtilTest.kt

@@ -10,9 +10,9 @@ import com.shoprunner.baleen.types.LongType
 import com.shoprunner.baleen.types.StringCoercibleToLong
 import com.shoprunner.baleen.types.StringType
 import io.reactivex.rxkotlin.toFlowable
+import java.io.StringReader
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
-import java.io.StringReader
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class FlowableUtilTest {
@@ -92,4 +92,4 @@ internal class FlowableUtilTest {
             )
         )
     }
-}
+}

baleen-csv/src/test/kotlin/com/shoprunner/baleen/csv/PrintUtil.kt

@@ -33,4 +33,4 @@ object PrintUtil {
                 onError = { println(it) }
         )
     }
-}
+}

baleen-jsonschema-generator/src/main/kotlin/com/shoprunner/baleen/jsonschema/v3/JsonSchemaGenerator.kt

@@ -150,4 +150,4 @@ object JsonSchemaGenerator {
         }
         return out
     }
-}
+}

baleen-jsonschema-generator/src/main/kotlin/com/shoprunner/baleen/jsonschema/v4/JsonSchemaGenerator.kt

@@ -188,4 +188,4 @@ object JsonSchemaGenerator {
         }
         return out
     }
-}
+}

baleen-jsonschema-generator/src/test/kotlin/com/shoprunner/baleen/jsonschema/v3/JsonSchemaGeneratorTest.kt

@@ -27,12 +27,12 @@ import com.shoprunner.baleen.types.StringConstantType
 import com.shoprunner.baleen.types.StringType
 import com.shoprunner.baleen.types.TimestampMillisType
 import com.shoprunner.baleen.types.UnionType
+import java.io.ByteArrayOutputStream
+import java.io.PrintStream
 import org.assertj.core.api.Assertions
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
-import java.io.ByteArrayOutputStream
-import java.io.PrintStream
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class JsonSchemaGeneratorTest {
@@ -430,4 +430,4 @@ internal class JsonSchemaGeneratorTest {
             Assertions.assertThat(outputStream.toString()).isEqualToIgnoringWhitespace(schemaStr)
         }
     }
-}
+}

baleen-jsonschema-generator/src/test/kotlin/com/shoprunner/baleen/jsonschema/v4/JsonSchemaGeneratorTest.kt

@@ -20,13 +20,13 @@ import com.shoprunner.baleen.types.StringConstantType
 import com.shoprunner.baleen.types.StringType
 import com.shoprunner.baleen.types.TimestampMillisType
 import com.shoprunner.baleen.types.UnionType
+import java.io.ByteArrayOutputStream
+import java.io.File
+import java.io.PrintStream
 import org.assertj.core.api.Assertions
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
-import java.io.ByteArrayOutputStream
-import java.io.File
-import java.io.PrintStream
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class JsonSchemaGeneratorTest {
@@ -1489,4 +1489,4 @@ internal class JsonSchemaGeneratorTest {
             Assertions.assertThat(content).isEqualToIgnoringWhitespace(schemaStr)
         }
     }
-}
+}

baleen-v2/README.md

@@ -0,0 +1,29 @@
+# Preparation for version 2
+
+Do test driven development for version 2
+
+```bash
+./gradlew build -Pversion2
+./gradlew :baleen-v2:build -Pversion2
+
+```
+
+## Use Case 1 - Given we have the data, we define the schema manually and validate the data
+
+[UseCase1Test.kt](baleen-v2-tests/src/test/kotlin/com/shoprunner/baleen/version2/UseCase1Test.kt)
+
+## Use Case 2 - Given we have the data, we learn the schema and validate the data
+
+[UseCase2Test.kt](baleen-v2-tests/src/test/kotlin/com/shoprunner/baleen/version2/UseCase2Test.kt)
+
+## Use Case 3 - Given a external schema (Avro, XSD, Json-Schema, Kotlin data class), build Baleen schema and validate the data
+
+[UseCase3Test.kt](baleen-v2-tests/src/test/kotlin/com/shoprunner/baleen/version2/UseCase3Test.kt)
+
+## Use Case 4 - Given a Baleen schema, create external schema (Avro, XSD, Json-Schema, Kotlin data class) and validate the data with the external schema
+
+[UseCase4Test.kt](baleen-v2-tests/src/test/kotlin/com/shoprunner/baleen/version2/UseCase4Test.kt)
+
+## Use Case 5 - Baleen is multiplatform and can be run on JVM, in Javascript from node and from the browser, and from Python via Cinteropt
+
+[baleen-v2/build.gradle](baleen-v2/build.gradle)

baleen-v2/baleen-v2-tests/build.gradle

@@ -0,0 +1,31 @@
+dependencies {
+    api project(':baleen')
+    api project(':baleen-csv')
+    api project(':baleen-xml')
+    api project(':baleen-xsd-generator')
+    api project(':jsonschema-baleen-generator')
+    api project(':baleen-jsonschema-generator')
+    api project(':baleen-avro-generator')
+    api "org.apache.avro:avro:1.9.0"
+    implementation 'org.jetbrains.kotlin:kotlin-reflect'
+
+    // For Json schema validation tests
+    testImplementation 'com.github.everit-org.json-schema:org.everit.json.schema:1.11.1'
+
+    // Just to get some test helpers. Promote those test helpers to top-level module.
+    testImplementation files(project(":baleen").sourceSets.test.output)
+}
+
+repositories {
+    maven { url "https://jitpack.io" }
+}
+
+test {
+    ignoreFailures = true
+}
+
+if (!project.hasProperty("version2")) {
+    project.tasks.each {
+        it.onlyIf { false }
+    }
+}