Adapt ServiceLayerTester -> SecureStorageTestRunner to final version …

…of test applet.
jiten87 · Nov 28, 2013 · 4296a17 · 4296a17
1 parent b7232e3
commit 4296a17
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 46 deletions.
diff --git a/samples/ServiceLayerTester/project.properties b/samples/ServiceLayerTester/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=Giesecke & Devrient GmbH:Open Mobile API (with SL):18
+target=Giesecke & Devrient GmbH:Open Mobile API (with Service Layer):18
diff --git a/.../com/gieseckedevrient/android/servicelayertester/testrunners/SecureStorageTestRunner.java b/.../com/gieseckedevrient/android/servicelayertester/testrunners/SecureStorageTestRunner.java
@@ -16,8 +16,6 @@
 
 package com.gieseckedevrient.android.servicelayertester.testrunners;
 
-import java.io.IOException;
-
 import org.simalliance.openmobileapi.SEService;
 import org.simalliance.openmobileapi.SecureStorageProvider;
 
@@ -65,58 +63,27 @@ public void run() {
         }
         mActivity.logInfo("Done!");
 
-        String title = "Entry1";
-        byte[] content = new byte[] {
-                (byte) 0xA0, (byte) 0xA1, (byte) 0xA2, (byte) 0xA3,
-                (byte) 0xA4, (byte) 0xA5, (byte) 0xA6, (byte) 0xA7,
-                (byte) 0xA8, (byte) 0xA9,
+        String entryTitle = "Entry1";
+        byte[] expectedContent = new byte[] {
+                (byte) 0x00, (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04
         };
-        mActivity.logInfo("Creating SeS entry...");
-        try {
-            provider.create(title, content);
-        } catch (Exception e) {
-            endTest(e);
-            return;
-        }
-        mActivity.logInfo("Done!");
 
         mActivity.logInfo("Entry content is:");
         try {
-            mActivity.logInfo(Util.byteArrayToHexString(provider.read(title)));
-        } catch (Exception e) {
-            endTest(e);
-            return;
-        }
-
-        byte[] newContent = new byte[] {
-                (byte) 0xB0, (byte) 0xB1, (byte) 0xB2, (byte) 0xB3,
-                (byte) 0xB4, (byte) 0xB5, (byte) 0xB6, (byte) 0xB7,
-                (byte) 0xB8, (byte) 0xB9,
-        };
-        mActivity.logInfo("Updating entry...");
-        try {
-            provider.update(title, newContent);
+        	byte[] responseEntryContent = provider.read(entryTitle);
+            mActivity.logInfo(Util.byteArrayToHexString(provider.read(entryTitle)));
+
+            if(Util.byteArrayToHexString(responseEntryContent).equals(Util.byteArrayToHexString(expectedContent))) {
+            	mActivity.logInfo("The content of the entry is correct!");
+            } else {
+            	mActivity.logInfo("The content of the entry is NOT correct");
+            }
+
         } catch (Exception e) {
             endTest(e);
             return;
         }
-        mActivity.logInfo("Done!");
 
-        mActivity.logInfo("New entry content is:");
-        try {
-            mActivity.logInfo(Util.byteArrayToHexString(provider.read(title)));
-        } catch (Exception e) {
-            endTest(e);
-            return;
-        }
-
-        mActivity.logInfo("Deleting entry...");
-        try {
-            provider.delete(title);
-        } catch (Exception e) {
-            endTest(e);
-            return;
-        }
         mActivity.logInfo("Done!");
         endTest();
     }