From 709af867c632108da9129fb587e99d7d1fc54d1a Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Thu, 19 Sep 2013 13:43:57 +0200
Subject: [PATCH] dfa: expand contract test

---
 .../dataFlow/fixture/ContractAnnotation.java           | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/java/java-tests/testData/inspection/dataFlow/fixture/ContractAnnotation.java b/java/java-tests/testData/inspection/dataFlow/fixture/ContractAnnotation.java
index c39c02232f00..a5c27dd21749 100644
--- a/java/java-tests/testData/inspection/dataFlow/fixture/ContractAnnotation.java
+++ b/java/java-tests/testData/inspection/dataFlow/fixture/ContractAnnotation.java
@@ -6,14 +6,22 @@ import java.lang.AssertionError;
 import java.lang.IllegalArgumentException;
 
 public class AssertIsNotNull {
-  void bar(String s) {
+  void bar(String s, String s1) {
     if (<warning descr="Condition 's == null && trimIfNotNull(s) != null' is always 'false'">s == null && <warning descr="Condition 'trimIfNotNull(s) != null' is always 'false' when reached">trimIfNotNull(s) != null</warning></warning>) {
       throw new AssertionError();
     }
 
     final Object o = call();
     assertIsNotNull(o);
+    System.out.println(o.toString());
     if(<warning descr="Condition 'o == null' is always 'false'">o == null</warning>) {}
+    
+    if (trimIfNotNull(s1) != null) {
+      System.out.println(s1.charAt(0));
+      if (<warning descr="Condition 's1 == null' is always 'false'">s1 == null</warning>) {
+        
+      }
+    }
   }
   
   @Contract("null -> fail")