Skip to content

Commit

Permalink
Corrected unstructured event comments and changed test to use self-de…
Browse files Browse the repository at this point in the history 
…scribing JSON (#835)
  • Loading branch information
@fblundun
fblundun committed Jun 25, 2014
1 parent 5811a38 commit 48dd7b0
Show file tree
Hide file tree
Showing 13 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .../src/test/scala/com.snowplowanalytics.snowplow.enrich.hadoop/good/Apr2014CfLineSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ object Apr2014CfLineSpec {
null, //
null, //
null, //
null, // Unstructured event fields empty
null, // Unstructured event field empty
null, // Transaction fields empty
null, //
null, //
Expand Down
2 changes: 1 addition & 1 deletion .../src/test/scala/com.snowplowanalytics.snowplow.enrich.hadoop/good/Aug2013CfLineSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ object Aug2013CfLineSpec {
null, //
null, //
null, //
null, // Unstructured event fields empty
null, // Unstructured event field empty
null, // Transaction fields empty
null, //
null, //
Expand Down
2 changes: 1 addition & 1 deletion .../src/test/scala/com.snowplowanalytics.snowplow.enrich.hadoop/good/CljTomcatLineSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ object CljTomcatLineSpec {
null, //
null, //
null, //
null, // Unstructured event fields empty
null, // Unstructured event field empty
null, // Transaction fields empty
null, //
null, //
Expand Down
2 changes: 1 addition & 1 deletion ...h/src/test/scala/com.snowplowanalytics.snowplow.enrich.hadoop/good/FutureCfLineSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ object FutureCfLineSpec {
null, //
null, //
null, //
null, // Unstructured event fields empty
null, // Unstructured event field empty
null, // Transaction fields empty
null, //
null, //
Expand Down
2 changes: 1 addition & 1 deletion .../test/scala/com.snowplowanalytics.snowplow.enrich.hadoop/good/LateOct2013CfLineSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ object LateOct2013CfLineSpec {
null, //
null, //
null, //
null, // Unstructured event fields empty
null, // Unstructured event field empty
null, // Transaction fields empty
null, //
null, //
Expand Down
2 changes: 1 addition & 1 deletion .../src/test/scala/com.snowplowanalytics.snowplow.enrich.hadoop/good/Oct2013CfLineSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ object Oct2013CfLineSpec {
null, //
null, //
null, //
null, // Unstructured event fields empty
null, // Unstructured event field empty
null, // Transaction fields empty
null, //
null, //
Expand Down
2 changes: 1 addition & 1 deletion ...src/test/scala/com.snowplowanalytics.snowplow.enrich.hadoop/good/PagePingCfLineSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ object PagePingCfLineSpec {
null, //
null, //
null, //
null, // Unstructured event fields empty
null, // Unstructured event field empty
null, // Transaction fields empty
null, //
null, //
Expand Down
2 changes: 1 addition & 1 deletion ...src/test/scala/com.snowplowanalytics.snowplow.enrich.hadoop/good/PageViewCfLineSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ object PageViewCfLineSpec {
null, //
null, //
null, //
null, // Unstructured event fields empty
null, // Unstructured event field empty
null, // Transaction fields empty
null, //
null, //
Expand Down
2 changes: 1 addition & 1 deletion .../src/test/scala/com.snowplowanalytics.snowplow.enrich.hadoop/good/Sep2013CfLineSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ object Sep2013CfLineSpec {
null, //
null, //
null, //
null, // Unstructured event fields empty
null, // Unstructured event field empty
null, // Transaction fields empty
null, //
null, //
Expand Down
2 changes: 1 addition & 1 deletion .../test/scala/com.snowplowanalytics.snowplow.enrich.hadoop/good/StructEventCfLineSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ object StructEventCfLineSpec {
"PBZ00110", //
"1", //
"35708.23", //
null, // Unstructured event fields empty
null, // Unstructured event field empty
null, // Transaction fields empty
null, //
null, //
Expand Down
2 changes: 1 addition & 1 deletion .../test/scala/com.snowplowanalytics.snowplow.enrich.hadoop/good/TransactionCfLineSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ object TransactionCfLineSpec {
null, //
null, //
null, //
null, // Unstructured event fields empty
null, // Unstructured event field empty
"order-123", // Transaction fields are set
"psychicbazaar", //
"8000", //
Expand Down
2 changes: 1 addition & 1 deletion ...t/scala/com.snowplowanalytics.snowplow.enrich.hadoop/good/TransactionItemCfLineSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ object TransactionItemCfLineSpec {
null, //
null, //
null, //
null, // Unstructured event fields empty
null, // Unstructured event field empty
null, // Transaction fields empty
null, //
null, //
Expand Down
4 changes: 2 additions & 2 deletions ...est/scala/com.snowplowanalytics.snowplow.enrich.hadoop/good/UnstructEventCfLineSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import JobSpecHelpers._
object UnstructEventCfLineSpec {

val lines = Lines(
"2012-05-27 11:35:53 DFW3 3343 99.116.172.58 GET d3gs014xn8p70.cloudfront.net /ice.png 200 http://www.psychicbazaar.com/oracles/119-psycards-book-and-deck-starter-pack.html?view=print#detail Mozilla/5.0%20(Windows%20NT%206.1;%20WOW64;%20rv:12.0)%20Gecko/20100101%20Firefox/12.0 &e=ue&ue_na=viewed_product&ue_px=eyJhZ2UiOjIzLCJuYW1lIjoiSm9obiJ9&dtm=1364230969450&evn=com.acme&tid=598951&vp=2560x934&ds=2543x1420&vid=43&duid=9795bd0203804cd1&p=web&tv=js-0.11.1&fp=2876815413&aid=pbzsite&lang=en-GB&cs=UTF-8&tz=Europe%2FLondon&refr=http%3A%2F%2Fwww.psychicbazaar.com%2F&f_pdf=1&f_qt=0&f_realp=0&f_wma=0&f_dir=0&f_fla=1&f_java=1&f_gears=0&f_ag=1&res=2560x1440&cd=32&cookie=1&url=http%3A%2F%2Fwww.psychicbazaar.com%2F2-tarot-cards"
"2012-05-27 11:35:53 DFW3 3343 99.116.172.58 GET d3gs014xn8p70.cloudfront.net /ice.png 200 http://www.psychicbazaar.com/oracles/119-psycards-book-and-deck-starter-pack.html?view=print#detail Mozilla/5.0%20(Windows%20NT%206.1;%20WOW64;%20rv:12.0)%20Gecko/20100101%20Firefox/12.0 &e=ue&ue_px=eyJzY2hlbWEiOiJpZ2x1OmNvbS5hY21lL3Vuc3RydWN0X2V2ZW50L2pzb25zY2hlbWEvMS0wLTAiLCJkYXRhIjp7InNjaGVtYSI6ImlnbHU6Y29tLmFjbWUvdmlld2VkX3Byb2R1Y3QvanNvbnNjaGVtYS8yLTAtMCIsImRhdGEiOnsiYWdlIjoyMywibmFtZSI6IkpvaG4ifX19&dtm=1364230969450&evn=com.acme&tid=598951&vp=2560x934&ds=2543x1420&vid=43&duid=9795bd0203804cd1&p=web&tv=js-0.11.1&fp=2876815413&aid=pbzsite&lang=en-GB&cs=UTF-8&tz=Europe%2FLondon&refr=http%3A%2F%2Fwww.psychicbazaar.com%2F&f_pdf=1&f_qt=0&f_realp=0&f_wma=0&f_dir=0&f_fla=1&f_java=1&f_gears=0&f_ag=1&res=2560x1440&cd=32&cookie=1&url=http%3A%2F%2Fwww.psychicbazaar.com%2F2-tarot-cards"
)

val expected = List(
Expand Down Expand Up @@ -93,7 +93,7 @@ object UnstructEventCfLineSpec {
null, //
null, //
null, //
"""{"age":23,"name":"John"}""", // Unstructured event fields set
"""{"schema":"iglu:com.acme/unstruct_event/jsonschema/1-0-0","data":{"schema":"iglu:com.acme/viewed_product/jsonschema/2-0-0","data":{"age":23,"name":"John"}}}""", // Unstructured event field set
null, // Transaction fields empty
null, //
null, //
Expand Down

0 comments on commit 48dd7b0

Please sign in to comment.